Author: jsuchome Date: Thu Mar 29 15:50:42 2012 New Revision: 67800 URL: http://svn.opensuse.org/viewcvs/yast?rev=67800&view=rev Log: - merge proofread texts Modified: trunk/registration/package/yast2-registration.changes trunk/registration/src/clients/inst_suse_register.ycp trunk/registration/src/clients/suse_register_auto.ycp trunk/registration/src/dialogs/texts.ycp trunk/registration/src/modules/Register.ycp Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-registration.changes?rev=67800&r1=67799&r2=67800&view=diff ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Thu Mar 29 15:50:42 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 15:50:13 CEST 2012 - jsuchome@suse.cz + +- merge proofread texts + +------------------------------------------------------------------- Fri Aug 5 17:26:09 CEST 2011 - jdsn@suse.de - make use of ButtonBox where possible to make button order Modified: trunk/registration/src/clients/inst_suse_register.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/clients/inst_suse_register.ycp?rev=67800&r1=67799&r2=67800&view=diff ============================================================================== --- trunk/registration/src/clients/inst_suse_register.ycp (original) +++ trunk/registration/src/clients/inst_suse_register.ycp Thu Mar 29 15:50:42 2012 @@ -221,9 +221,10 @@ string help_para6 = _("<p> The registration process will contact a Novell server (or a local registration server if your company provides one). -Please make sure that the network and proxy settings are correct. -You can step back to the network setup to check or change the settings. -</p>"); +Make sure that the network and proxy settings are correct. +You can go back to the network setup to check or change the settings. +</p> +"); /* START - Help Texts for OPEN-SLX */ Modified: trunk/registration/src/clients/suse_register_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/clients/suse_register_auto.ycp?rev=67800&r1=67799&r2=67800&view=diff ============================================================================== --- trunk/registration/src/clients/suse_register_auto.ycp (original) +++ trunk/registration/src/clients/suse_register_auto.ycp Thu Mar 29 15:50:42 2012 @@ -208,9 +208,9 @@ string help_text_caption = sformat("<p><b>%1</b></p>", caption); string help_text_para1 = _("<p>Product registration includes your product in Novell's database, enabling you to get online updates and technical support. To register while installing automatically, select <b>Run Product Registration</b>. To simplify the procedure, include information from your system with <b>Hardware Profile</b> and <b>Optional Information</b>.</p>"); string help_text_para2 = _("<p>Get more information about the registration process with <tt>suse_register -h</tt>.</p>"); - string help_text_para3 = _("<p>Other information used for registration is shown in <b>Registration Data</b>.<br>Add a new key and value pair by pressing <b>Add</b> and then entering the appropriate values. These parameters are the ones that can be passed with <tt>suse_register -a</tt>.<br>Get more information about them with <tt>suse_register -p</tt>. Remove a pair with <b>Delete</b> or modify an existing pair with <b>Edit</b>.</p>"); + string help_text_para3 = _("<p>Other information used for registration is shown in <b>Registration\nData</b>.<br>To add a new key and value pair, press <b>Add</b> then enter the\nappropriate values. These parameters are can be passed with <tt>suse_register\n-a</tt>.<br>Get more information with <tt>suse_register -p</tt>. Remove a\nkey-value pair with <b>Delete</b> or modify an existing pair with <b>Edit</b>.</p>"); - string help_text_para4 = _("<p>If your network deploys a custom SMT server, please set the URL of the SMT Server and the location of the SMT Certificate in <b>SMT Server Settings</b>. Please see your SMT manual for further assistance.</p>"); + string help_text_para4 = _("<p>If your network deploys a custom SMT server, set the URL of the SMT Server\nand the location of the SMT certificate in <b>SMT Server Settings</b>. Refer\nto your SMT manual for further assistance.</p>"); string help_text = help_text_caption + help_text_para1 + help_text_para2 + help_text_para3 + help_text_para4; @@ -369,7 +369,9 @@ smtServerCert != "" ) { - Popup::Message(_("Location of SMT Certificate invalid.\nPlease see your SMT documentation.")); + Popup::Message(_("Location of SMT Certificate invalid. +See your SMT documentation. +")); ret = nil; } Register::smt_server = smtServer; Modified: trunk/registration/src/dialogs/texts.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/dialogs/texts.ycp?rev=67800&r1=67799&r2=67800&view=diff ============================================================================== --- trunk/registration/src/dialogs/texts.ycp (original) +++ trunk/registration/src/dialogs/texts.ycp Thu Mar 29 15:50:42 2012 @@ -24,7 +24,9 @@ "registrationWasSuccessful" : _("Registration was successful."), "defaultUpdateRepoRestored" : _("The default update repository has been restored."), "defaultUpdateRepoAdded" : _("The default update repository has been added."), - "needToRegister" : _("In order to add the default update repository\nyou have to register this product."), + "needToRegister" : _("To add the default update repository, +you have to register this product. +"), "runRegistrationNow" : _("Do you want to perform the registration now?"), "canRegister" : _("You can register for installation support."), "startingRegistration" : _("Starting registration..."), @@ -38,10 +40,12 @@ "customRegistrationServer" : _("Custom Registration Server"), "urlInvalid" : _("URL invalid"), "urlHasToBeHttps" : _("The registration server URL has to start with https://"), - "serverCACrtificateInvalid" : _("Server CA certificate location is invalid.\nFor details please see the help text."), + "serverCACrtificateInvalid" : _("Server CA certificate location is invalid. +For details, see the help text. +"), "addRegistrationData" : _("Add custom registration data"), "addKeyValuePairs" : _("Add key value pairs:"), - "seeHelpForDetails" : _("Please see the help for details."), + "seeHelpForDetails" : _("See the help text for details."), // translators: "key" as in "key value pair" "key" : _("Key"), // translators: "value" as in "key value pair" @@ -50,7 +54,7 @@ map HELP = $[ - "localRegistrationChapter1" : _("<p>To register this installation at a local registration server please configure the URL and optionally the server's CA certificate via the <b>Advanced</b> menu.</p>"), + "localRegistrationChapter1" : _("<p>To register this installation at a local registration server, configure the URL and optionally the server's CA certificate via the <b>Advanced</b> menu.</p>"), "localRegistrationChapter2" : _("<p>The registration server URL has to start with <i>https://</i> whereas the location of its CA certificate may be a URL of the format <i>http://</i>, <i>https://</i> or <i>ftp://</i>. Furthermore valid locations are <i>/path/on/local/disk</i>, <b>floppy</b><i>/path/on/floppy-disk</i> and the keyword <i>done</i>. The latter indicates that no CA certificate handling needs to be done in order to trust the registration server.</p>") ]; Modified: trunk/registration/src/modules/Register.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/modules/Register.ycp?rev=67800&r1=67799&r2=67800&view=diff ============================================================================== --- trunk/registration/src/modules/Register.ycp (original) +++ trunk/registration/src/modules/Register.ycp Thu Mar 29 15:50:42 2012 @@ -154,10 +154,11 @@ if (heading == nil || heading == "") heading = _("Unknown error"); string errorrMessage = ""; - string question = _("Do you want to skip Registration?"); - string otherwise = sformat( _("If you select %1 the Registration will most likely fail. -Otherwise you may copy the certificate file to the system manually -and then specify its path by choosing %2."), deletechars(Label::ContinueButton(), "&"), deletechars(Label::FileName(), "&") ); + string question = _("Do you want to skip registration?"); + string otherwise = sformat( _("If you select %1, registration will most likely fail. +You can copy the certificate file to the system manually +and then specify its path by choosing %2. +"), deletechars(Label::ContinueButton(), "&"), deletechars(Label::FileName(), "&") ); string errorMessage = ""; if (type == `floppy) @@ -174,7 +175,7 @@ } else { - errorMessage = _("Unknown error occurred while retrieving SMT certificate file"); + errorMessage = _("Unknown error occurred while retrieving SMT certificate file."); } errorMessage = errorMessage + "\n\n" + question + "\n\n" + otherwise; @@ -303,7 +304,7 @@ string no_smt1 = _("The registration server URL could not be validated as URL."); string no_smt2 = _("Registration can not be performed."); - string no_smt3 = _("Please change the URL and retry."); + string no_smt3 = _("Change the URL and retry."); string no_smt_current = sformat( _("The current registration server URL is\n%1"), smt_server); string no_smt_server = sformat("%1\n%2\n%3\n\n%4", no_smt1, no_smt2, no_smt3, no_smt_current); @@ -454,7 +455,7 @@ if (ay) return `silentskip; // translators: this is a heading for an error message - so no punctuation - string fdCopyError = _("Could not read file floppy disk"); + string fdCopyError = _("Could not read file on floppy disk"); symbol errret = certificateError( fdCopyError, `floppy); if ( errret == `yes ) @@ -525,7 +526,7 @@ if (certFile == nil) { - string skipReg = _("Do you really want to cancel and thereby skip the Registration?"); + string skipReg = _("Do you really want to cancel and thereby skip registration?"); if (Popup::YesNo(skipReg)) { y2milestone("User selected to cancel manual certificate dialog and thereby skip registration"); @@ -603,7 +604,9 @@ } string trustQuestion = _("Do you want to trust this certificate?"); - string trustMessage = _("This certificate will be used to connect to the SMT server.\nYou have to trust this certificate in order to continue with the Registration."); + string trustMessage = _("This certificate will be used to connect to the SMT server. +You have to trust this certificate to continue with the registration. +"); string certInfo = ""; @@ -673,7 +676,9 @@ { y2error("Failed to install SMT certificate to common cert storage. Registration would fail and thus will be skipped."); - if (!ay) Popup::Message(_("Installation of the SMT certificates failed.\nPlease see the logs for further information.")); + if (!ay) Popup::Message(_("Installation of the SMT certificates failed. +See the logs for further information. +")); return `silentskip; } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org