Author: thardeck Date: Wed Oct 12 11:56:22 2011 New Revision: 66386 URL: http://svn.opensuse.org/viewcvs/yast?rev=66386&view=rev Log: - added comments to help text - replaced regex ASCII classes with POSIX 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/IUCVTerminalServer.ycp branches/SuSE-Code-11-SP2-Branch/s390/src/modules/OnPanic.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=66386&r1=66385&r2=66386&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/VERSION Wed Oct 12 11:56:22 2011 @@ -1 +1 @@ -2.17.23 +2.17.24 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=66386&r1=66385&r2=66386&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 Wed Oct 12 11:56:22 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 12 11:37:23 UTC 2011 - thardeck@suse.com + +- added comments to help text +- replaced regex ASCII classes with POSIX + +------------------------------------------------------------------- Thu Oct 10 10:55:11 UTC 2011 - thardeck@suse.com - fixed translation (bnc#722447) 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=66386&r1=66385&r2=66386&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 Wed Oct 12 11:56:22 2011 @@ -27,15 +27,25 @@ */ symbol DumpDialog () { string caption = _("Create Dump Device"); - string help = _("<p><b>Prepare one or more volumes for use as S/390 dump device.</b></p>") + string help = + /* Dump dialog help 1/8 */ +_("<p><b>Prepare one or more volumes for use as S/390 dump device.</b></p>") + /* 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>") + /* Dump dialog help 4/8 */ + _("<p>DASD and ZFCP devices have to be active to be utilized. This activation can be done in the YaST DASD respective 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>") + /* Dump dialog help 7/8 */ + _("<p>ZFCP columns: Device, Size, ID, WWPN, LUN, Dump<br>") + /* Dump dialog help 8/8 */ + _("DASD columns: Device, Size, ID, Dump</p>"); + list<string> dasd_disks = Dump::dasd_disks; list<string> zfcp_disks = Dump::zfcp_disks; 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=66386&r1=66385&r2=66386&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 Wed Oct 12 11:56:22 2011 @@ -16,54 +16,65 @@ // zmvids ts_group ts_user ts ic map HELP = $[ - /* z/VM IDs */ + /* 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>"), - /* TS-Shell */ + /* 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 their members.</p>") + /* TS-Shell dialog help 2/5 */ + _("<p>Each allowed z/VM IDs are either selected manually under <b>Selection</b>, defined by a <b>Regex</b> or loaded from a <b>File</b> which consist all allowed z/VM IDs separated by 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>") + /* 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>") + /* 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."), - /* TS-Shell User creation dialog */ + /* TS-Shell User creation dialog help 1/3 */ "ts-user" : _("<p><b><big>New TS-Shell User</big></b></p>") + _("<p>To create new TS-Shell user the <b>Username</b>, <b>Home Directory</b> and <b>Password</b> has to be provided. <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>") + /* 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>"), - /* TS-Shell Managing Groups Dialog */ + /* TS-Shell Managing Groups dialog help 1/5 */ "ts-group" : _("<p><b><big>Mange 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>") + /* 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>") + /* 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 on the side.</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>"), - /* IUCVConn on Login */ + /* IUCVConn on Login dialog help 1/2 */ "ic" : _("<p><b><big>IUCVConn on Login</big></b></p>") -+ _("<p>IUCVConn on Login needs one user for every z/VM ID. To create these users a <b>password</b> and <b>home directory</b> has to be provided. - <br>It is possible to sync the users manually by clicking on <b>Sync</b> or just confirming the changes with <b>Ok</b> while <b>IUCVConn on Login</b> is enabled. </p>"), ++ _("<p>IUCVConn on Login needs one user for every z/VM ID. To create these users a <b>password</b> and <b>home directory</b> has to be provided.") + /* IUCVConn on Login dialog help 2/2 */ ++ _("<p>It is possible to sync the users manually by clicking on <b>Sync</b> or just confirming the changes with <b>Ok</b> while <b>IUCVConn on Login</b> is enabled. </p>"), ]; /* EOF */ 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=66386&r1=66385&r2=66386&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 Wed Oct 12 11:56:22 2011 @@ -754,19 +754,19 @@ integer line = 0; foreach (string zvmid, zvmid_list,{ line = line + 1; - if (regexpmatch(zvmid, "[^a-zA-Z0-9]")) + if (regexpmatch(zvmid, "[^:alnum:]")) { Popup::Notify(sformat(_("Wrong z/VM ID \"%1\" in line %2, only letters and numbers are allowed."), zvmid, line)); ret = false; break; } - else if (regexpmatch(zvmid, "^[0-9]")) + else if (regexpmatch(zvmid, "^[:digit:]")) { Popup::Notify(sformat(_("Wrong z/VM ID \"%1\" in line %2, numbers at the beginning are not allowed."), zvmid, line)); ret = false; break; } - else if (regexpmatch(zvmid, "[a-z0-9]{9,}")) + else if (regexpmatch(zvmid, "[:lower::digit:]{9,}")) { Popup::Notify(sformat(_("Wrong z/VM ID \"%1\" in line %2, more than eight characters are not allowed."), zvmid, line)); ret = false; 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=66386&r1=66385&r2=66386&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 Wed Oct 12 11:56:22 2011 @@ -91,7 +91,7 @@ boolean ret = false; string restrict_hvc_to_srvs = (string)UI::QueryWidget (`id (`restrict_hvc_to_srvs), `Value); - if (regexpmatch(restrict_hvc_to_srvs, "[^a-z0-9,]")) + if (regexpmatch(restrict_hvc_to_srvs, "[^:lower::digit:,]")) { Popup::Notify(_("Wrong input, only lower case letters, numbers and for separation commas are allowed.")); } @@ -99,7 +99,7 @@ { Popup::Notify(_("Comma is only a separator.")); } - else if (regexpmatch(restrict_hvc_to_srvs, "[a-z0-9]{9,}")) + else if (regexpmatch(restrict_hvc_to_srvs, "[:lower::digit:]{9,}")) { Popup::Notify(_("z/VM IDs doesn't allow more than eight characters.")); } @@ -122,7 +122,7 @@ boolean ret = false; string iucv_name = (string)UI::QueryWidget (`id (`iucv_name), `Value); - if (regexpmatch(iucv_name, "[^a-z0-9]")) + if (regexpmatch(iucv_name, "[^:lower::digit:]")) { Popup::Notify(_("Wrong IUCV ID, only lower case letters are allowed.")); } @@ -218,19 +218,44 @@ */ symbol TerminalDialog () { string caption = "Configure IUCV Terminal Settings"; - string help = _("<p><h2>Configure Local Terminal System Settings</h2></p>") + + string help = +/* IUCVTerminal dialog help 1/10 */ +_("<p><h2>Configure Local Terminal System Settings</h2></p>") + +/* IUCVTerminal dialog help 2/11 */ + _("<p><b>IUVCtty</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 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>") + + "<p> </p>" + +/* IUCVTerminal dialog help 5/11 */ + _("<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>") + +/* 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>") + +/* 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>") + +/* IUCVTerminal dialog help 9/11 */ + _("<p>By activating <b>receive kernel messages on hvc0</b> kernel messages are routed to the 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>") + +/* IUCVTerminal dialog help 11/11 */ + _("<h3>Warning: HVC Terminals stay logged on without a manual logout through the shortcut: ctrl _ d</h3>"); + /* Dialog content */ term content = `HBox(`HSpacing(3), `VBox(`VSpacing(vspacing + 0.5), `VBox( Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/modules/IUCVTerminalServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/src/modules/IUCVTerminalServer.ycp?rev=66386&r1=66385&r2=66386&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/modules/IUCVTerminalServer.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/modules/IUCVTerminalServer.ycp Wed Oct 12 11:56:22 2011 @@ -518,7 +518,7 @@ } // ignore empty entries(like "list:" or "regex:") - if (!regexpmatch(value, "^[a-z]{4,5}:$")) + if (!regexpmatch(value, "^[:lower:]{4,5}:$")) { ts_auth_values = add(ts_auth_values, name, value); } Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/modules/OnPanic.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/src/modules/OnPanic.ycp?rev=66386&r1=66385&r2=66386&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/modules/OnPanic.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/modules/OnPanic.ycp Wed Oct 12 11:56:22 2011 @@ -86,8 +86,8 @@ map dev = $[ ]; list<string> entry = splitstring(dev_line, "\t"); - boolean is_dasd = regexpmatch(entry[0]:nil, "^\/dev\/dasd[a-z]+$"); - boolean is_zfcp = regexpmatch(entry[0]:nil, "^\/dev\/sd[a-z]+$"); + boolean is_dasd = regexpmatch(entry[0]:nil, "^\/dev\/dasd[:lower:]+$"); + boolean is_zfcp = regexpmatch(entry[0]:nil, "^\/dev\/sd[:lower:]+$"); if (is_dasd) { @@ -123,10 +123,10 @@ foreach (string entry, dump_devices,{ list<string> line = splitstring(entry, "\t"); if ( // check for fitting dasd - (type == "ccw" && regexpmatch(line[0]:nil, "^\/dev\/dasd[a-z]+") + (type == "ccw" && regexpmatch(line[0]:nil, "^\/dev\/dasd[:lower:]+") && line[2]:nil == dev["DEVICE"]:nil) || // check for fitting zfcp - (type == "fcp" && regexpmatch(line[0]:nil, "^\/dev\/sd[a-z]+") + (type == "fcp" && regexpmatch(line[0]:nil, "^\/dev\/sd[:lower:]+") && line[2]:nil == dev["DEVICE"]:nil && line[3]:nil == dev["WWPN"]:nil && line[4]:nil == dev["LUN"]:nil) 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=66386&r1=66385&r2=66386&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 Wed Oct 12 11:56:22 2011 @@ -88,16 +88,28 @@ // For translators: Caption of the dialog string caption = _("On Panic Configuration"); - string help = _("<p><b>Configure the actions to be taken if a kernel panic occurs</b></p>") + string help = + /* OnPanic dialog help 1/11 */ +_("<p><b>Configure the actions to be taken if a kernel panic occurs</b></p>") + /* OnPanic dialog help 2/11 */ + _("<p>The <b>Dumpconf</b> daemon needs to be enabled to influence the behavior during kernel panics.</p>") + /* OnPanic dialog help 3/11 */ + _("<p>The following <b>Panic Actions</b> are possible:<br>") + /* OnPanic dialog help 4/11 */ + _("<b>stop</b> Stop Linux (default).<br>") + /* OnPanic dialog help 5/11 */ + _("<b>dump</b> Dump Linux and stop system.<br>") + /* 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>") + /* OnPanic dialog help 8/11 */ + _("<b>vmcmd</b> Execute specified CP commands and stop system.</p>") + /* OnPanic dialog help 9/11 */ + _("<p>The time defined in <b>Delay Minutes</b> defers activating the specified panic action for a newly started system to prevent loops. If the system crashes before the time has elapsed the default action (stop) is performed.</p>") + /* 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); term content = `HBox (`HSpacing (3), `VBox ( @@ -179,7 +191,7 @@ // don't allow vmcmd without at least one command if ((string) UI::QueryWidget (`id (`onpanic), `Value) == "vmcmd" - && !regexpmatch((string) UI::QueryWidget (`id (`vmcmd), `Value), "[A-Za-z]{2,}")) + && !regexpmatch((string) UI::QueryWidget (`id (`vmcmd), `Value), "[:alpha:]{2,}")) { Popup::Notify (_("It is not possible to use vmcmd without defining at least one command.")); ret = `again; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org