Author: thardeck Date: Mon Oct 10 11:14:23 2011 New Revision: 66353 URL: http://svn.opensuse.org/viewcvs/yast?rev=66353&view=rev Log: - fixed translation (bnc#722447) - removed workaround for (bnc#718089) Modified: branches/SuSE-Code-11-SP2-Branch/s390/VERSION branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes branches/SuSE-Code-11-SP2-Branch/s390/src/dump/ui.ycp branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal-server/helps.ycp branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal-server/ui.ycp branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal/ui.ycp branches/SuSE-Code-11-SP2-Branch/s390/src/modules/Dump.ycp branches/SuSE-Code-11-SP2-Branch/s390/src/modules/IUCVTerminal.ycp branches/SuSE-Code-11-SP2-Branch/s390/src/onpanic/ui.ycp Modified: branches/SuSE-Code-11-SP2-Branch/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/VERSION?rev=66353&r1=66352&r2=66353&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/VERSION Mon Oct 10 11:14:23 2011 @@ -1 +1 @@ -2.17.22 +2.17.23 Modified: branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes?rev=66353&r1=66352&r2=66353&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes Mon Oct 10 11:14:23 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 10 10:55:11 UTC 2011 - thardeck@suse.com + +- fixed translation (bnc#722447) +- removed workaround for (bnc#718089) + +------------------------------------------------------------------- Wed Sep 07 16:15:24 UTC 2011 - thardeck@suse.com - added IUCV Terminal module Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/dump/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/src/dump/ui.ycp?rev=66353&r1=66352&r2=66353&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/dump/ui.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/dump/ui.ycp Mon Oct 10 11:14:23 2011 @@ -123,8 +123,10 @@ } else { + // count devices for proper grammatical number output + integer num_devices = size(splitstring(device," ")); // warn only in case of force - if (!force || Popup::YesNo (sformat (_("The disk[s] %1 will be formatted as a dump device. All data on this device[s] will be lost! Continue?"), device))) + if (!force || Popup::YesNo (sformat (_("The disk %1 will be formatted as a dump device. All data on this device will be lost! Continue?", "The disks %1 will be formatted as a dump device. All data on these devices will be lost! Continue?", num_devices), device))) { boolean success = Dump::FormatDisk (device, force); // don't quit in case of failures, error messages are reported by FormatDisk() Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal-server/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal-server/helps.ycp?rev=66353&r1=66352&r2=66353&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal-server/helps.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal-server/helps.ycp Mon Oct 10 11:14:23 2011 @@ -32,7 +32,7 @@ + _("<p>To add or remove groups from the TS-Shell authorization table or to change the membership of them <b>Manage Groups</b> has to be called.</p>") -+ _("<p>With <b>Audited IDs</b> the z/VM IDs could be specified from which transrcripts should be gathered."), ++ _("<p>With <b>Audited IDs</b> the z/VM IDs could be specified from which transcripts should be gathered."), /* TS-Shell User creation dialog */ Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal-server/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal-server/ui.ycp?rev=66353&r1=66352&r2=66353&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal-server/ui.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal-server/ui.ycp Mon Oct 10 11:14:23 2011 @@ -648,7 +648,7 @@ void DrawTsUserDialog() { Wizard::SetContentsButtons(_("New TS-Shell User"), TsUserDialogContent(), - HELP["ts-user"]:"", Label::BackButton (), Label::OKButton ()); + HELP["ts-user"]:"", Label::BackButton (), Label::CreateButton ()); Wizard::SetAbortButton(`abort, Label::CancelButton()); } Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal/ui.ycp?rev=66353&r1=66352&r2=66353&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal/ui.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal/ui.ycp Mon Oct 10 11:14:23 2011 @@ -220,8 +220,8 @@ string caption = "Configure IUCV Terminal Settings"; string help = _("<p><h2>Configure Local Terminal System Settings</h2></p>") + _("<p><b>IUVCtty</b></p>") -+ _("<p>Several <b>IUCVtty instances</b> can run to provide multiple terminal devices. The instances are distinguished by a Terminal ID that consist of the <b>Terminal ID Prefix</b> and the number of the instance.<br>") -+ _("So if for example 10 instances are defined with the prefix "<i>lxterm</i>" Terminal IDs from <i>lxterm1</i> to <i>lxterm10</i> would be available.</p>") ++ _("<p>Several <b>IUCVtty instances</b> can run to provide multiple terminal devices. The instances are distinguished by a Terminal ID which is a combination of the the <b>Terminal ID Prefix</b> and the number of the instance.<br>") ++ _("So if for example 10 instances are defined with the prefix "<i>lxterm</i>" the Terminal IDs from <i>lxterm1</i> to <i>lxterm10</i> would be available.</p>") + "<p> </p>" + _("<p><b>HVC</b></p>") + _("<p>The z/VM IUCV HVC device driver is a kernel module and uses device nodes to enable up to 8 HVC terminal devices to communicate with getty and login programs.</p>") @@ -349,7 +349,7 @@ || IUCVTerminal::restrict_hvc_to_srvs != (string)UI::QueryWidget (`id (`restrict_hvc_to_srvs), `Value) || (IUCVTerminal::restrict_hvc_to_srvs != "" && !(boolean)UI::QueryWidget (`id (`is_hvc_restricted), `Value)) - || (IUCVTerminal::hvc_instances != 0 && HasEmulationChanged()) + || (HasEmulationChanged() && (boolean)UI::QueryWidget (`id (`hvc), `Value)) ); // if settings were changed don't exit without asking @@ -399,9 +399,7 @@ : ""; // check if the bootloader settings need to be adjusted IUCVTerminal::has_bootloader_changed = - // one HVC device is allowed by default so no extra Kernel parameter is needed - ((IUCVTerminal::hvc_instances != current_hvc_instances && ((current_hvc_instances + IUCVTerminal::hvc_instances) > 2)) - || IUCVTerminal::restrict_hvc_to_srvs != current_restrict_hvc_to_srvs + ( IUCVTerminal::restrict_hvc_to_srvs != current_restrict_hvc_to_srvs || IUCVTerminal::show_kernel_out_on_hvc != (boolean) UI::QueryWidget (`id (`show_kernel_out_on_hvc), `Value)); if (IUCVTerminal::has_bootloader_changed) @@ -441,7 +439,7 @@ symbol IUCVTerminalSequence() { symbol ret = nil; Wizard::CreateDialog(); - Wizard::SetDesktopIcon("dump"); + Wizard::SetDesktopIcon("iucvterminal"); IUCVTerminal::Read (); ret = TerminalDialog (); // only write during Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/modules/Dump.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/src/modules/Dump.ycp?rev=66353&r1=66352&r2=66353&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/modules/Dump.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/modules/Dump.ycp Mon Oct 10 11:14:23 2011 @@ -80,15 +80,15 @@ * @return boolean true on success */ global define boolean FormatDisk (string dev, boolean force) { - string caption = _("Creating Dump Device[s]"); + string caption = _("Creating Dump Device"); integer steps = 1; Progress::New (caption, " ", steps, [ /* Progress stage 1/1 */ - _("Creating dump device[s]") + _("Creating dump device") ], [ /* Progress step 1/1 */ - _("Creating dump device[s]. This process might take some minutes."), + _("Creating dump device. This process might take some minutes."), /* Progress finished */ _("Finished") ], Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/modules/IUCVTerminal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/src/modules/IUCVTerminal.ycp?rev=66353&r1=66352&r2=66353&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/modules/IUCVTerminal.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/modules/IUCVTerminal.ycp Mon Oct 10 11:14:23 2011 @@ -200,12 +200,6 @@ restrict_hvc_to_srvs = restrict_hvc_to_srvs_output; } - string hvc_instances_output = Bootloader::getKernelParam (actual_boot_section, "hvc_iucv"); - if (hvc_instances_output != "false") - { - hvc_instances = tointeger(hvc_instances_output); - } - string console = Bootloader::getKernelParam (actual_boot_section, "console"); // if console is defined if (console != "false") @@ -325,21 +319,10 @@ // writing Kernel parameters Progress::NextStage(); + string actual_boot_section = Bootloader::getDefaultSection (); // only change/save the bootloader configuration if it was adjusted if (has_bootloader_changed) { - string actual_boot_section = Bootloader::getDefaultSection (); - // one hvc device is activated by default so no kernel parameter needed in this case - if (hvc_instances > 1) - { - Bootloader::setKernelParam (actual_boot_section, "hvc_iucv", tostring(hvc_instances)); - } - else - { - // remove entry - Bootloader::setKernelParam (actual_boot_section, "hvc_iucv", "false"); - } - // removing empty option if (restrict_hvc_to_srvs == "") { Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/onpanic/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/src/onpanic/ui.ycp?rev=66353&r1=66352&r2=66353&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/onpanic/ui.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/onpanic/ui.ycp Mon Oct 10 11:14:23 2011 @@ -88,7 +88,7 @@ // For translators: Caption of the dialog string caption = _("On Panic Configuration"); - string help = _("<p><b>Configure the action[s] to be taken if a kernel panic occurs</b></p>") + string help = _("<p><b>Configure the actions to be taken if a kernel panic occurs</b></p>") + _("<p>The <b>Dumpconf</b> daemon needs to be enabled to influence the behavior during kernel panics.</p>") + _("<p>The following <b>Panic Actions</b> are possible:<br>") + _("<b>stop</b> Stop Linux (default).<br>") -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org