Author: aschnell Date: Fri Nov 18 14:38:18 2011 New Revision: 66872 URL: http://svn.opensuse.org/viewcvs/yast?rev=66872&view=rev Log: - merged proofread texts Modified: trunk/s390/VERSION trunk/s390/package/yast2-s390.changes trunk/s390/src/Makefile.am trunk/s390/src/clients/iucvterminal-server.ycp trunk/s390/src/clients/iucvterminal.ycp trunk/s390/src/dasd/helps.ycp trunk/s390/src/dump/ui.ycp trunk/s390/src/iucvterminal-server/helps.ycp trunk/s390/src/iucvterminal-server/ui.ycp trunk/s390/src/iucvterminal/ui.ycp trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/Dump.ycp trunk/s390/src/modules/IUCVTerminal.ycp trunk/s390/src/modules/IUCVTerminalServer.ycp trunk/s390/src/onpanic/ui.ycp trunk/s390/src/zfcp/helps.ycp Modified: trunk/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/VERSION?rev=66872&r1=66871&r2=66872&view=diff ============================================================================== --- trunk/s390/VERSION (original) +++ trunk/s390/VERSION Fri Nov 18 14:38:18 2011 @@ -1 +1 @@ -2.21.9 +2.22.0 Modified: trunk/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/package/yast2-s390.changes?rev=66872&r1=66871&r2=66872&view=diff ============================================================================== --- trunk/s390/package/yast2-s390.changes (original) +++ trunk/s390/package/yast2-s390.changes Fri Nov 18 14:38:18 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Nov 18 14:22:22 CET 2011 - aschnell@suse.de + +- merged proofread texts + +------------------------------------------------------------------- Mon Oct 31 10:59:47 EDT 2011 - thardeck@suse.com - fixed iucvterminal* module typos (bnc#723425) Modified: trunk/s390/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/Makefile.am?rev=66872&r1=66871&r2=66872&view=diff ============================================================================== --- trunk/s390/src/Makefile.am (original) +++ trunk/s390/src/Makefile.am Fri Nov 18 14:38:18 2011 @@ -1 +1 @@ -SUBDIRS = zfcp dasd xpram dump onpanic modules clients config +SUBDIRS = zfcp dasd xpram dump onpanic modules clients config iucvterminal iucvterminal-server Modified: trunk/s390/src/clients/iucvterminal-server.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/iucvterminal-server.ycp?rev=66872&r1=66871&r2=66872&view=diff ============================================================================== --- trunk/s390/src/clients/iucvterminal-server.ycp (original) +++ trunk/s390/src/clients/iucvterminal-server.ycp Fri Nov 18 14:38:18 2011 @@ -20,7 +20,7 @@ map cmdline_description = $[ "id" : "iucvterminal-server", // Command line help text for the Xcontroller module - "help" : _("Configuration of IUCV Terminal Server"), + "help" : _("Configuration of IUCV terminal server"), "guihandler" : IUCVTerminalServerSequence, "actions" : $[ // FIXME TODO: fill the functionality description here Modified: trunk/s390/src/clients/iucvterminal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/iucvterminal.ycp?rev=66872&r1=66871&r2=66872&view=diff ============================================================================== --- trunk/s390/src/clients/iucvterminal.ycp (original) +++ trunk/s390/src/clients/iucvterminal.ycp Fri Nov 18 14:38:18 2011 @@ -20,7 +20,7 @@ map cmdline_description = $[ "id" : "iucvterminal", // Command line help text for the Xcontroller module - "help" : _("Configuration of IUCV Terminal Settings"), + "help" : _("Configuration of IUCV terminal settings"), "guihandler" : IUCVTerminalSequence, "actions" : $[ // FIXME TODO: fill the functionality description here Modified: trunk/s390/src/dasd/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/helps.ycp?rev=66872&r1=66871&r2=66872&view=diff ============================================================================== --- trunk/s390/src/dasd/helps.ycp (original) +++ trunk/s390/src/dasd/helps.ycp Fri Nov 18 14:38:18 2011 @@ -18,7 +18,8 @@ /* Read dialog help 1/2 */ "read" : _("<p><b><big>Initializing Controller Configuration</big></b><br> -Please wait...<br></p>") + +</p> +") + /* Read dialog help 2/2 */ _("<p><b><big>Aborting Initialization:</big></b><br> @@ -26,21 +27,23 @@ /* Write dialog help 1/2 */ "write" : _("<p><b><big>Saving Controller Configuration</big></b><br> -Please wait...<br></p>") + +</p> +") + /* Write dialog help 2/2 */ _("<p><b><big>Aborting Saving:</big></b><br> Abort the save procedure by pressing <b>Abort</b>. -An additional dialog informs whether it is safe to do so.</p>"), +An additional dialog will inform you whether it is safe to do so.</p> +"), /* Disk selection dialog help 1/4 */ "disk_selection_config" : _("<p><b><big>Configured DASD Disks</big></b><br> In this dialog, manage DASD disks on your system.</p>") + /* Disk selection dialog help 2/4 */ -_("<p>To filter disks that you want to have displayed, set -the <b>Minimum Channel</b> and the <b>Maximum Channel</b> -and click <b>Filter</b>.</p>") + +_("<p>To filter the displayed disks, set the <b>Minimum Channel</b> and +the <b>Maximum Channel</b> and click <b>Filter</b>.</p> +") + /* Disk selection dialog help 4/4 */ _("<p>To configure a new DASD disk, click <b>Add</b>.</p>") + @@ -54,14 +57,14 @@ In this dialog, manage DASD disks on your system.</p>") + /* Disk selection dialog help 2/4 */ -_("<p>To filter disks that you want to have displayed, set -the <b>Minimum Channel</b> and the <b>Maximum Channel</b> -and click <b>Filter</b>.</p>") + +_("<p>To filter the displayed disks, set the <b>Minimum Channel</b> and +the <b>Maximum Channel</b> and click <b>Filter</b>.</p> +") + /* Disk selection dialog help 3/4 */ -_("<p>All actions can be performed on multiple disks at once. To select disks -on which to perform an action, select the desired disks and click -<b>Select or Deselect</b>.</p>") + +_("<p>To perform actions on multiple disks at once, mark these disks and click +<b>Select or Deselect</b>.</p> +") + /* Disk selection dialog help 4/4 */ _("<p>To perform an action on the selected disks, use <b>Perform Action</b>. @@ -69,19 +72,20 @@ /* Disk add help 1/3 */ "disk_add_config" : _("<p><b><big>Add New DASD Disk</big></b><br> -Enter the identifier of the disk to add. To specify the disk, use the -<b>Channel Number</b> of the DASD disk.</p>") +To add a disk, enter the <b>Channel Number</b> of the DASD disk as +identifier.</p>") + /* Disk add help 1/3 */ -_("<p>To specify if the disk will be formatted, -use <b>Format the Disk</b>.</p>") +_("<p>If the disk should be formatted, +use <b>Format the Disk</b>.</p> +") + (Arch::s390_32 () /* Disk add help 3/3, optional */ - ? _("<p>To specify if DIAG mode will be used, -use <b>Use DIAG</b>.</p>") + ? _("<p>To use DIAG mode, select <b>Use DIAG</b>.</p> +") : ""), ]; Modified: trunk/s390/src/dump/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dump/ui.ycp?rev=66872&r1=66871&r2=66872&view=diff ============================================================================== --- trunk/s390/src/dump/ui.ycp (original) +++ trunk/s390/src/dump/ui.ycp Fri Nov 18 14:38:18 2011 @@ -33,13 +33,16 @@ /* Dump dialog help 2/8 */ + _("<p>Supported devices are ECKD DASD and ZFCP disks, while multi-volumes are limited to DASD.<br>") /* Dump dialog help 3/8 */ -+ _("Only whole disks can be used, no partitions! If the device is incompatible formatted/partioned, activate the checkbox <b>Force overwrite of disk</b></p>") ++ _("Only whole disks can be used, no partitions. If the device is incompatibly\nformatted or partitioned, activate the checkbox <b>Force overwrite of disk</b>.</p>") /* Dump dialog help 4/8 */ -+ _("<p>DASD and ZFCP devices have to be active to be utilized. This activation can be done in the respective YaST DASD or ZFCP dialog.<br>") ++ _("<p>To use DASD and ZFCP devices activate them in the respective YaST DASD or ZFCP dialog.<br>") /* Dump dialog help 5/8 */ + _("Devices which are in use or have mounted partitions will not be shown.</p>") + /* Dump dialog help 6/8 */ -+ _("The mentioning of <b>dumpdevice</b> after a disk indicates that it is an already usable dump device. Additionally multi-volume dump devices are indicated by the list of including DASD ids. </p>") ++ _("<p><b>dumpdevice</b> after a disk indicates that it is a usable dump +device. Multi-volume dump devices are indicated by a list of DASD IDs.</p>") + /* Dump dialog help 7/8 */ + _("<p>ZFCP columns: Device, Size, ID, WWPN, LUN, Dump<br>") /* Dump dialog help 8/8 */ Modified: trunk/s390/src/iucvterminal-server/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/iucvterminal-server/helps.ycp?rev=66872&r1=66871&r2=66872&view=diff ============================================================================== --- trunk/s390/src/iucvterminal-server/helps.ycp (original) +++ trunk/s390/src/iucvterminal-server/helps.ycp Fri Nov 18 14:38:18 2011 @@ -18,25 +18,26 @@ /* z/VM IDs dialog help 1/1 */ "zvmids" : _("<p><b><big>z/VM IDs</big></b></p>") -+ _("<p>To configure the IUCV Terminal Server the z/VM IDs which are to be used have to be specified. -<br>They are separated by breaks from each other.</p>"), ++ _("<p>To configure the IUCV terminal server, specify the z/VM IDs to be used. +<br>They are separated by line breaks.</p> +"), /* TS-Shell dialog help 1/5 */ "ts" : _("<p><b><big>TS-Shell</big></b></p>") -+ _("<p>TS-Shell allows the <b>Authorization</b> to be specified for every TS-Shell user and group. The rights of a group are inherited by its members.</p>") ++ _("<p>TS-Shell allows to specify <b>Authorization</b> for every TS-Shell user and group. The rights of a group are inherited by its members.</p>") /* TS-Shell dialog help 2/5 */ -+ _("<p>Each allowed z/VM ID is either selected manually under <b>Selection</b>, defined by a <b>Regex</b> or loaded from a <b>File</b> which consists all allowed z/VM IDs separated by breaks.</p>") ++ _("<p>Each allowed z/VM ID can be selected manually under <b>Selection</b>, defined by a <b>Regex</b> or loaded from a <b>File</b> which contains all allowed z/VM IDs separated by line breaks.</p>") /* TS-Shell dialog help 3/5 */ -+ _("<p>By clicking on the button <b>New User</b> addtional TS-Shell users could be created and also deleted by using <b>Delete User</b>.</p>") ++ _("<p>Click on <b>New User</b> to create new TS-Shell users or <b>Delete\nUser</b> to remove users.</p>") /* TS-Shell dialog help 4/5 */ -+ _("<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>To add or remove groups from the TS-Shell authorization table or to change\nthe membership of users, go to <b>Manage Groups</b>.</p>") /* TS-Shell dialog help 5/5 */ -+ _("<p>With <b>Audited IDs</b> the z/VM IDs could be specified from which transcripts should be gathered.</p>"), ++ _("<p>With <b>Audited IDs</b> specify the z/VM IDs from which transcripts should be gathered.</p>"), /* TS-Shell User creation dialog help 1/3 */ @@ -45,28 +46,28 @@ <br>It is also possible to specify <b>Additional Groups</b> by selecting them on the right.</p>") /* TS-Shell User creation dialog help 2/3 */ -+ _("<p>To ensure that the user changes his password after the first Login <b>Force Password Change</b> has to be activated.</p>") ++ _("<p>To ensure that the user changes his password after the first login, activate <b>Force Password Change</b>.</p>") /* TS-Shell User creation dialog help 3/3 */ -+ _("<p>The home directory could be the same for every TS-SHell user since it is not used for saving purposes.</p>"), ++ _("<p>You can specify the same home directory for every TS-Shell user since no\ndata will be stored there.</p>"), /* TS-Shell Managing Groups dialog help 1/5 */ "ts-group" : _("<p><b><big>Manage Groups for TS-Authorization</big></b></p>") -+ _("<p>It is possible to define TS-Shell authorizations per group so every TS-Shell member of this groups inherits these rights.</p>") ++ _("<p>Define TS-Shell authorizations per group if you want every TS-Shell \nmember of this groups to inherit the same rights.</p>") /* TS-Shell Managing Groups dialog help 2/5 */ -+ _("<p>Already existing groups could be added to or removed from the TS-Shell authorization by selecting them in the table and clicking on <b>Select or Deselect</b>. The current status is shown in the column <b>TS-Auth</b>.</p>") ++ _("<p>Existing groups can be added to or removed from the TS-Shell\nauthorization. Select the groups in the table and click on <b>Select or Deselect</b>. The current status is shown in the column <b>TS-Auth</b>.</p>") /* TS-Shell Managing Groups dialog help 3/5 */ -+ _("<p>TS-Shell members of the selected group could be changed in the <b>TS-Members</b> selection.</p>") ++ _("<p>Change TS-Shell members of a selected group in the <b>TS-Members</b>\nselection.</p>") /* TS-Shell Managing Groups dialog help 4/5 */ + _("<p>New groups could be created by entering the name in the <b>New Group</b> input field and confirming with <b>Create</b>. <br>To delete previously created groups the <b>YaST users</b> dialog has to be used.</p>") /* TS-Shell Managing Groups dialog help 5/5 */ -+ _("<p>Changes in this dialog could be undone by using the <b>Back</b> button.</p>"), ++ _("<p>Undo changes in this dialog by clicking the <b>Back</b> button.</p>"), /* IUCVConn on Login dialog help 1/2 */ Modified: trunk/s390/src/iucvterminal-server/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/iucvterminal-server/ui.ycp?rev=66872&r1=66871&r2=66872&view=diff ============================================================================== --- trunk/s390/src/iucvterminal-server/ui.ycp (original) +++ trunk/s390/src/iucvterminal-server/ui.ycp Fri Nov 18 14:38:18 2011 @@ -270,7 +270,7 @@ `VBox( `VSpacing(VSPACING), // force min size to make it easier readable in terminals - `MinWidth(14, `MultiSelectionBox(`id(`ts_audited_ids), `opt(`notify), _("&Auditied IDs"), zvm_id_entries)), + `MinWidth(14, `MultiSelectionBox(`id(`ts_audited_ids), `opt(`notify), _("&Audited IDs"), zvm_id_entries)), `VSpacing(VSPACING) ) ) @@ -501,7 +501,7 @@ if (ts_password == "") { UI::SetFocus(`ts_pw1); - Popup::Notify(_("The passwords don't match or are invalid.")); + Popup::Notify(_("The passwords do not match or are invalid.")); ret = false; } // check if the user specifcation is valid and if the name does already exist @@ -1175,7 +1175,7 @@ { // change tab selection back UI::ChangeWidget (`id (`tab), `CurrentItem, `t_zvmids); - Popup::Notify (_("It is not possible to configure the Terminal Server without valid z/VM IDs.")); + Popup::Notify (_("Cannot configure the terminal server without valid z/VM IDs.")); } } } @@ -1278,7 +1278,7 @@ // check for z/VM ID entries if (size(zvm_id_list) == 0) { - Popup::Notify (_("It is not possible to configure the Terminal Server without valid z/VM IDs.")); + Popup::Notify (_("Cannot configure the terminal server without valid z/VM IDs.")); ret = `again; continue; } Modified: trunk/s390/src/iucvterminal/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/iucvterminal/ui.ycp?rev=66872&r1=66871&r2=66872&view=diff ============================================================================== --- trunk/s390/src/iucvterminal/ui.ycp (original) +++ trunk/s390/src/iucvterminal/ui.ycp Fri Nov 18 14:38:18 2011 @@ -101,7 +101,7 @@ } else if (regexpmatch(restrict_hvc_to_srvs, "[[:lower:][:digit:]]{9,}")) { - Popup::Notify(_("z/VM IDs don't allow more than eight characters.")); + Popup::Notify(_("z/VM IDs do not allow more than eight characters.")); } else { @@ -128,7 +128,7 @@ } else if (regexpmatch(iucv_name, ".{" + tostring(max_length + 1) + ",}")) { - Popup::Notify(sformat(_("IUCV IDs can't be longer than %1 chars."), max_length)); + Popup::Notify(sformat(_("IUCV IDs cannot be longer than %1 chars."), max_length)); } else { @@ -227,10 +227,10 @@ + _("<p><b>IUCVtty</b></p>") /* IUCVTerminal dialog help 3/11 */ -+ _("<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 <b>Terminal ID Prefix</b> and the number of the instance.<br>") ++ _("<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 <b>Terminal ID Prefix</b> and the number of the instance.<br>") /* IUCVTerminal dialog help 4/11 */ -+ _("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>") ++ _("For example, if you define ten instances with the prefix "<i>lxterm</i>", the terminal IDs from <i>lxterm1</i> to <i>lxterm10</i> are available.</p>") + "<p> </p>" @@ -238,19 +238,19 @@ + _("<p><b>HVC</b></p>") /* IUCVTerminal dialog help 6/11 */ -+ _("<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>") ++ _("<p>The z/VM IUCV HVC device driver is a kernel module and uses device nodes to enable up to eight HVC terminal devices to communicate with getty and login programs.</p>") /* IUCVTerminal dialog help 7/11 */ -+ _("<p>With <b>restrict access</b> it is possible to allow only the connection from certain <b>Terminal Servers</b>.</p>") ++ _("<p>With <b>restrict access</b>, allow only connections from certain <b>terminal servers</b>.</p>") /* IUCVTerminal dialog help 8/11 */ -+ _("<p>You can define the emulation for all instances at once or for every one of them on its own.</p>") ++ _("<p>Define the emulation for all instances at once or for each one separately.</p>") /* IUCVTerminal dialog help 9/11 */ -+ _("<p>By activating <b>route kernel messages to hvc0</b> kernel messages are routed to the hvc0 device instead of ttyS0.<br>") ++ _("<p>Activate <b>route kernel messages to hvc0</b> to route kernel messages to\nthe hvc0 device instead of ttyS0.<br>") /* IUCVTerminal dialog help 10/11 */ -+_("If you want the kernel messages to still be shown on ttyS0 you have to manually add <b>console=ttyS0</b> to the current boot selection kernel parameter in the <b>YaST bootloader module</b>.</p>") ++_("Should kernel messages still be shown on ttyS0, manually add <b>console=ttyS0</b> to the current boot selection kernel parameter in the <b>YaST bootloader module</b>.</p>") /* IUCVTerminal dialog help 11/11 */ + _("<h3>Warning: HVC Terminals stay logged on without a manual logout through the shortcut: ctrl _ d</h3>"); Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.ycp?rev=66872&r1=66871&r2=66872&view=diff ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Fri Nov 18 14:38:18 2011 @@ -402,39 +402,39 @@ else if (ret == 2) Report::Error (sformat ( // error report, %1 is device identification - _("%1: Invalid status for <online>"), id)); + _("%1: Invalid status for <online>."), id)); else if (ret == 3) Report::Error (sformat ( // error report, %1 is device identification - _("%1: No device found for <ccwid>"), id)); + _("%1: No device found for <ccwid>."), id)); else if (ret == 4) Report::Error (sformat ( // error report, %1 is device identification - _("%1: Could not change state of the device"), id)); + _("%1: Could not change state of the device."), id)); else if (ret == 5) // https://bugzilla.novell.com/show_bug.cgi?id=446998#c15 Report::Error (sformat ( // error report, %1 is device identification - _("%1: device is not a DASD"), id)); + _("%1: Device is not a DASD."), id)); else if (ret == 6) // https://bugzilla.novell.com/show_bug.cgi?id=446998#c15 Report::Error (sformat ( // error report, %1 is device identification - _("%1: Could not load module"), id)); + _("%1: Could not load module."), id)); else if (ret == 7) //bugzilla.novell.com/show_bug.cgi?id=561876#c8 Report::Error (sformat ( // error report, %1 is device identification - _("%1: Failed to activate DASD"), id)); + _("%1: Failed to activate DASD."), id)); else if (ret == 8) //bugzilla.novell.com/show_bug.cgi?id=561876#c8 Report::Error (sformat ( // error report, %1 is device identification - _("%1: DASD is not formatted"), id)); + _("%1: DASD is not formatted."), id)); else Report::Error (sformat ( // error report, %1 is device identification, %2 is integer code - _("%1: Unknown error %2"), id, ret)); + _("%1: Unknown error %2."), id, ret)); } } @@ -454,7 +454,10 @@ integer ret = (integer)SCR::Execute (.target.bash, command); y2milestone ("Running command %1 with exit code %2", command, ret); if (ret == 5){ - string popup = sformat (_("Device %1 is unformatted. Format device now?\nIf you want to format multiple devices in parallel,\npress Cancel and select 'Perform Action', 'Format' later on!"), channel); + string popup = sformat (_("Device %1 is not formatted. Format device now? +If you want to format multiple devices in parallel, +press 'Cancel' and select 'Perform Action', 'Format' later on. +"), channel); if ((Mode::autoinst() && Popup::TimedOKCancel(popup, 10)) || Popup::ContinueCancel (popup)) { @@ -553,7 +556,7 @@ UI::CloseDialog (); integer iret = (integer)SCR::Read (.background.status); // error report, %1 is exit code of the command (integer) - Report::Error (sformat (_("Disks formatting failed. Exit code: %1"), + Report::Error (sformat (_("Disks formatting failed. Exit code: %1."), iret)); return; } @@ -637,7 +640,7 @@ if (iret != 0) { // error report, %1 is exit code of the command (integer) - Report::Error (sformat (_("Disks formatting failed. Exit code: %1"), + Report::Error (sformat (_("Disks formatting failed. Exit code: %1."), iret)); } } Modified: trunk/s390/src/modules/Dump.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/Dump.ycp?rev=66872&r1=66871&r2=66872&view=diff ============================================================================== --- trunk/s390/src/modules/Dump.ycp (original) +++ trunk/s390/src/modules/Dump.ycp Fri Nov 18 14:38:18 2011 @@ -127,7 +127,7 @@ err = _("Invalid or unusable disk (fatal)."); else if (ret == 12) // error description - err = _("Incompatible formatting/partitioning, can be corrected with Force."); + err = _("Incompatible formatting or partitioning, correct with Force."); else if (ret == 13) // error description err = _("Missing support programs."); Modified: trunk/s390/src/modules/IUCVTerminal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/IUCVTerminal.ycp?rev=66872&r1=66871&r2=66872&view=diff ============================================================================== --- trunk/s390/src/modules/IUCVTerminal.ycp (original) +++ trunk/s390/src/modules/IUCVTerminal.ycp Fri Nov 18 14:38:18 2011 @@ -103,14 +103,14 @@ /* Progress stage 2/3 */ _("Check HVC entries"), /* Progress stage 3/3 */ - _("Read Kernel parameters") + _("Read kernel parameters") ], [ /* Progress step 1/3 */ _("Checking IUCVtty entries..."), /* Progress step 2/3 */ _("Checking HVC entries..."), /* Progress step 3/3 */ - _("Reading Kernel parameters..."), + _("Reading kernel parameters..."), /* Progress finished */ _("Finished") ], @@ -247,7 +247,7 @@ /* Progress stage 2/4 */ _("Write HVC settings"), /* Progress stage 3/4 */ - _("Write Kernel parameters"), + _("Write kernel parameters"), /* Progress stage 4/4 */ _("Initialize Init") ], [ @@ -256,7 +256,7 @@ /* Progress step 2/4 */ _("Writing HVC settings..."), /* Progress step 3/4 */ - _("Writing Kernel parameters..."), + _("Writing kernel parameters..."), /* Progress step 4/4 */ _("Initializing Init..."), /* Progress finished */ Modified: trunk/s390/src/modules/IUCVTerminalServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/IUCVTerminalServer.ycp?rev=66872&r1=66871&r2=66872&view=diff ============================================================================== --- trunk/s390/src/modules/IUCVTerminalServer.ycp (original) +++ trunk/s390/src/modules/IUCVTerminalServer.ycp Fri Nov 18 14:38:18 2011 @@ -453,7 +453,7 @@ _("Update user settings") ], [ /* Progress step 1/2 */ - _("Writing Configuration files..."), + _("Writing configuration files..."), /* Progress step 2/2 */ _("Updating user settings..."), /* Progress finished */ Modified: trunk/s390/src/onpanic/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/onpanic/ui.ycp?rev=66872&r1=66871&r2=66872&view=diff ============================================================================== --- trunk/s390/src/onpanic/ui.ycp (original) +++ trunk/s390/src/onpanic/ui.ycp Fri Nov 18 14:38:18 2011 @@ -44,7 +44,7 @@ vmcmd_list = sublist(vmcmd_list, 0, OnPanic::VMCMD_MAX_ROWS); vmcmds = mergestring(vmcmd_list, "\n"); UI::ChangeWidget (`id(`vmcmd), `Value, vmcmds); - Popup::Notify (sformat(_("Only %1 lines are allowed for VMCMD!"), OnPanic::VMCMD_MAX_ROWS)); + Popup::Notify (sformat(_("Only %1 lines are allowed for VMCMD."), OnPanic::VMCMD_MAX_ROWS)); } // allow max chars + newlines @@ -102,7 +102,7 @@ /* OnPanic dialog help 6/11 */ + _("<b>reipl</b> Reboot Linux.<br>") /* OnPanic dialog help 7/11 */ -+ _("<b>dump_reipl</b> Dump Linux and reboot system. It is only available on LPAR with z9(r) machines and later, and on z/VMversion 5.3 and later.<br>") ++ _("<b>dump_reipl</b> Dump Linux and reboot system. This option is only available\non LPAR with z9(r) machines and later and on z/VMversion 5.3 and later.<br>") /* OnPanic dialog help 8/11 */ + _("<b>vmcmd</b> Execute specified CP commands and stop system.</p>") /* OnPanic dialog help 9/11 */ @@ -110,7 +110,7 @@ /* OnPanic dialog help 10/11 */ + _("<p>The device for dumping the memory can be set with <b>Dump Device</b>. If no device is shown you have to create one with the <b>YaST Dump Devices</b> dialog.</p>") /* OnPanic dialog help 11/11 */ -+ sformat(_("<p>With <b>VMCMD</b> CP commands can be specified which are executed before the Linux system is stopped. Only %1 lines and a total of %2 chars are allowed.</p>"), OnPanic::VMCMD_MAX_ROWS, OnPanic::VMCMD_MAX_CHARS); ++ sformat(_("<p>With <b>VMCMD</b> specify CP commands to be executed before the Linux system is stopped. Only %1 lines and a total of %2 chars are allowed.</p>"), OnPanic::VMCMD_MAX_ROWS, OnPanic::VMCMD_MAX_CHARS); term content = `HBox (`HSpacing (3), `VBox ( `VSpacing (2), Modified: trunk/s390/src/zfcp/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/helps.ycp?rev=66872&r1=66871&r2=66872&view=diff ============================================================================== --- trunk/s390/src/zfcp/helps.ycp (original) +++ trunk/s390/src/zfcp/helps.ycp Fri Nov 18 14:38:18 2011 @@ -18,7 +18,8 @@ /* Read dialog help 1/2 */ "read" : _("<p><b><big>Initializing ZFCP Device Configuration</big></b><br> -Please wait...<br></p>") + +</p> +") + /* Read dialog help 2/2 */ _("<p><b><big>Aborting Initialization:</big></b><br> @@ -26,16 +27,19 @@ /* Write dialog help 1/2 */ "write" : _("<p><b><big>Saving ZFCP Device Configuration</big></b><br> -Please wait...<br></p>") + +</p> +") + /* Write dialog help 2/2 */ _("<p><b><big>Aborting Saving:</big></b><br> Abort the save procedure by pressing <b>Abort</b>. -An additional dialog informs whether it is safe to do so.</p>"), +An additional dialog will inform you whether it is safe to do so.</p> +"), /* Disk selection dialog help 1/3 */ "disk_selection" : _("<p><b><big>Configured ZFCP Devices</big></b><br> -In this dialog, manage ZFCP devices on your system.</p>") + +Manage ZFCP devices on your system.</p> +") + /* Disk selection dialog help 2/3 */ _("<p>To configure a new ZFCP device, click <b>Add</b>.</p>") + @@ -51,9 +55,10 @@ /* Disk add help 1/2 */ "disk_add" : _("<p><b><big>Add New ZFCP Device</big></b><br> -Enter the identifier of the device to add. Enter the +Enter the identifier of the device to add, the <b>Channel Number</b> of the ZFCP controller, the worldwide port number -(<b>WWPN</b>), and the <b>FCP-LUN</b> number.</p>") + +(<b>WWPN</b>) and the <b>FCP-LUN</b> number.</p> +") + /* Disk add help 2/2, This is HTML, so finally "<devno>" is displayed as "<devno>" */ _("<p>The <b>Channel Number</b> must be entered with lowercase letters in a sysfs conforming format 0.0.<devno>, such as <tt>0.0.5c51</tt>.</p> -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org