Author: jsuchome Date: Thu Mar 29 14:38:45 2012 New Revision: 67762 URL: http://svn.opensuse.org/viewcvs/yast?rev=67762&view=rev Log: - merged proofread texts Modified: trunk/drbd/package/yast2-drbd.changes trunk/drbd/src/dialogs.ycp trunk/drbd/src/drbd.ycp trunk/drbd/src/drbd_proposal.ycp trunk/drbd/src/helps.ycp trunk/drbd/src/resource_conf.ycp trunk/drbd/src/startup_conf.ycp Modified: trunk/drbd/package/yast2-drbd.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/drbd/package/yast2-drbd.changes?rev=67762&r1=67761&r2=67762&view=diff ============================================================================== --- trunk/drbd/package/yast2-drbd.changes (original) +++ trunk/drbd/package/yast2-drbd.changes Thu Mar 29 14:38:45 2012 @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 29 14:38:17 CEST 2012 - jsuchome@suse.cz + +- merged proofed texts + Mon Jan 12 10:37:53 CST 2009 - xwhu@suse.de - bnc#464116: texts not marked for translation Modified: trunk/drbd/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/drbd/src/dialogs.ycp?rev=67762&r1=67761&r2=67762&view=diff ============================================================================== --- trunk/drbd/src/dialogs.ycp (original) +++ trunk/drbd/src/dialogs.ycp Thu Mar 29 14:38:45 2012 @@ -59,10 +59,10 @@ any Configure1Dialog () { /* Drbd configure1 dialog caption */ - string caption = _("Drbd Configuration"); + string caption = _("DRBD Configuration"); /* Drbd configure1 dialog contents */ - term contents = `Label (_("First part of configuration of drbd")); + term contents = `Label (_("First part of DRBD configuration")); Wizard::SetContentsButtons(caption, contents, HELPS["c1"]:"", Label::BackButton(), Label::NextButton()); @@ -96,10 +96,10 @@ any Configure2Dialog () { /* Drbd configure2 dialog caption */ - string caption = _("Drbd Configuration"); + string caption = _("DRBD Configuration"); /* Drbd configure2 dialog contents */ - term contents = `Label (_("Second part of configuration of drbd")); + term contents = `Label (_("Second part of DRBD configuration")); Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"", Label::BackButton(), Label::NextButton()); Modified: trunk/drbd/src/drbd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/drbd/src/drbd.ycp?rev=67762&r1=67761&r2=67762&view=diff ============================================================================== --- trunk/drbd/src/drbd.ycp (original) +++ trunk/drbd/src/drbd.ycp Thu Mar 29 14:38:45 2012 @@ -51,7 +51,7 @@ map cmdline_description = $[ "id" : "drbd", /* Command line help text for the Xdrbd module */ - "help" : _("Configuration of drbd"), + "help" : _("Configuration of DRBD"), "guihandler" : DrbdSequence, "initialize" : Drbd::Read, "finish" : Drbd::Write, Modified: trunk/drbd/src/drbd_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/drbd/src/drbd_proposal.ycp?rev=67762&r1=67761&r2=67762&view=diff ============================================================================== --- trunk/drbd/src/drbd_proposal.ycp (original) +++ trunk/drbd/src/drbd_proposal.ycp Thu Mar 29 14:38:45 2012 @@ -87,9 +87,9 @@ else if(func == "Description") { ret = $[ /* Rich text title for Drbd in proposals */ - "rich_text_title" : _("Drbd"), + "rich_text_title" : _("DRBD"), /* Menu title for Drbd in proposals */ - "menu_title" : _("&Drbd"), + "menu_title" : _("&DRBD"), "id" : "drbd", ]; } Modified: trunk/drbd/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/drbd/src/helps.ycp?rev=67762&r1=67761&r2=67762&view=diff ============================================================================== --- trunk/drbd/src/helps.ycp (original) +++ trunk/drbd/src/helps.ycp Thu Mar 29 14:38:45 2012 @@ -37,8 +37,8 @@ map HELPS = $[ /* Read dialog help 1/2 */ - "read" : _("<p><b><big>Initializing drbd Configuration</big></b><br> -Please wait...<br></p> + "read" : _("<p><b><big>Initializing DRBD Configuration</big></b><br> +</p> ") + /* Read dialog help 2/2 */ @@ -47,8 +47,8 @@ "), /* Write dialog help 1/2 */ - "write" : _("<p><b><big>Saving drbd Configuration</big></b><br> -Please wait...<br></p> + "write" : _("<p><b><big>Saving DRBD Configuration</big></b><br> +</p> ") + /* Write dialog help 2/2 */ @@ -69,21 +69,21 @@ The Dialog will print the count each \'dialog-refresh\' seconds, set it to 0 to disable redrawing completely. </p>") +_("<p><b>Minor Count:</b> - use this if you want to define more resources later - without reloading the module. - by default we load the module with exactly as many devices - as configured mentioned in this file. </p>"), +Use this option if you want to define more resources later without reloading the +module. By default we load the module with exactly as many devices as +configured in this file.</p> +"), /* Summary dialog help 1/3 */ - "summary" : _("<p><b><big>Drbd Configuration</big></b><br> -Configure drbd here.<br></p> + "summary" : _("<p><b><big>DRBD Configuration</big></b><br> +Configure DRBD here.<br></p> ") + /* Summary dialog help 2/3 */ - _("<p><b><big>Adding a drbd:</big></b><br> -Choose an drbd from the list of detected drbds. -If your drbd was not detected, use <b>Other (not detected)</b>. + _("<p><b><big>Adding a DRBD:</big></b><br> +Choose a DRBD from the list of detected DRBDs. +If your DRBD was not detected, use <b>Other (not detected)</b>. Then press <b>Configure</b>.</p> ") + @@ -94,18 +94,19 @@ "), /* Ovreview dialog help 1/3 */ - "overview" : _("<p><b><big>Drbd Configuration Overview</big></b><br> -Obtain an overview of installed drbds. Additionally + "overview" : _("<p><b><big>DRBD Configuration Overview</big></b><br> +Obtain an overview of installed DRBDS. Additionally edit their configurations.<br></p> ") + /* Ovreview dialog help 2/3 */ -_("<p><b><big>Adding a drbd:</big></b><br> -Press <b>Add</b> to configure a drbd.</p>") + +_("<p><b><big>Adding a DRBD:</big></b><br> +Press <b>Add</b> to configure a DRBD.</p> +") + /* Ovreview dialog help 3/3 */ _("<p><b><big>Editing or Deleting:</big></b><br> -Choose a drbd to change or remove. +Choose a DRBD to change or remove. Then press <b>Edit</b> or <b>Delete</b> as desired.</p> "), Modified: trunk/drbd/src/resource_conf.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/drbd/src/resource_conf.ycp?rev=67762&r1=67761&r2=67762&view=diff ============================================================================== --- trunk/drbd/src/resource_conf.ycp (original) +++ trunk/drbd/src/resource_conf.ycp Thu Mar 29 14:38:45 2012 @@ -348,7 +348,7 @@ string str = (string) UI::QueryWidget(`id(the_id), `Value); if (str == nil || size(str) == 0) { - Popup::Warning(_("Please fill out all fields.")); + Popup::Warning(_("Fill out all fields.")); ret = nil; break; } Modified: trunk/drbd/src/startup_conf.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/drbd/src/startup_conf.ycp?rev=67762&r1=67761&r2=67762&view=diff ============================================================================== --- trunk/drbd/src/startup_conf.ycp (original) +++ trunk/drbd/src/startup_conf.ycp Thu Mar 29 14:38:45 2012 @@ -49,8 +49,9 @@ `HSquash ( `VBox ( `VBox ( - `Left( `Label (_("To propagate this configuration , -copy the configuration file '/etc/drbd.conf' to the rest of nodes manually."))) + `Left( `Label (_("To propagate this configuration, +copy the configuration file '/etc/drbd.conf' to the rest of nodes manually. +"))) ) )))); @@ -90,7 +91,7 @@ if (! Service::Start("drbd")) { //Report::Error ( Service::Error()); - Report::Error (_("Start Drbd service failed")); + Report::Error (_("Starting DRBD service failed.")); } continue; } @@ -98,7 +99,7 @@ if (ret == "stop_now") { if (! Service::Stop("drbd")) { //Report::Error ( Service::Error() ); - Report::Error (_("Stop Drbd service failed")); + Report::Error (_("Stopping DRBD service failed.")); } continue; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org