YaST Commits April 2008

yast-commit@lists.opensuse.org

27 participants
1339 discussions

[yast-commit] r45913 - in /trunk/firewall: package/yast2-firewall.changes src/helps.ycp src/summary.ycp
by jsrain＠svn.opensuse.org 01 Apr '08

01 Apr '08

Author: jsrain Date: Tue Apr 1 09:22:47 2008 New Revision: 45913 URL: http://svn.opensuse.org/viewcvs/yast?rev=45913&view=rev Log: merged texts from proofread Modified: trunk/firewall/package/yast2-firewall.changes trunk/firewall/src/helps.ycp trunk/firewall/src/summary.ycp Modified: trunk/firewall/package/yast2-firewall.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/package/yast2-firewall.… ============================================================================== --- trunk/firewall/package/yast2-firewall.changes (original) +++ trunk/firewall/package/yast2-firewall.changes Tue Apr 1 09:22:47 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 1 09:56:06 CEST 2008 - jsrain(a)suse.cz + +- merged texts from proofread + +------------------------------------------------------------------- Fri Mar 28 12:22:32 CET 2008 - ug(a)suse.de - rnc file fixed Modified: trunk/firewall/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/helps.ycp?rev=45913… ============================================================================== --- trunk/firewall/src/helps.ycp (original) +++ trunk/firewall/src/helps.ycp Tue Apr 1 09:22:47 2008 @@ -170,7 +170,7 @@ // TRANSLATORS: Additional Services dialog help 5/6 // please, do not modify examples - _("Port Range is two numbers with a colon in between that represents + _("The Port Range consists of two comma-seperated numbers that represent all numbers inside the range including the numbers themselves. The first port number must be lower than the second one, for example, <tt>200:215</tt>.") + Modified: trunk/firewall/src/summary.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/summary.ycp?rev=459… ============================================================================== --- trunk/firewall/src/summary.ycp (original) +++ trunk/firewall/src/summary.ycp Tue Apr 1 09:22:47 2008 @@ -295,11 +295,11 @@ // Is running and will be stopped if (SuSEFirewall::IsStarted()) { // TRANSLATORS: Summary text item - ret_message = ret_message + li_start + _("Firewall will be stopped after the configuration gets written") + li_end + "\n"; + ret_message = ret_message + li_start + _("Firewall will be stopped after the configuration is written") + li_end + "\n"; // Is not running and will not be running } else { // TRANSLATORS: Summary text item - ret_message = ret_message + li_start + _("Firewall will not start after the configuration gets written") + li_end + "\n"; + ret_message = ret_message + li_start + _("Firewall will not start after the configuration is written") + li_end + "\n"; } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r45912 - in /trunk/installation: control/ package/ src/clients/
by jsrain＠svn.opensuse.org 01 Apr '08

01 Apr '08

Author: jsrain Date: Tue Apr 1 09:17:26 2008 New Revision: 45912 URL: http://svn.opensuse.org/viewcvs/yast?rev=45912&view=rev Log: merged texts from proofread Modified: trunk/installation/control/control.SLD.xml trunk/installation/control/control.SLES.xml trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_complex_welcome.ycp trunk/installation/src/clients/inst_congratulate.ycp trunk/installation/src/clients/inst_mode.ycp trunk/installation/src/clients/inst_network_check.ycp trunk/installation/src/clients/inst_network_setup.ycp trunk/installation/src/clients/inst_software_selection.ycp trunk/installation/src/clients/inst_upgrade_urls.ycp Modified: trunk/installation/control/control.SLD.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLD… ============================================================================== --- trunk/installation/control/control.SLD.xml (original) +++ trunk/installation/control/control.SLD.xml Tue Apr 1 09:17:26 2008 @@ -102,7 +102,7 @@ The installation has completed successfully. Your system is ready for use. -Click Finish to log in to the system. +Click Finish to log in to the system. Please visit us at http://www.novell.com/linux/. Modified: trunk/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE… ============================================================================== --- trunk/installation/control/control.SLES.xml (original) +++ trunk/installation/control/control.SLES.xml Tue Apr 1 09:17:26 2008 @@ -111,7 +111,7 @@ The installation has completed successfully. Your system is ready for use. -Click Finish to log in to the system. +Click Finish to log in to the system. Please visit us at http://www.novell.com/linux/. Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Apr 1 09:17:26 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 1 10:15:34 CEST 2008 - jsrain(a)suse.cz + +- merged texts from proofread + +------------------------------------------------------------------- Mon Mar 31 16:42:40 CEST 2008 - locilka(a)suse.cz - There are currently two possible patterns/desktops that can use Modified: trunk/installation/src/clients/inst_complex_welcome.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_co… ============================================================================== --- trunk/installation/src/clients/inst_complex_welcome.ycp (original) +++ trunk/installation/src/clients/inst_complex_welcome.ycp Tue Apr 1 09:17:26 2008 @@ -161,8 +161,8 @@ // help text, continued _(" -You can select Abort installation at any time to abort the -installation process. +Select Abort to abort the +installation process any time. "); Modified: trunk/installation/src/clients/inst_congratulate.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_co… ============================================================================== --- trunk/installation/src/clients/inst_congratulate.ycp (original) +++ trunk/installation/src/clients/inst_congratulate.ycp Tue Apr 1 09:17:26 2008 @@ -185,8 +185,7 @@ help = help + _("Use Clone if you want to create an AutoYaST profile. AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST needs a profile to know what the installed system should look like. If this option is -selected, a profile of the current system is stored in /root/autoinst.xml. -"); +selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>."); if (show_zmd_turnoff_checkbox) help = help + turnoff_zmd_help; Modified: trunk/installation/src/clients/inst_mode.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_mo… ============================================================================== --- trunk/installation/src/clients/inst_mode.ycp (original) +++ trunk/installation/src/clients/inst_mode.ycp Tue Apr 1 09:17:26 2008 @@ -205,22 +205,19 @@ // help text for installation option (show_online_repositories == true ? _(" To use suggested remote repositories during installation or update, select -Add Online Repositories Before Installation. -"):"") + +Add Online Repositories Before Installation."):"") + // help text for installation method _(" To install an add-on product from separate media together with &product;, select -Include Add-On Products from Separate Media. -") + +Include Add-On Products from Separate Media.") + // help text for installation method _(" -To let new installation create an automatic configuration, select -Use Automatic Configuration. Otherwise second stage installation -with configuration proposals will be called instead. Update mode does not -support automatic configuration. -") + +To let the new installation to create an automatic configuration, select +Use Automatic Configuration. Otherwise, second stage installation +with configuration proposals will be used. Update mode does not +support automatic configuration.") + // help text for installation method _("Select Repair Installed System if you have a damaged Linux system on @@ -228,7 +225,7 @@ ") + // help text for installation method - _("Features Update and Repair Installed System are only + _("The features Update and Repair Installed System are only available if some Linux system has been detected. "); } @@ -405,11 +402,9 @@ // %2 - logfile, possibly with errors // %3 - link to our bugzilla // %4 - directory where YaST logs are stored - sformat (_("Calling the YaST module %1 has failed. -More information can be found near the end of the '%2' file. - -This is worth reporting a bug at %3. -Please, attach also all YaST logs stored in the '%4' directory."), + sformat (_("Accessing the YaST module %1 has failed. +More information can be found in the '%2' file. +Please report this bug at %3 and attach the YaST logs stored in the '%4' directory."), "inst_repair", "/var/log/YaST2/y2log", "http://bugzilla.novell.com/", Modified: trunk/installation/src/clients/inst_network_check.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_ne… ============================================================================== --- trunk/installation/src/clients/inst_network_check.ycp (original) +++ trunk/installation/src/clients/inst_network_check.ycp Tue Apr 1 09:17:26 2008 @@ -74,12 +74,13 @@ `Empty() ), `Left (`Label (_("No network setup has been found. -It is vitally important for using remote repositories -otherwise you can safely skip it."))) +It is important if using remote repositories, +otherwise you can safely skip it. +"))) ), `VSpacing (2), // TRANSLATORS: dialog label - `Left(`Label (_("Would you like to configure your network card now?"))), + `Left(`Label (_("Configure your network card now?"))), `VSpacing (1), `Frame ( // TRANSLATORS: frame label @@ -98,12 +99,13 @@ `VStretch() ), // TRANSLATORS: help text, part 1/2 - _("The current installation system does not seem -to have configured network.") + + _("The current installation system does not +have a configured network. +") + // TRANSLATORS: help text, part 2/2 _("A configured network is needed for using remote repositories -or Add-On products. You do not need to set it up in case you do not want -to use any remote repository and you can skip the configuration then."), +or add-on products. If you do not use remote repositories, skip the configuratio. +"), enable_next, enable_back ); Modified: trunk/installation/src/clients/inst_network_setup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_ne… ============================================================================== --- trunk/installation/src/clients/inst_network_setup.ycp (original) +++ trunk/installation/src/clients/inst_network_setup.ycp Tue Apr 1 09:17:26 2008 @@ -173,7 +173,7 @@ `Label (_("Probing network cards...")) ), // TRANSLATORS: dialog help - _("Please wait while installation is probing the network cards..."), + _("Please wait while the installation is probing the network cards..."), false, false ); @@ -275,8 +275,7 @@ // TRANSLATORS: pop-up error message Report::Error (_("No network card has been selected. -First, you need to select one network card -to configure it later.")); +Please select a network card to configure it later.")); return false; // Checking whether the netcard link is active @@ -287,10 +286,9 @@ sformat ( // TRANSLATORS: popup dialog question // %1 is replaced with a network device string - _("Link of the selected interface %1 is disconnected. + _("The link of the selected interface %1 is disconnected. It needs to be connected for a proper network configuration. - -Are you sure you want to use it despite the given fact?"), +Are you sure you want to use it?"), selected_netcard ), // TRANSLATORS: popup dialog button @@ -343,12 +341,12 @@ // TRANSLATORS: dialog help 1/3 _("Here you can configure your network cards to be used immediately.") + // TRANSLATORS: dialog help 2/3 - _("If you don't need a network connection now, + _("If you do not need a network connection now, you can safely skip the configuration.") + // TRANSLATORS: dialog help 3/3 - _("To configure a network card, select it from list -and click on the Next button, -otherwise click on the Cancel button."), + _("To configure a network card, select it from the list +and click the Next button. +Otherwise,clickCancel."), Label::BackButton(), Label::NextButton() ); @@ -1143,14 +1141,13 @@ // TRANSLATORS: a pop-up dialog headline _("Internet Test Failed"), // TRANSLATORS: a pop-up dialog question, see buttons *3 - _("Because the Internet connection test failed, you should be + _("The Internet connection test failed. You should be redirected to the previous dialog to change the configuration. - -Would you like to go back to change it?"), +Go back and change it?"), // TRANSLATORS: popup dialog button (*3) _("Go Back"), // TRANSLATORS: popup dialog button (*3) - _("Skip It"), + _("Skip"), `yes )) { return false; @@ -1385,9 +1382,8 @@ if (all_ok != true) { y2warning ("Writing has failed, returning to the previous dialog"); Report::Error (_("Writing the network settings failed. - -You will be returned to the previous dialog either -to change the settings or to cancel the network setup.")); +You will be returned to the previous dialog to either +change the settings, or cancel the network setup.")); return `back; } Modified: trunk/installation/src/clients/inst_software_selection.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_so… ============================================================================== --- trunk/installation/src/clients/inst_software_selection.ycp (original) +++ trunk/installation/src/clients/inst_software_selection.ycp Tue Apr 1 09:17:26 2008 @@ -179,8 +179,7 @@ break; } Popup::Message (_("No system type was selected. - -Select the default one, please.")); +Select the default type.")); continue; } else if (ret == `abort || ret == `cancel) { if (Popup::ConfirmAbort (Stage::initial () ? `painless : `incomplete)) { Modified: trunk/installation/src/clients/inst_upgrade_urls.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_up… ============================================================================== --- trunk/installation/src/clients/inst_upgrade_urls.ycp (original) +++ trunk/installation/src/clients/inst_upgrade_urls.ycp Tue Apr 1 09:17:26 2008 @@ -102,7 +102,7 @@ // TRANSLATORS: dialog text, possibly multiline, // Please, do not use more than 50 characters per line. `Left (`Label (_("These repositories were found on the system -you are just upgrading:"))), +you are upgrading:"))), `Table ( `id ("table_of_repos"), `opt (`notify), @@ -126,9 +126,8 @@ ) ), // TRANSLATORS: help text 1/3 - _("Here you can see all software repositories that were found -on the system you are just upgrading. You have better enable -those you want to include in the upgrade process.") + + _("Here you see all software repositories found +on the system you are upgrading. Enable the ones you want to include in the upgrade process.") + // TRANSLATORS: help text 2/3 _("To enable or disable an URL, click on the Toggle Status button or double-click on the respective table item.") + @@ -412,9 +411,8 @@ // TRANSLATORS: popup header _("Network is not Configured"), // TRANSLATORS: popup question - _("Remote repositories require the Internet connection. - -Would you like to configure it?"), + _("Remote repositories require an Internet connection. +Configure it?"), Label::YesButton(), Label::NoButton(), `yes @@ -570,7 +568,7 @@ Report::Error (sformat ( // TRANSLATORS: error report // %1 is replaced with repo-name, %2 with repo-URL - _("An error occurred when refreshing repository + _("An error occurred while refreshing repository Name: %1 URL: %2"), repo_name, @@ -666,7 +664,7 @@ _("Initializing package manager..."), ], // TRANSLATORS: dialog help - _("Please wait, while repositories are being read...") + _("Please wait while repositories are being read...") ); Wizard::SetTitleIcon ("yast-sw_source"); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r45911 - in /trunk/ftp-server/src: FtpServer.ycp complex.ycp dialogs.ycp ftp-server.ycp helps.ycp wid_functions.ycp
by juhliarik＠svn.opensuse.org 01 Apr '08

01 Apr '08

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… ============================================================================== --- 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=4… ============================================================================== --- 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 Cancel 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=4… ============================================================================== --- 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<string,any> StartStop () { map<string,any> 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<string,any> StartStopPure () { map<string,any> 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?re… ============================================================================== --- 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=459… ============================================================================== --- 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": _("Verbose Logging -When enabled, all FTP requests and responses are logged. +When enabled, all ftp requests and responses are logged. "), @@ -90,29 +90,31 @@ /* general umask for anonymous help - only vsftpd 1/1 */ "UmaskAnon": _("Umask for Anonymous: 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. -"), + +"), /* general umask for authenticated users help - only vsftpd 1/1 */ "UmaskLocal": _("Umask for Authenticated Users: 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. -"), + +"), /* general FTP dir for anonymous help 1/1 */ "FtpDirAnon": _("FTP Directory for Anonymous Users: -You can specify directory which is used for FTP anonymous users. -By pressing Browse you can select directory from local filesystem. +Here you can specify a directory which is used for ftp anonymous users. +By pressing Browse you can select a directory from local filesystem. "), /* general FTP dir for authenticated help 1/1 */ "FtpDirLocal": _("FTP Directory for Authenticated Users: -You can specify directory which is used for FTP authenticated users. -By pressing Browse you can select directory from local filesystem. +You can specify a directory which is used for ftp authenticated users. +By pressing Browse you can select a directory from local filesystem. "), @@ -124,9 +126,10 @@ /* performance Max Idle Time help 1/1 */ "MaxIdleTime": _("Max Idle Time: -The timeout which is the maximum time a remote client -may spend between FTP commands. -"), +The maximum time (timeout) a remote client +may spend between ftp commands. + +"), /* performance max clients per IP help 1/1 */ "MaxClientsPerIP": _("Max Clients for One IP: @@ -168,17 +171,19 @@ /* authentication Enable Upload help 1/1 */ "EnableUpload": _("Enable Upload -If enable ftp users can upload. Anonymous users need to allow - \"Anonymous Can Upload\" for enabling upload. -"), +If enabled ftp users can upload. Anonymous users need to allow + Anonymous Can Upload for enabling upload. + +"), /* authentication Anonymous Can Upload help 1/1 */ "AnonReadOnly": _("Anonymous Can Upload If enabled anonymous users will be permitted to upload. -vsftpd only: If you want that anonymous users can upload you -need existing directory with allowed writing in home directory after login. -"), +vsftpd only: If you want to allow anonymous users to upload, you +need an existing directory with write persmission in the home directory after login. + +"), /* authentication Anonymous Can Create Dirs help 1/1 */ "AnonCreatDirs": _("Anonymous Can Create Dirs @@ -196,20 +201,21 @@ /* expert settings Enable Passive Mode help 1/1 */ "PassiveMode": _("Enable Passive Mode -If enabled ftp server allowe passive mode for connection. -"), +If enabled ftp server allow passive mode for connection. + +"), /* expert settings Min Port for Pas. Mode help 1/1 */ -"PasMinPort":_("Min Port for Pas. Mode -Minimal value for port range for passive connection replies. -- for firewalling -"), +"PasMinPort":_("Min Port for Passive Mode +Minimal value for a port range for passive connection replies. This is used for protection by means of a firewall. + +"), /* expert settings Max Port for Pas. Mode help 1/1 */ "PasMaxPort": _("Max Port for Pas. Mode -Maximal value for port range for passive connection replies. -- for firewalling -"), +Maximal value for a port range for passive connection replies. This is used for protection by means of a firewall. + +"), /* expert settings Enable SSL help 1/1 */ "SSLEnable": _("Enable SSL @@ -234,7 +240,7 @@ /* expert settings DSA Certificate to Use for SSL Encrypted Connections help 1/1 */ "CertFile": _("DSA Certificate to Use for SSL Encrypted Connections This option specifies the location of the DSA certificate to -use for SSL encrypted connections. You can select file by pressing Browse +use for SSL encrypted connections. You can select a file by pressing Browse "), @@ -248,9 +254,8 @@ /* expert settings Security Settings help 1/1 */ "SSL": _("Security Settings Disable SSL/TLS Disable SSL/TLS encryption layer. -Accept SSL and TLS Accept both traditional and encrypted sessions. -Refuse Conections Without SSL/TLS Refuse connections that don't use -SSL/TLS security mechanisms, including anonymous sessions. +Accept SSL and TLS Accept both, traditional and encrypted sessions. +Refuse Conections Without SSL/TLS Refuse connections that do not use SSL/TLS security mechanisms, including anonymous sessions. "), /** @@ -261,13 +266,13 @@ /* Summary dialog help 1/3 */ "summary" : _("<big>FTP Server Configuration</big> -Configure FTP server here. +Configure the ftp server here. ")+ /* Summary dialog help 2/3 */ _("<big>Adding an FTP Server:</big> -Choose an FTP server from the list of detected FTP servers. -If your FTP server was not detected, use Other (not detected). +Choose an ftp server from the list of detected ftp servers. +If your ftp server was not detected, use Other (not detected). Then press Configure. ") + @@ -278,20 +283,20 @@ "), /* Ovreview dialog help 1/3 */ - "overview" : _("<big>FTP Server Configuration Overview</big> -Obtain an overview of installed FTP servers. Additionally + "overview" : _("<big>FTP Server Configuration Overvie</big> +Obtain an overview of the installed ftp servers. Additionally, edit their configurations. ") + /* Ovreview dialog help 2/3 */ _("<big>Adding a FTP Server</big> -Press Add to configure an FTP server. +Press Add to configure an ftp server. ") + /* Ovreview dialog help 3/3 */ _("<big>Editing or Deleting</big> -Choose a FTP server to change or remove. -Then press Edit or Delete as desired. +Choose an ftp server to change or remove. +Then press Edit or Delete, respectively. "), Modified: trunk/ftp-server/src/wid_functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/wid_functions.ycp… ============================================================================== --- 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(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r45910 - in /trunk/autoinstallation: package/autoyast2.changes src/dialogs/general_dialogs.ycp src/modules/AutoinstLVM.ycp src/modules/AutoinstStorage.ycp
by jsrain＠svn.opensuse.org 01 Apr '08

01 Apr '08

Author: jsrain Date: Tue Apr 1 09:05:19 2008 New Revision: 45910 URL: http://svn.opensuse.org/viewcvs/yast?rev=45910&view=rev Log: merged texts from proofread Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/dialogs/general_dialogs.ycp trunk/autoinstallation/src/modules/AutoinstLVM.ycp trunk/autoinstallation/src/modules/AutoinstStorage.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Tue Apr 1 09:05:19 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 1 10:05:10 CEST 2008 - jsrain(a)suse.cz + +- merged texts from proofread + +------------------------------------------------------------------- Thu Mar 27 11:08:56 CET 2008 - ug(a)suse.de - XML profile on USB devices can make yast to hang when the profile Modified: trunk/autoinstallation/src/dialogs/general_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/dialogs/gen… ============================================================================== --- trunk/autoinstallation/src/dialogs/general_dialogs.ycp (original) +++ trunk/autoinstallation/src/dialogs/general_dialogs.ycp Tue Apr 1 09:05:19 2008 @@ -303,7 +303,7 @@ `TextEntry( `id(`dialogTitle), _("Dialog Title"), title ), `MultiLineEdit( `id( `help ), _("Helptext"), help ), `HBox( - `PushButton( `id( `addDialog ), `opt( `default, `hstretch ), _("Add to Dialoglist") ), + `PushButton( `id( `addDialog ), `opt( `default, `hstretch ), _("Add to Dialog List") ), `PushButton( `id( `applyDialog ), `opt( `default, `hstretch ), _("Apply Changes to Dialog") ) ), `MinSize( 10,5, @@ -313,9 +313,9 @@ dialogs ) ), `HBox( - `PushButton( `id( `deleteDialog ), `opt( `default, `hstretch ), _("delete Dialog") ), - `PushButton( `id( `dialogUp ), `opt( `default, `hstretch ), _("Dialog up") ), - `PushButton( `id( `dialogDown ), `opt( `default, `hstretch ), _("Dialog down") ) + `PushButton( `id( `deleteDialog ), `opt( `default, `hstretch ), _("Delete Dialog") ), + `PushButton( `id( `dialogUp ), `opt( `default, `hstretch ), _("Dialog Up") ), + `PushButton( `id( `dialogDown ), `opt( `default, `hstretch ), _("Dialog Down") ) ), `Label( _("Questions in Dialog") ), `MinSize( 10,5, @@ -325,11 +325,11 @@ questions ) ), `HBox( - `PushButton( `id( `addQuestion ), `opt( `default, `hstretch ), _("add Question") ), - `PushButton( `id( `editQuestion ), `opt( `default, `hstretch ), _("edit Question") ), - `PushButton( `id( `deleteQuestion ), `opt( `default, `hstretch ), _("delete Question") ), - `PushButton( `id( `questionUp ), `opt( `default, `hstretch ), _("Question up") ), - `PushButton( `id( `questionDown ), `opt( `default, `hstretch ), _("Question down") ) + `PushButton( `id( `addQuestion ), `opt( `default, `hstretch ), _("Add Question") ), + `PushButton( `id( `editQuestion ), `opt( `default, `hstretch ), _("Edit Question") ), + `PushButton( `id( `deleteQuestion ), `opt( `default, `hstretch ), _("Delete Question") ), + `PushButton( `id( `questionUp ), `opt( `default, `hstretch ), _("Question Up") ), + `PushButton( `id( `questionDown ), `opt( `default, `hstretch ), _("Question Down") ) ) ) Modified: trunk/autoinstallation/src/modules/AutoinstLVM.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstLVM.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstLVM.ycp Tue Apr 1 09:05:19 2008 @@ -101,7 +101,7 @@ if( haskey( p, "lvm_group" ) && p["create"]:true == false ) { keepLVM[p["lvm_group"]:"x"] = []; if( !contains( ExistingVGs, p["lvm_group"]:"x" ) ) - Report::Error( sformat( _("can't reuse volume group %1. The volume group does not exist"), p["lvm_group"]:"x" ) ); + Report::Error( sformat( _("Cannot reuse volume group %1. The volume group does not exist."), p["lvm_group"]:"x" ) ); map atm = AutoinstStorage::AutoTargetMap; foreach ( map vg_p, atm["/dev/"+p["lvm_group"]:"x","partitions"]:[], ``{ if( vg_p["create"]:true == false ) @@ -110,7 +110,7 @@ } else if( haskey( p, "evms_group" ) && p["create"]:true == false ) { keepEVMS[p["evms_group"]:"x"] = []; if( !contains( ExistingVGs, p["evms_group"]:"x" ) ) - Report::Error( sformat( _("can't reuse volume group %1. The volume group does not exist"), p["evms_group"]:"x" ) ); + Report::Error( sformat( _("Cannot reuse volume group %1. The volume group does not exist."), p["evms_group"]:"x" ) ); map atm = AutoinstStorage::AutoTargetMap; foreach ( map vg_p, atm["/dev/"+p["evms_group"]:"x","partitions"]:[], ``{ if( vg_p["create"]:true == false ) Modified: trunk/autoinstallation/src/modules/AutoinstStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstStorage.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstStorage.ycp Tue Apr 1 09:05:19 2008 @@ -411,7 +411,7 @@ y2milestone("shrinking %1",pe); s = s - ((usedSize - sizeByCyl)/cyl_size+1+size(d["partitions"]:[]))*cyl_size; // 1 cyl buffer per partition if( s < 1 ) { - Report::Error( sformat( _("The partition plan configured in your XML profile does not fit on the harddisk. %1MB missing"), (usedSize-sizeByCyl)/(1024*1024) )); + Report::Error( sformat( _("The partition plan configured in your XML profile does not fit on the hard disk. %1MB missing"), (usedSize-sizeByCyl)/(1024*1024) )); break; } else { usedSize = usedSize - s; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r45909 - in /trunk/add-on: package/yast2-add-on.changes src/add-on-workflow.ycp src/add-on.ycp src/inst_language_add-on.ycp
by jsrain＠svn.opensuse.org 01 Apr '08

01 Apr '08

Author: jsrain Date: Tue Apr 1 09:02:25 2008 New Revision: 45909 URL: http://svn.opensuse.org/viewcvs/yast?rev=45909&view=rev Log: merged texts from proofread Modified: trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/add-on-workflow.ycp trunk/add-on/src/add-on.ycp trunk/add-on/src/inst_language_add-on.ycp Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.chan… ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Tue Apr 1 09:02:25 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 1 10:02:15 CEST 2008 - jsrain(a)suse.cz + +- merged texts from proofread + +------------------------------------------------------------------- Mon Mar 17 12:43:32 CET 2008 - jsrain(a)suse.cz - added 'StartupNotify=true' to the desktop file (bnc #304964) Modified: trunk/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on-workflow.ycp?r… ============================================================================== --- trunk/add-on/src/add-on-workflow.ycp (original) +++ trunk/add-on/src/add-on-workflow.ycp Tue Apr 1 09:02:25 2008 @@ -470,9 +470,8 @@ string title = _("Software Repository Selection"); // help text string help_text = _("<big>Software Repository Selection</big> -There were multiple repositories found on the selected medium. -Select the repository to use. -"); +Multiple repositories found on the selected medium. +Select the repository to use."); term contents = `HBox (`HSpacing(4), `VBox ( `VSpacing (2), @@ -767,9 +766,8 @@ ), `HStretch ()); // help text string help_text = _("<big>Product Selection</big> -There were multiple products found in the repository. Select the products -to install. -"); +Multiple products found in the repository. Select the products +to install."); Wizard::SetContents (title, contents, help_text, true, true); while (ret == nil) { Modified: trunk/add-on/src/add-on.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on.ycp?rev=45909&… ============================================================================== --- trunk/add-on/src/add-on.ycp (original) +++ trunk/add-on/src/add-on.ycp Tue Apr 1 09:02:25 2008 @@ -34,9 +34,9 @@ Add-On Module Help ------------------ -To add a new Add-On product via command-line, use this syntax: +To add a new add-on product via command-line, use this syntax: /sbin/yast2 add-on URL -URL is the path to the Add-On source. +URL is the path to the add-on source. Examples of URL: http://server.name/directory/Lang-AddOn-10.2-i386/ Modified: trunk/add-on/src/inst_language_add-on.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/inst_language_add-on.… ============================================================================== --- trunk/add-on/src/inst_language_add-on.ycp (original) +++ trunk/add-on/src/inst_language_add-on.ycp Tue Apr 1 09:02:25 2008 @@ -167,7 +167,7 @@ `MultiSelectionBox ( `id ("languages"), // TRANSLATORS:: multi-selection box - _("&Select Language Extensions to Be Installed"), + _("&Select Language Extensions to be Installed"), items ), `HStretch () -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r45908 - in /trunk/http-server: package/yast2-http-server.changes src/YaST/httpdUtils.pm
by jsrain＠svn.opensuse.org 01 Apr '08

01 Apr '08

Author: jsrain Date: Tue Apr 1 08:57:16 2008 New Revision: 45908 URL: http://svn.opensuse.org/viewcvs/yast?rev=45908&view=rev Log: merged texts from proofread Modified: trunk/http-server/package/yast2-http-server.changes trunk/http-server/src/YaST/httpdUtils.pm Modified: trunk/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/package/yast2-http-s… ============================================================================== --- trunk/http-server/package/yast2-http-server.changes (original) +++ trunk/http-server/package/yast2-http-server.changes Tue Apr 1 08:57:16 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 1 09:57:06 CEST 2008 - jsrain(a)suse.cz + +- merged texts from proofread + +------------------------------------------------------------------- Mon Mar 17 12:43:32 CET 2008 - jsrain(a)suse.cz - added 'StartupNotify=true' to the desktop file (bnc #304964) Modified: trunk/http-server/src/YaST/httpdUtils.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/YaST/httpdUtils.… ============================================================================== --- trunk/http-server/src/YaST/httpdUtils.pm (original) +++ trunk/http-server/src/YaST/httpdUtils.pm Tue Apr 1 08:57:16 2008 @@ -19,7 +19,7 @@ return $k if( exists($hostHash->{HOSTID}) and $hostHash->{HOSTID} eq $hostid ); } } - return $self->SetError( summary => __('host not found'), + return $self->SetError( summary => __('Host not found'), code => 'PARAM_CHECK_FAILED' ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r45907 - in /trunk/backup: package/yast2-backup.changes src/help_texts.ycp
by jsrain＠svn.opensuse.org 01 Apr '08

01 Apr '08

Author: jsrain Date: Tue Apr 1 08:53:17 2008 New Revision: 45907 URL: http://svn.opensuse.org/viewcvs/yast?rev=45907&view=rev Log: merged texts from proofread Modified: trunk/backup/package/yast2-backup.changes trunk/backup/src/help_texts.ycp Modified: trunk/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/package/yast2-backup.chan… ============================================================================== --- trunk/backup/package/yast2-backup.changes (original) +++ trunk/backup/package/yast2-backup.changes Tue Apr 1 08:53:17 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 1 09:53:08 CEST 2008 - jsrain(a)suse.cz + +- merged texts from proofread + +------------------------------------------------------------------- Mon Mar 17 12:43:32 CET 2008 - jsrain(a)suse.cz - added 'StartupNotify=true' to the desktop file (bnc #304964) Modified: trunk/backup/src/help_texts.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/src/help_texts.ycp?rev=45… ============================================================================== --- trunk/backup/src/help_texts.ycp (original) +++ trunk/backup/src/help_texts.ycp Tue Apr 1 08:53:17 2008 @@ -272,7 +272,7 @@ It is possible to exclude some files from the backup. Search constraints can be a directory, file system, or regular expression. Use Edit to modify an existing constraint. -Delete removes the selected constrain. +Delete removes the selected constraint. To add a new constraint, click Add then select the type of constraint. ") // For translators: help text in exclude directory dialog - part 3/5 @@ -282,7 +282,7 @@ + _("File System: It is possible to exclude all files located on a certain type of file system (such as ReiserFS or Ext2). The root directory will always be searched, even if its file system is selected. -File systems that cannot be used on local disk, such as network file systems, +File systems that cannot be used on a local disk, such as network file systems, are excluded by default.") // For translators: help text in exclude directory dialog - part 5/5 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r45906 - /trunk/yast2/library/network/src/yast2-services-translations.ycp
by jsrain＠svn.opensuse.org 01 Apr '08

01 Apr '08

Author: jsrain Date: Tue Apr 1 08:48:41 2008 New Revision: 45906 URL: http://svn.opensuse.org/viewcvs/yast?rev=45906&view=rev Log: merged texts from proofread Modified: trunk/yast2/library/network/src/yast2-services-translations.ycp Modified: trunk/yast2/library/network/src/yast2-services-translations.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/yast2-… ============================================================================== --- trunk/yast2/library/network/src/yast2-services-translations.ycp (original) +++ trunk/yast2/library/network/src/yast2-services-translations.ycp Tue Apr 1 08:48:41 2008 @@ -101,7 +101,7 @@ tmpstring = _("icecream scheduler"); // TRANSLATORS: Description of a Service (rpm: icecream-scheduler), used as a common label or an item in table - tmpstring = _("opens ports for the Icecream scheduler"); + tmpstring = _("opens ports for the icecream scheduler"); // TRANSLATORS: Name of Service (rpm: imap), can be used as check box, item in multiple selection box... tmpstring = _("imap Server"); @@ -152,10 +152,10 @@ tmpstring = _("opens ports for MySQL in order to allow other hosts connect to it"); // TRANSLATORS: Description of a Service (rpm: nfs-client), used as a common label or an item in table - tmpstring = _("Firewall Configuraion for nfs client. opens ports for foo in order to allow bar"); + tmpstring = _("Firewall Configuraion for nfs client. Opens ports for foo in order to allow bar"); // TRANSLATORS: Description of a Service (rpm: nfs-kernel-server), used as a common label or an item in table - tmpstring = _("Firewall Configuraion for nfs kernel server. opens ports for foo in order to allow bar"); + tmpstring = _("Firewall configuraion for nfs kernel server. Opens ports for foo in order to allow bar"); // TRANSLATORS: Name of Service (rpm: nut), can be used as check box, item in multiple selection box... tmpstring = _("Network UPS Tools"); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r45905 - in /trunk/yast2: library/desktop/src/menu.ycp library/gpg/src/GPG.ycp library/network/src/NetworkService.ycp package/yast2.changes
by jsrain＠svn.opensuse.org 01 Apr '08

01 Apr '08

Author: jsrain Date: Tue Apr 1 08:46:58 2008 New Revision: 45905 URL: http://svn.opensuse.org/viewcvs/yast?rev=45905&view=rev Log: merged texts from proofread Modified: trunk/yast2/library/desktop/src/menu.ycp trunk/yast2/library/gpg/src/GPG.ycp trunk/yast2/library/network/src/NetworkService.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/desktop/src/menu.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/desktop/src/menu.y… ============================================================================== --- trunk/yast2/library/desktop/src/menu.ycp (original) +++ trunk/yast2/library/desktop/src/menu.ycp Tue Apr 1 08:46:58 2008 @@ -87,7 +87,7 @@ //show popup when running as non-root if (!root) Popup::Notify(_("YaST2 Control Center is not running as root. -You will only see modules which do not require root privileges.")); +You can only see modules that do not require root privileges.")); } Modified: trunk/yast2/library/gpg/src/GPG.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/gpg/src/GPG.ycp?re… ============================================================================== --- trunk/yast2/library/gpg/src/GPG.ycp (original) +++ trunk/yast2/library/gpg/src/GPG.ycp Tue Apr 1 08:46:58 2008 @@ -254,7 +254,7 @@ if (SCR::Read(.target.size, xterm) < 0) { // TODO FIXME - Report::Error(_("Xterm is missing, install xterm package")); + Report::Error(_("Xterm is missing, install xterm package.")); } // in Qt start GPG in a xterm window Modified: trunk/yast2/library/network/src/NetworkService.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/Networ… ============================================================================== --- trunk/yast2/library/network/src/NetworkService.ycp (original) +++ trunk/yast2/library/network/src/NetworkService.ycp Tue Apr 1 08:46:58 2008 @@ -157,7 +157,7 @@ string error_text = sformat("%1\n%2 %3", _("No running network detected!"), Mode::installation() ? _("Restart installation and configure network in Linuxrc") : - _("Configure network with YaST or NetworkManager-plugin + _("Configure network with YaST or Network Manager plug-in and start this module again"), _("or continue without network.")); Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Apr 1 08:46:58 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 1 09:46:44 CEST 2008 - jsrain(a)suse.cz + +- merged texts from proofread + +------------------------------------------------------------------- Mon Mar 31 15:55:25 CEST 2008 - mvidner(a)suse.cz - Don't document a feature that is unclear and was never there -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

Jump to page:

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

YaST Commits April 2008