November 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r66873 - in /trunk/s390/src: iucvterminal-server/ iucvterminal/
by aschnell＠svn2.opensuse.org 18 Nov '11

18 Nov '11

Author: aschnell Date: Fri Nov 18 14:41:40 2011 New Revision: 66873 URL: http://svn.opensuse.org/viewcvs/yast?rev=66873&view=rev Log: - updated ignore files Modified: trunk/s390/src/iucvterminal/ (props changed) trunk/s390/src/iucvterminal-server/ (props changed) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66872 - in /trunk/s390: ./ package/ src/ src/clients/ src/dasd/ src/dump/ src/iucvterminal-server/ src/iucvterminal/ src/modules/ src/onpanic/ src/zfcp/
by aschnell＠svn2.opensuse.org 18 Nov '11

18 Nov '11

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&… ============================================================================== --- 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?… ============================================================================== --- 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(a)suse.de + +- merged proofread texts + +------------------------------------------------------------------- Mon Oct 31 10:59:47 EDT 2011 - thardeck(a)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&r… ============================================================================== --- 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-se… ============================================================================== --- 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.yc… ============================================================================== --- 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=6687… ============================================================================== --- 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" : _("<big>Initializing Controller Configuration</big> -Please wait... ") + + +") + /* Read dialog help 2/2 */ _("<big>Aborting Initialization:</big> @@ -26,21 +27,23 @@ /* Write dialog help 1/2 */ "write" : _("<big>Saving Controller Configuration</big> -Please wait... ") + + +") + /* Write dialog help 2/2 */ _("<big>Aborting Saving:</big> Abort the save procedure by pressing Abort. -An additional dialog informs whether it is safe to do so."), +An additional dialog will inform you whether it is safe to do so. +"), /* Disk selection dialog help 1/4 */ "disk_selection_config" : _("<big>Configured DASD Disks</big> In this dialog, manage DASD disks on your system.") + /* Disk selection dialog help 2/4 */ -_("To filter disks that you want to have displayed, set -the Minimum Channel and the Maximum Channel -and click Filter.") + +_("To filter the displayed disks, set the Minimum Channel and +the Maximum Channel and click Filter. +") + /* Disk selection dialog help 4/4 */ _("To configure a new DASD disk, click Add.") + @@ -54,14 +57,14 @@ In this dialog, manage DASD disks on your system.") + /* Disk selection dialog help 2/4 */ -_("To filter disks that you want to have displayed, set -the Minimum Channel and the Maximum Channel -and click Filter.") + +_("To filter the displayed disks, set the Minimum Channel and +the Maximum Channel and click Filter. +") + /* Disk selection dialog help 3/4 */ -_("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 -Select or Deselect.") + +_("To perform actions on multiple disks at once, mark these disks and click +Select or Deselect. +") + /* Disk selection dialog help 4/4 */ _("To perform an action on the selected disks, use Perform Action. @@ -69,19 +72,20 @@ /* Disk add help 1/3 */ "disk_add_config" : _("<big>Add New DASD Disk</big> -Enter the identifier of the disk to add. To specify the disk, use the -Channel Number of the DASD disk.") +To add a disk, enter the Channel Number of the DASD disk as +identifier.") + /* Disk add help 1/3 */ -_("To specify if the disk will be formatted, -use Format the Disk.") +_("If the disk should be formatted, +use Format the Disk. +") + (Arch::s390_32 () /* Disk add help 3/3, optional */ - ? _("To specify if DIAG mode will be used, -use Use DIAG.") + ? _("To use DIAG mode, select Use DIAG. +") : ""), ]; Modified: trunk/s390/src/dump/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dump/ui.ycp?rev=66872&r… ============================================================================== --- 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 */ + _("Supported devices are ECKD DASD and ZFCP disks, while multi-volumes are limited to DASD. ") /* Dump dialog help 3/8 */ -+ _("Only whole disks can be used, no partitions! If the device is incompatible formatted/partioned, activate the checkbox Force overwrite of disk") ++ _("Only whole disks can be used, no partitions. If the device is incompatibly\nformatted or partitioned, activate the checkbox Force overwrite of disk.") /* Dump dialog help 4/8 */ -+ _("DASD and ZFCP devices have to be active to be utilized. This activation can be done in the respective YaST DASD or ZFCP dialog. ") ++ _("To use DASD and ZFCP devices activate them in the respective YaST DASD or ZFCP dialog. ") /* Dump dialog help 5/8 */ + _("Devices which are in use or have mounted partitions will not be shown.") + /* Dump dialog help 6/8 */ -+ _("The mentioning of dumpdevice 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. ") ++ _("dumpdevice after a disk indicates that it is a usable dump +device. Multi-volume dump devices are indicated by a list of DASD IDs.") + /* Dump dialog help 7/8 */ + _("ZFCP columns: Device, Size, ID, WWPN, LUN, Dump ") /* 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/hel… ============================================================================== --- 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" : _("<big>z/VM IDs</big>") -+ _("To configure the IUCV Terminal Server the z/VM IDs which are to be used have to be specified. - They are separated by breaks from each other."), ++ _("To configure the IUCV terminal server, specify the z/VM IDs to be used. + They are separated by line breaks. +"), /* TS-Shell dialog help 1/5 */ "ts" : _("<big>TS-Shell</big>") -+ _("TS-Shell allows the Authorization to be specified for every TS-Shell user and group. The rights of a group are inherited by its members.") ++ _("TS-Shell allows to specify Authorization for every TS-Shell user and group. The rights of a group are inherited by its members.") /* TS-Shell dialog help 2/5 */ -+ _("Each allowed z/VM ID is either selected manually under Selection, defined by a Regex or loaded from a File which consists all allowed z/VM IDs separated by breaks.") ++ _("Each allowed z/VM ID can be selected manually under Selection, defined by a Regex or loaded from a File which contains all allowed z/VM IDs separated by line breaks.") /* TS-Shell dialog help 3/5 */ -+ _("By clicking on the button New User addtional TS-Shell users could be created and also deleted by using Delete User.") ++ _("Click on New User to create new TS-Shell users or Delete\nUser to remove users.") /* TS-Shell dialog help 4/5 */ -+ _("To add or remove groups from the TS-Shell authorization table or to change the membership of them Manage Groups has to be called.") ++ _("To add or remove groups from the TS-Shell authorization table or to change\nthe membership of users, go to Manage Groups.") /* TS-Shell dialog help 5/5 */ -+ _("With Audited IDs the z/VM IDs could be specified from which transcripts should be gathered."), ++ _("With Audited IDs specify the z/VM IDs from which transcripts should be gathered."), /* TS-Shell User creation dialog help 1/3 */ @@ -45,28 +46,28 @@ It is also possible to specify Additional Groups by selecting them on the right.") /* TS-Shell User creation dialog help 2/3 */ -+ _("To ensure that the user changes his password after the first Login Force Password Change has to be activated.") ++ _("To ensure that the user changes his password after the first login, activate Force Password Change.") /* TS-Shell User creation dialog help 3/3 */ -+ _("The home directory could be the same for every TS-SHell user since it is not used for saving purposes."), ++ _("You can specify the same home directory for every TS-Shell user since no\ndata will be stored there."), /* TS-Shell Managing Groups dialog help 1/5 */ "ts-group" : _("<big>Manage Groups for TS-Authorization</big>") -+ _("It is possible to define TS-Shell authorizations per group so every TS-Shell member of this groups inherits these rights.") ++ _("Define TS-Shell authorizations per group if you want every TS-Shell \nmember of this groups to inherit the same rights.") /* TS-Shell Managing Groups dialog help 2/5 */ -+ _("Already existing groups could be added to or removed from the TS-Shell authorization by selecting them in the table and clicking on Select or Deselect. The current status is shown in the column TS-Auth.") ++ _("Existing groups can be added to or removed from the TS-Shell\nauthorization. Select the groups in the table and click on Select or Deselect. The current status is shown in the column TS-Auth.") /* TS-Shell Managing Groups dialog help 3/5 */ -+ _("TS-Shell members of the selected group could be changed in the TS-Members selection.") ++ _("Change TS-Shell members of a selected group in the TS-Members\nselection.") /* TS-Shell Managing Groups dialog help 4/5 */ + _("New groups could be created by entering the name in the New Group input field and confirming with Create. To delete previously created groups the YaST users dialog has to be used.") /* TS-Shell Managing Groups dialog help 5/5 */ -+ _("Changes in this dialog could be undone by using the Back button."), ++ _("Undo changes in this dialog by clicking the Back button."), /* 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.… ============================================================================== --- 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… ============================================================================== --- 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 @@ + _("IUCVtty") /* IUCVTerminal dialog help 3/11 */ -+ _("Several IUCVtty instances can run to provide multiple terminal devices. The instances are distinguished by a Terminal ID which is a combination of the Terminal ID Prefix and the number of the instance. ") ++ _("Several IUCVtty instances can run to provide multiple terminal devices. The instances are distinguished by a terminal ID, which is a combination of the Terminal ID Prefix and the number of the instance. ") /* IUCVTerminal dialog help 4/11 */ -+ _("So if for example 10 instances are defined with the prefix "lxterm" the Terminal IDs from lxterm1 to lxterm10 would be available.") ++ _("For example, if you define ten instances with the prefix "lxterm", the terminal IDs from lxterm1 to lxterm10 are available.") + " " @@ -238,19 +238,19 @@ + _("HVC") /* IUCVTerminal dialog help 6/11 */ -+ _("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.") ++ _("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.") /* IUCVTerminal dialog help 7/11 */ -+ _("With restrict access it is possible to allow only the connection from certain Terminal Servers.") ++ _("With restrict access, allow only connections from certain terminal servers.") /* IUCVTerminal dialog help 8/11 */ -+ _("You can define the emulation for all instances at once or for every one of them on its own.") ++ _("Define the emulation for all instances at once or for each one separately.") /* IUCVTerminal dialog help 9/11 */ -+ _("By activating route kernel messages to hvc0 kernel messages are routed to the hvc0 device instead of ttyS0. ") ++ _("Activate route kernel messages to hvc0 to route kernel messages to\nthe hvc0 device instead of ttyS0. ") /* IUCVTerminal dialog help 10/11 */ -+_("If you want the kernel messages to still be shown on ttyS0 you have to manually add console=ttyS0 to the current boot selection kernel parameter in the YaST bootloader module.") ++_("Should kernel messages still be shown on ttyS0, manually add console=ttyS0 to the current boot selection kernel parameter in the YaST bootloader module.") /* 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.… ============================================================================== --- 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=66… ============================================================================== --- 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.yc… ============================================================================== --- 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/IUCVTerminalSer… ============================================================================== --- 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=6687… ============================================================================== --- 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 */ + _("reipl Reboot Linux. ") /* OnPanic dialog help 7/11 */ -+ _("dump_reipl 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. ") ++ _("dump_reipl 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. ") /* OnPanic dialog help 8/11 */ + _("vmcmd Execute specified CP commands and stop system.") /* OnPanic dialog help 9/11 */ @@ -110,7 +110,7 @@ /* OnPanic dialog help 10/11 */ + _("The device for dumping the memory can be set with Dump Device. If no device is shown you have to create one with the YaST Dump Devices dialog.") /* OnPanic dialog help 11/11 */ -+ sformat(_("With VMCMD 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."), OnPanic::VMCMD_MAX_ROWS, OnPanic::VMCMD_MAX_CHARS); ++ sformat(_("With VMCMD specify CP commands to be executed before the Linux system is stopped. Only %1 lines and a total of %2 chars are allowed."), 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=6687… ============================================================================== --- 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" : _("<big>Initializing ZFCP Device Configuration</big> -Please wait... ") + + +") + /* Read dialog help 2/2 */ _("<big>Aborting Initialization:</big> @@ -26,16 +27,19 @@ /* Write dialog help 1/2 */ "write" : _("<big>Saving ZFCP Device Configuration</big> -Please wait... ") + + +") + /* Write dialog help 2/2 */ _("<big>Aborting Saving:</big> Abort the save procedure by pressing Abort. -An additional dialog informs whether it is safe to do so."), +An additional dialog will inform you whether it is safe to do so. +"), /* Disk selection dialog help 1/3 */ "disk_selection" : _("<big>Configured ZFCP Devices</big> -In this dialog, manage ZFCP devices on your system.") + +Manage ZFCP devices on your system. +") + /* Disk selection dialog help 2/3 */ _("To configure a new ZFCP device, click Add.") + @@ -51,9 +55,10 @@ /* Disk add help 1/2 */ "disk_add" : _("<big>Add New ZFCP Device</big> -Enter the identifier of the device to add. Enter the +Enter the identifier of the device to add, the Channel Number of the ZFCP controller, the worldwide port number -(WWPN), and the FCP-LUN number.") + +(WWPN) and the FCP-LUN number. +") + /* Disk add help 2/2, This is HTML, so finally "<devno>" is displayed as "<devno>" */ _("The Channel Number must be entered with lowercase letters in a sysfs conforming format 0.0.<devno>, such as <tt>0.0.5c51</tt>. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66871 - /trunk/apparmor/yast2-apparmor.spec.in
by tgoettlicher＠svn2.opensuse.org 18 Nov '11

18 Nov '11

Author: tgoettlicher Date: Fri Nov 18 10:31:44 2011 New Revision: 66871 URL: http://svn.opensuse.org/viewcvs/yast?rev=66871&view=rev Log: minor cleanup Modified: trunk/apparmor/yast2-apparmor.spec.in Modified: trunk/apparmor/yast2-apparmor.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/yast2-apparmor.spec.in?… ============================================================================== --- trunk/apparmor/yast2-apparmor.spec.in (original) +++ trunk/apparmor/yast2-apparmor.spec.in Fri Nov 18 10:31:44 2011 @@ -13,7 +13,6 @@ Requires: perl(Getopt::Long) Requires: perl(Immunix::AppArmor) Requires: perl(Immunix::Notify) -Requires: perl(Immunix::Reports) Requires: perl(Locale::gettext) Requires: perl(POSIX) Requires: perl(ycp) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66870 - in /trunk/apparmor: VERSION package/yast2-apparmor.changes
by tgoettlicher＠svn2.opensuse.org 18 Nov '11

18 Nov '11

Author: tgoettlicher Date: Fri Nov 18 10:05:44 2011 New Revision: 66870 URL: http://svn.opensuse.org/viewcvs/yast?rev=66870&view=rev Log: Version Modified: trunk/apparmor/VERSION trunk/apparmor/package/yast2-apparmor.changes Modified: trunk/apparmor/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/VERSION?rev=66870&r1=66… ============================================================================== --- trunk/apparmor/VERSION (original) +++ trunk/apparmor/VERSION Fri Nov 18 10:05:44 2011 @@ -1 +1 @@ -2.22.0 +2.22.1 Modified: trunk/apparmor/package/yast2-apparmor.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/package/yast2-apparmor.… ============================================================================== --- trunk/apparmor/package/yast2-apparmor.changes (original) +++ trunk/apparmor/package/yast2-apparmor.changes Fri Nov 18 10:05:44 2011 @@ -2,6 +2,7 @@ Fri Nov 18 00:17:24 UTC 2011 - opensuse(a)cboltz.de - add Requires: for several perl modules +- 2.22.1 ------------------------------------------------------------------- Wed Nov 16 12:36:51 CET 2011 - jsuchome(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66869 - in /trunk/apparmor: package/yast2-apparmor.changes yast2-apparmor.spec.in
by tgoettlicher＠svn2.opensuse.org 18 Nov '11

18 Nov '11

Author: tgoettlicher Date: Fri Nov 18 10:03:32 2011 New Revision: 66869 URL: http://svn.opensuse.org/viewcvs/yast?rev=66869&view=rev Log: applied patch from opensuse(a)cboltz.de: dd Requires: for several perl modules Modified: trunk/apparmor/package/yast2-apparmor.changes trunk/apparmor/yast2-apparmor.spec.in Modified: trunk/apparmor/package/yast2-apparmor.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/package/yast2-apparmor.… ============================================================================== --- trunk/apparmor/package/yast2-apparmor.changes (original) +++ trunk/apparmor/package/yast2-apparmor.changes Fri Nov 18 10:03:32 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Nov 18 00:17:24 UTC 2011 - opensuse(a)cboltz.de + +- add Requires: for several perl modules + +------------------------------------------------------------------- Wed Nov 16 12:36:51 CET 2011 - jsuchome(a)suse.cz - merged texts from proofreading Modified: trunk/apparmor/yast2-apparmor.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/yast2-apparmor.spec.in?… ============================================================================== --- trunk/apparmor/yast2-apparmor.spec.in (original) +++ trunk/apparmor/yast2-apparmor.spec.in Fri Nov 18 10:03:32 2011 @@ -5,7 +5,19 @@ License: GPL-2.0+ Summary: YaST2 - Plugins for AppArmor Profile Management -Requires: yast2 perl-TimeDate + +Requires: yast2 +Requires: perl-TimeDate +Requires: perl(Data::Dumper) +Requires: perl(Encode) +Requires: perl(Getopt::Long) +Requires: perl(Immunix::AppArmor) +Requires: perl(Immunix::Notify) +Requires: perl(Immunix::Reports) +Requires: perl(Locale::gettext) +Requires: perl(POSIX) +Requires: perl(ycp) + BuildArch: noarch Obsoletes: yast2-subdomain Provides: yast2-subdomain -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66868 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp
by fehr＠svn2.opensuse.org 17 Nov '11

17 Nov '11

Author: fehr Date: Thu Nov 17 17:12:57 2011 New Revision: 66868 URL: http://svn.opensuse.org/viewcvs/yast?rev=66868&view=rev Log: add var/crash to default subvolume list Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Nov 17 17:12:57 2011 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Thu Nov 17 15:44:52 CET 2011 - fehr(a)suse.de +- add var/crash to default subvolume list - fix proposal for some cases where exactly 1 partition selected ------------------------------------------------------------------- Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Thu Nov 17 17:12:57 2011 @@ -4343,7 +4343,7 @@ global define map AddSubvolRoot( map part ) { - list<string> def_subvol = [ "tmp", "opt", "srv", "var/spool", "var/log", "var/tmp" ]; + list<string> def_subvol = [ "tmp", "opt", "srv", "var/crash", "var/spool", "var/log", "var/tmp" ]; string sv_prepend = ""; if( FileSystems::default_subvol!="" ) sv_prepend = FileSystems::default_subvol + "/"; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66867 - in /branches/SuSE-Code-11-SP2-Branch/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp
by fehr＠svn2.opensuse.org 17 Nov '11

17 Nov '11

Author: fehr Date: Thu Nov 17 17:12:27 2011 New Revision: 66867 URL: http://svn.opensuse.org/viewcvs/yast?rev=66867&view=rev Log: add var/crash to default subvolume list Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Thu Nov 17 17:12:27 2011 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Thu Nov 17 15:44:52 CET 2011 - fehr(a)suse.de +- add var/crash to default subvolume list - create btrfs subvolumes before mounting (bnc#731059) - fix proposal for some cases where exactly 1 partition selected Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Thu Nov 17 17:12:27 2011 @@ -4343,7 +4343,7 @@ global define map AddSubvolRoot( map part ) { - list<string> def_subvol = [ "tmp", "opt", "srv", "var/spool", "var/log", "var/run", "var/tmp" ]; + list<string> def_subvol = [ "tmp", "opt", "srv", "var/crash", "var/spool", "var/log", "var/run", "var/tmp" ]; string sv_prepend = ""; if( FileSystems::default_subvol!="" ) sv_prepend = FileSystems::default_subvol + "/"; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66866 - in /trunk/qt-pkg: VERSION.cmake package/yast2-qt-pkg.changes src/YQPkgDescriptionView.cc
by tgoettlicher＠svn2.opensuse.org 17 Nov '11

17 Nov '11

Author: tgoettlicher Date: Thu Nov 17 16:49:24 2011 New Revision: 66866 URL: http://svn.opensuse.org/viewcvs/yast?rev=66866&view=rev Log: - Fixed bnc#722617: Yast2 package manager does not show icons of some packages (2.21.16) Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgDescriptionView.cc Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=66866&r… ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Thu Nov 17 16:49:24 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "15") +SET(VERSION_PATCH "16") Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Thu Nov 17 16:49:24 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Nov 17 16:48:34 CET 2011 - tgoettlicher(a)suse.de + +- Fixed bnc#722617: Yast2 package manager does not show icons of some packages +- Version: 2.21.16 + +------------------------------------------------------------------- Tue Nov 8 14:43:20 CET 2011 - tgoettlicher(a)suse.de - Fixed untranslated rpm package groups (bnc #722325) Modified: trunk/qt-pkg/src/YQPkgDescriptionView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgDescriptionView.… ============================================================================== --- trunk/qt-pkg/src/YQPkgDescriptionView.cc (original) +++ trunk/qt-pkg/src/YQPkgDescriptionView.cc Thu Nov 17 16:49:24 2011 @@ -222,7 +222,7 @@ QString YQPkgDescriptionView::applicationIconList( const list<string> & fileList ) const { - QString html; + QString html = ""; QMap<QString, QString> desktopEntries; QStringList desktopFiles = findDesktopFiles( fileList ); @@ -231,21 +231,30 @@ return QString(); // headline for a list of application icons that belong to a selected package - html += _("This package contains: "); - html += "<table border='0'>"; for ( int i = 0; i < desktopFiles.size(); ++i ) { desktopEntries = readDesktopFile( desktopFiles[i] ); - html += "<tr><td valign='middle' align='center'>"; - html += QString( "<img src=\"" ) + findDesktopIcon ( desktopEntries["Icon"] ) + QString( "\">" ); - html += "</td><td valign='middle' align='left'>"; - html += "" + desktopEntries["Name"] + ""; - html += "</td></tr>"; + QString desktopIcon = findDesktopIcon ( desktopEntries["Icon"] ); + + if ( ! desktopIcon.isEmpty() ) + { + html += "<tr><td valign='middle' align='center'>"; + html += QString( "<img src=\"" ) + desktopIcon + QString( "\">" ); + html += "</td><td valign='middle' align='left'>"; + html += "" + desktopEntries["Name"] + ""; + html += "</td></tr>"; + } } - html += "</table>"; + if ( ! html.isEmpty() ) + { + html = _("This package contains: ") + + "<table border='0'>" + + html + + "</table>"; + } return "" + html + ""; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66865 - in /trunk/storage: package/yast2-storage.changes storage/src/include/auto_part_create.ycp
by fehr＠svn2.opensuse.org 17 Nov '11

17 Nov '11

Author: fehr Date: Thu Nov 17 16:02:11 2011 New Revision: 66865 URL: http://svn.opensuse.org/viewcvs/yast?rev=66865&view=rev Log: fix proposal for some cases where exactly 1 partition selected Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/auto_part_create.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Nov 17 16:02:11 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Nov 17 15:44:52 CET 2011 - fehr(a)suse.de + +- fix proposal for some cases where exactly 1 partition selected + +------------------------------------------------------------------- Tue Nov 15 16:20:05 CET 2011 - aschnell(a)suse.de - adapted dbus command to disable automounting of desktop Modified: trunk/storage/storage/src/include/auto_part_create.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/auto… ============================================================================== --- trunk/storage/storage/src/include/auto_part_create.ycp (original) +++ trunk/storage/storage/src/include/auto_part_create.ycp Thu Nov 17 16:02:11 2011 @@ -63,7 +63,10 @@ y2milestone( "create_partitions num_del_exist %1 num_del_free %2 swap_reuse %3", num_del_exist, num_del_free, size(r)>0 ); y2milestone( "create_partitions keep %1", keep ); - if( keep!=nil && size(r)>0 && num_del_exist==1 && num_del_free==0 ) + if( keep!=nil && size(r)>0 && + !StorageProposal::GetProposalHome() && + !StorageProposal::GetProposalBtrfs() && + num_del_exist==1 && num_del_free==0 ) { y2milestone( "create_partitions single special" ); boolean first = true; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66864 - in /branches/SuSE-Code-11-SP2-Branch/storage: libstorage/src/Storage.cc libstorage/src/StorageTypes.h package/yast2-storage.changes
by fehr＠svn2.opensuse.org 17 Nov '11

17 Nov '11

Author: fehr Date: Thu Nov 17 16:01:17 2011 New Revision: 66864 URL: http://svn.opensuse.org/viewcvs/yast?rev=66864&view=rev Log: create btrfs subvolumes before mounting (bnc#731059) Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/StorageTypes.h branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc Thu Nov 17 16:01:17 2011 @@ -4881,7 +4881,7 @@ y2mil("p.length:" << p.length()); typedef array<CommitStage, 5> Stages; - const Stages stages = { { DECREASE, INCREASE, FORMAT, MOUNT, SUBVOL } }; + const Stages stages = { { DECREASE, INCREASE, FORMAT, SUBVOL, MOUNT } }; for (Stages::const_iterator stage = stages.begin(); stage != stages.end(); ++stage) { Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/StorageTypes.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/StorageTypes.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/StorageTypes.h Thu Nov 17 16:01:17 2011 @@ -94,7 +94,7 @@ std::ostream& operator<<(std::ostream& s, const PartitionSlotInfo& a); std::ostream& operator<<(std::ostream& s, const FsCapabilities& a); - enum CommitStage { DECREASE, INCREASE, FORMAT, MOUNT, SUBVOL }; + enum CommitStage { DECREASE, INCREASE, FORMAT, SUBVOL, MOUNT }; class Volume; Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Thu Nov 17 16:01:17 2011 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Thu Nov 17 15:44:52 CET 2011 - fehr(a)suse.de +- create btrfs subvolumes before mounting (bnc#731059) - fix proposal for some cases where exactly 1 partition selected ------------------------------------------------------------------- -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0