March 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67839 - /branches/unsupported/x11/ /trunk/x11/
by aschnell＠svn2.opensuse.org 30 Mar '12

30 Mar '12

Author: aschnell Date: Fri Mar 30 17:05:38 2012 New Revision: 67839 URL: http://svn.opensuse.org/viewcvs/yast?rev=67839&view=rev Log: - moving x11 to unsupported since it was dropped in openSUSE Added: branches/unsupported/x11/ - copied from r67838, trunk/x11/ Removed: trunk/x11/ -- 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] r67838 - /tags/stable-2_22_0/sysconfig/
by lslezak＠svn2.opensuse.org 30 Mar '12

30 Mar '12

Author: lslezak Date: Fri Mar 30 16:24:03 2012 New Revision: 67838 URL: http://svn.opensuse.org/viewcvs/yast?rev=67838&view=rev Log: Created tag stable-2_22_0 for sysconfig Added: tags/stable-2_22_0/sysconfig/ - copied from r67837, trunk/sysconfig/ -- 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] r67837 - in /trunk/sysconfig: VERSION package/yast2-sysconfig.changes src/complex.ycp
by lslezak＠svn2.opensuse.org 30 Mar '12

30 Mar '12

Author: lslezak Date: Fri Mar 30 16:23:42 2012 New Revision: 67837 URL: http://svn.opensuse.org/viewcvs/yast?rev=67837&view=rev Log: - fixed displaying UTF-8 values (bnc#728588), fixed handling values containing single quotes - 2.22.0 Modified: trunk/sysconfig/VERSION trunk/sysconfig/package/yast2-sysconfig.changes trunk/sysconfig/src/complex.ycp Modified: trunk/sysconfig/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/VERSION?rev=67837&r1=6… ============================================================================== --- trunk/sysconfig/VERSION (original) +++ trunk/sysconfig/VERSION Fri Mar 30 16:23:42 2012 @@ -1 +1 @@ -2.21.2 +2.22.0 Modified: trunk/sysconfig/package/yast2-sysconfig.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/package/yast2-sysconfi… ============================================================================== --- trunk/sysconfig/package/yast2-sysconfig.changes (original) +++ trunk/sysconfig/package/yast2-sysconfig.changes Fri Mar 30 16:23:42 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Mar 30 14:18:00 UTC 2012 - lslezak(a)suse.cz + +- fixed displaying UTF-8 values (bnc#728588), fixed handling values + containing single quotes +- 2.22.0 + +------------------------------------------------------------------- Thu Mar 29 16:09:54 CEST 2012 - jsuchome(a)suse.cz - merge proofread texts Modified: trunk/sysconfig/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/src/complex.ycp?rev=67… ============================================================================== --- trunk/sysconfig/src/complex.ycp (original) +++ trunk/sysconfig/src/complex.ycp Fri Mar 30 16:23:42 2012 @@ -395,37 +395,9 @@ return nil; } - string ret = ""; - integer index = 0; - boolean backslash = false; + string ret = regexpsub(input, "(.*)\\([^$].*)", "\\1\\2"); - while (index < size(input)) - { - string ch = substring(input, index, 1); - string ch_1 = substring(input, index + 1, 1); - - if (backslash == false) - { - // don't remove backslash before \$ (#34809) - if (ch == "\\" && ch_1 != nil && ch_1 != "$") - { - backslash = true; - } - else - { - ret = ret + ch; - } - } - else - { - ret = ret + ch; - backslash = false; - } - - index = index + 1; - } - - return ret; + return (ret == nil) ? input : ret; } /** @@ -444,7 +416,7 @@ value = (haskey(description, "Default")) ? description["Default"]:"" : ""; } - if (description["actions","SingleQt"]:"" == "") + if (description["actions","SingleQt"]:"" == "1") { new_value = backslash_remove(new_value); value = backslash_remove(value); @@ -608,7 +580,7 @@ map d = Sysconfig::get_description(selected_variable); // check whether single quotes are used in the configuration file - if (d["actions", "SingleQt"]:"" == "") + if (d["actions", "SingleQt"]:"" == "1") { new_value = backslash_add(new_value); } -- 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] r67836 - in /trunk/bootloader: VERSION package/yast2-bootloader.changes
by snwint＠svn2.opensuse.org 30 Mar '12

30 Mar '12

Author: snwint Date: Fri Mar 30 13:06:44 2012 New Revision: 67836 URL: http://svn.opensuse.org/viewcvs/yast?rev=67836&view=rev Log: - 2.23.1 Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=67836&r1=… ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Fri Mar 30 13:06:44 2012 @@ -1 +1 @@ -2.23.0 +2.23.1 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Fri Mar 30 13:06:44 2012 @@ -3,6 +3,7 @@ - add kernel parameters (detected necessary and user specfied one during installation) to grub2's config file (bnc#752939) +- 2.23.1 ------------------------------------------------------------------- Thu Mar 22 10:56:28 UTC 2012 - mchang(a)suse.com -- 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] r67835 - in /trunk/bootloader: package/yast2-bootloader.changes src/modules/BootGRUB2.ycp src/modules/BootGRUB2EFI.ycp
by snwint＠svn2.opensuse.org 30 Mar '12

30 Mar '12

Author: snwint Date: Fri Mar 30 13:05:55 2012 New Revision: 67835 URL: http://svn.opensuse.org/viewcvs/yast?rev=67835&view=rev Log: - add kernel parameters (detected necessary and user specfied one during installation) to grub2's config file (bnc#752939) Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/modules/BootGRUB2.ycp trunk/bootloader/src/modules/BootGRUB2EFI.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Fri Mar 30 13:05:55 2012 @@ -1,6 +1,12 @@ ------------------------------------------------------------------- Thu Mar 22 10:56:28 UTC 2012 - mchang(a)suse.com +- add kernel parameters (detected necessary and user specfied one during + installation) to grub2's config file (bnc#752939) + +------------------------------------------------------------------- +Thu Mar 22 10:56:28 UTC 2012 - mchang(a)suse.com + - add new grub2-efi module to support booting on UEFI firmware. ------------------------------------------------------------------- Modified: trunk/bootloader/src/modules/BootGRUB2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB2… ============================================================================== --- trunk/bootloader/src/modules/BootGRUB2.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB2.ycp Fri Mar 30 13:05:55 2012 @@ -24,7 +24,7 @@ textdomain "bootloader"; -import "Arch"; +import "BootArch"; import "BootCommon"; import "BootStorage"; import "Kernel"; @@ -122,6 +122,30 @@ global define void Propose () { y2milestone ("Proposed globals: %1", BootCommon::globals); grub_LocationProposal (); + + map<string, integer> swap_sizes = BootCommon::getSwapPartitions (); + list<string> swap_parts = (list<string>) + maplist (string name, integer size, swap_sizes, ``(name)); + swap_parts = sort (string a, string b, swap_parts, + ``(swap_sizes[a]:0 > swap_sizes[b]:0) + ); + + string largest_swap_part = swap_parts[0]:""; + + string resume = BootArch::ResumeAvailable () + ? largest_swap_part + : ""; + // try to use label or udev id for device name... FATE #302219 + if ((resume != "") && (resume != nil)) + resume = BootStorage::Dev2MountByDev(resume); + BootCommon::globals["append"] = BootArch::DefaultKernelParams (resume); + + // Let grub2 scripts detects correct root= for us. :) + // BootCommon::globals["root"] = BootStorage::Dev2MountByDev(BootStorage::RootPartitionDevice); + if (BootArch::VgaAvailable () && Kernel::GetVgaType () != "") + { + BootCommon::globals["vgamode"] = Kernel::GetVgaType (); + } } Modified: trunk/bootloader/src/modules/BootGRUB2EFI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB2… ============================================================================== --- trunk/bootloader/src/modules/BootGRUB2EFI.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB2EFI.ycp Fri Mar 30 13:05:55 2012 @@ -24,7 +24,7 @@ textdomain "bootloader"; -import "Arch"; +import "BootArch"; import "BootCommon"; import "BootStorage"; import "Kernel"; @@ -116,6 +116,30 @@ global define void Propose () { y2milestone ("Proposed globals: %1", BootCommon::globals); + + map<string, integer> swap_sizes = BootCommon::getSwapPartitions (); + list<string> swap_parts = (list<string>) + maplist (string name, integer size, swap_sizes, ``(name)); + swap_parts = sort (string a, string b, swap_parts, + ``(swap_sizes[a]:0 > swap_sizes[b]:0) + ); + + string largest_swap_part = swap_parts[0]:""; + + string resume = BootArch::ResumeAvailable () + ? largest_swap_part + : ""; + // try to use label or udev id for device name... FATE #302219 + if ((resume != "") && (resume != nil)) + resume = BootStorage::Dev2MountByDev(resume); + BootCommon::globals["append"] = BootArch::DefaultKernelParams (resume); + + // Let grub2 scripts detects correct root= for us. :) + // BootCommon::globals["root"] = BootStorage::Dev2MountByDev(BootStorage::RootPartitionDevice); + if (BootArch::VgaAvailable () && Kernel::GetVgaType () != "") + { + BootCommon::globals["vgamode"] = Kernel::GetVgaType (); + } } /** -- 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] r67834 - /trunk/bootloader/src/modules/BootGRUB2EFI.ycp
by snwint＠svn2.opensuse.org 30 Mar '12

30 Mar '12

Author: snwint Date: Fri Mar 30 13:03:38 2012 New Revision: 67834 URL: http://svn.opensuse.org/viewcvs/yast?rev=67834&view=rev Log: - the new module Added: trunk/bootloader/src/modules/BootGRUB2EFI.ycp Added: trunk/bootloader/src/modules/BootGRUB2EFI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB2… ============================================================================== --- trunk/bootloader/src/modules/BootGRUB2EFI.ycp (added) +++ trunk/bootloader/src/modules/BootGRUB2EFI.ycp Fri Mar 30 13:03:38 2012 @@ -0,0 +1,189 @@ +/** + * File: + * modules/BootGRUB2EFI.ycp + * + * Module: + * Bootloader installation and configuration + * + * Summary: + * Module containing specific functions for GRUB2EFI configuration + * and installation + * + * Authors: + * Jiri Srain <jsrain(a)suse.cz> + * Joachim Plack <jplack(a)suse.de> + * Olaf Dabrunz <od(a)suse.de> + * Philipp Thomas <pth(a)suse.de> + * + * $Id: BootGRUB2EFI.ycp 63508 2011-03-04 12:53:27Z jreidinger $ + * + */ + +{ +module "BootGRUB2EFI"; + +textdomain "bootloader"; + +import "Arch"; +import "BootCommon"; +import "BootStorage"; +import "Kernel"; +import "Mode"; +import "Stage"; +import "Storage"; +import "StorageDevices"; +import "Pkg"; +import "HTML"; + +// includes +// for shared some routines with grub +// include "bootloader/grub/misc.ycp"; +// for simplified widgets than other +// include "bootloader/grub2efi/dialogs.ycp"; +// general functions + +/** + * Read settings from disk + * @param reread boolean true to force reread settings from system + * @param avoid_reading_device_map do not read new device map from file, use + * internal data + * @return boolean true on success + */ +global boolean Read (boolean reread, boolean avoid_reading_device_map) { + BootCommon::InitializeLibrary (reread, "grub2-efi"); + if (reread) { + BootCommon::ReadFiles (avoid_reading_device_map); + } + // TODO: check if necessary for grub2efi + // grub_DetectDisks (); + boolean ret = BootCommon::Read (false, avoid_reading_device_map); + + // TODO: check if necessary for grub2 + // refresh device map if not read + // if (BootStorage::device_mapping == nil + // || size (BootStorage::device_mapping) == 0) + // { + // BootStorage::ProposeDeviceMap (); + // } + + return ret; +} + +/** + * Update read settings to new version of configuration files + */ +global define void Update () { + Read (true, true); + + //we don't handle sections, grub2 section create them for us + //BootCommon::UpdateSections (); + BootCommon::UpdateGlobals (); +} + +/** + * Write bootloader settings to disk + * @return boolean true on success + */ +global define boolean Write () { + + boolean ret = BootCommon::UpdateBootloader (); + + if (BootCommon::location_changed) { + boolean grub_ret = BootCommon::InitializeBootloader (); + if (grub_ret == nil) + grub_ret = false; + + y2milestone ("GRUB2EFI return value: %1", grub_ret); + ret = ret && grub_ret; + } + + return ret; +} + +/** + * Reset bootloader settings + * @param init boolean true to repropose also device map + */ +global define void Reset (boolean init) { + if (Mode::autoinst ()) + return; + BootCommon::Reset (init); +} + +/** + * Propose bootloader settings + */ + +global define void Propose () { + y2milestone ("Proposed globals: %1", BootCommon::globals); +} + +/** + * Display bootloader summary + * @return a list of summary lines + */ + +global define list<string> Summary () { + list<string> result = [ sformat (_("Boot Loader Type: %1"), + BootCommon::getLoaderName (BootCommon::getLoaderType (false), `summary)) ]; + list<string> locations = []; + + return result; +} + +/** + * Return map of provided functions + * @return a map of functions (eg. $["write":BootGRUB2EFI::Write]) + */ +global map<string, any> GetFunctions () { + return $[ + "read" : Read, + "reset" : Reset, + "propose" : Propose, + "summary" : Summary, + "update" : Update, + #TODO grub2widgets + #"widgets" : grub2Widgets, + "widgets" : $[], + "write" : Write, + ]; +} + + +/** + * Initializer of GRUB2EFI bootloader + */ +global define void Initializer () { + y2milestone ("Called GRUB2EFI initializer"); + BootCommon::current_bootloader_attribs = $[ + "propose" : false, + "read" : false, + "scratch" : false, + "restore_mbr" : false, + "bootloader_on_disk" : false, + ]; +} + +/** + * Constructor + */ +global define void BootGRUB2EFI () { + BootCommon::bootloader_attribs["grub2-efi"] = $[ + "required_packages" : ["grub2-efi"], + "loader_name" : "GRUB2-EFI", + "initializer" : BootGRUB2EFI::Initializer, + ]; +} + +} // EOF + +/* + * Local variables: + * mode: ycp + * mode: font-lock + * mode: auto-fill + * indent-level: 4 + * fill-column: 78 + * End: + */ + -- 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] r67833 - in /trunk/bootloader: package/ src/modules/ src/routines/
by snwint＠svn2.opensuse.org 30 Mar '12

30 Mar '12

Author: snwint Date: Fri Mar 30 13:02:53 2012 New Revision: 67833 URL: http://svn.opensuse.org/viewcvs/yast?rev=67833&view=rev Log: - add new grub2-efi module to support booting on UEFI firmware Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/modules/BootSupportCheck.ycp trunk/bootloader/src/modules/Makefile.am trunk/bootloader/src/routines/dialogs.ycp trunk/bootloader/src/routines/global_widgets.ycp trunk/bootloader/src/routines/switcher.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Fri Mar 30 13:02:53 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 22 10:56:28 UTC 2012 - mchang(a)suse.com + +- add new grub2-efi module to support booting on UEFI firmware. + +------------------------------------------------------------------- Wed Mar 14 15:43:44 CET 2012 - aschnell(a)suse.de - adapted ssh command for 2nd stage ssh installation (bnc#745340) Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommo… ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Fri Mar 30 13:02:53 2012 @@ -187,7 +187,7 @@ /** * type of bootloader to configure/being configured - * shall be one of "lilo", "grub", "elilo", "ppc", "zipl", "grub2" + * shall be one of "lilo", "grub", "elilo", "ppc", "zipl", "grub2", "grub2-efi" */ string loader_type = nil; @@ -289,7 +289,7 @@ * List of all supported bootloaders */ global list<string> bootloaders = ["lilo", "grub", "elilo", - "zipl", "ppc", "grub2"]; + "zipl", "ppc", "grub2", "grub2-efi"]; /** FATE#305008: Failover boot configurations for md arrays with redundancy * if true enable redundancy for md array @@ -1059,7 +1059,9 @@ } if ((Arch::i386() || Arch::x86_64()) && Linuxrc::InstallInf("EFI") == "1") { - loader_type = "elilo"; + // use grub2-efi as default bootloader for x86_64/i386 EFI + // previously we use elilo + loader_type = "grub2-efi"; } loader_type = SupportedLoader (loader_type); @@ -1139,7 +1141,7 @@ global define list<string> getBootloaders () { if (Mode::config ()) { - return ["grub", "lilo", "elilo", "zipl", "ppc", "grub2", "default", "none"]; + return ["grub", "lilo", "elilo", "zipl", "ppc", "grub2", "grub2-efi", "default", "none"]; } list<string> ret = [ getLoaderType (false), @@ -1149,7 +1151,7 @@ { ret = (list<string>)merge (ret, ["lilo", "grub", "grub2"]); if (Arch::x86_64 ()) - ret = (list<string>)merge (ret, ["elilo"]); + ret = (list<string>)merge (ret, ["elilo", "grub2-efi"]); } // in order not to display it twice when "none" is selected ret = filter (string l, ret, { Modified: trunk/bootloader/src/modules/BootSupportCheck.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootSuppo… ============================================================================== --- trunk/bootloader/src/modules/BootSupportCheck.ycp (original) +++ trunk/bootloader/src/modules/BootSupportCheck.ycp Fri Mar 30 13:02:53 2012 @@ -74,7 +74,7 @@ * Check that bootloader is known and supported */ boolean KnownLoader () { - if (! contains (["grub", "grub2", "elilo", "ppc", "zipl", "none"], Bootloader::getLoaderType ())) + if (! contains (["grub", "grub2", "grub2-efi", "elilo", "ppc", "zipl", "none"], Bootloader::getLoaderType ())) { if (Bootloader::getLoaderType () != "lilo") @@ -122,7 +122,7 @@ return true; if (Arch::i386() || Arch::x86_64()) { if (checkElilo()) { - if (lt == "elilo") + if (lt == "elilo" || lt == "grub2-efi") return true; } else { if ((lt == "grub") || (lt == "lilo") || (lt == "grub2")) @@ -304,6 +304,13 @@ } /** + * GRUB2EFI-related check + */ +global boolean GRUB2EFI () { + return true; +} + +/** * ELILO related check */ boolean ELILO () { @@ -357,6 +364,8 @@ supported = ZIPL () && supported; else if (lt == "grub2") supported = GRUB2 () && supported; + else if (lt == "grub2-efi") + supported = GRUB2EFI () && supported; y2milestone ("Configuration supported: %1", supported); return supported; Modified: trunk/bootloader/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/Makefile.… ============================================================================== --- trunk/bootloader/src/modules/Makefile.am (original) +++ trunk/bootloader/src/modules/Makefile.am Fri Mar 30 13:02:53 2012 @@ -12,6 +12,7 @@ BootELILO.ycp \ BootGRUB.ycp \ BootGRUB2.ycp \ + BootGRUB2EFI.ycp \ BootLILO.ycp \ BootPOWERLILO.ycp \ BootZIPL.ycp \ Modified: trunk/bootloader/src/routines/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/dialogs.… ============================================================================== --- trunk/bootloader/src/routines/dialogs.ycp (original) +++ trunk/bootloader/src/routines/dialogs.ycp Fri Mar 30 13:02:53 2012 @@ -84,7 +84,7 @@ string lt = Bootloader::getLoaderType (); term contents = `VBox ( "tab", - (lt == "grub2") + (lt == "grub2" || lt == "grub2-efi") ? nil : `Right ("adv_button") ); @@ -101,7 +101,7 @@ } // F#300779: end - list<string> widget_names = (lt == "grub2") + list<string> widget_names = (lt == "grub2" || lt == "grub2-efi") ? ["tab"] : ["tab", "adv_button"]; map<string,map<string,any> > widget_descr = $[]; @@ -109,12 +109,12 @@ widget_descr = (map<string,map<string,any> >) union (CommonGlobalWidgets (), Bootloader::blWidgetMaps ()); widget_descr["tab"] = CWMTab::CreateWidget($[ - "tab_order": (lt == "grub2") + "tab_order": (lt == "grub2" || lt == "grub2-efi") ? ["installation"] : ["sections", "installation"], "tabs": TabsDescr (), "widget_descr": widget_descr, - "initial_tab" : (lt == "grub2") + "initial_tab" : (lt == "grub2" || lt == "grub2-efi") ? "installation" : return_tab ]); Modified: trunk/bootloader/src/routines/global_widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/global_w… ============================================================================== --- trunk/bootloader/src/routines/global_widgets.ycp (original) +++ trunk/bootloader/src/routines/global_widgets.ycp Fri Mar 30 13:02:53 2012 @@ -330,6 +330,22 @@ return `redraw; } + if (new_bl == "grub2-efi") { + if (Popup::ContinueCancel (_(" +The grub2-efi is still under develope and test. + +Proceed? +"))) + { + BootCommon::other_bl[old_bl] = Bootloader::Export (); + BootCommon::setLoaderType ("grub2-efi"); + Bootloader::Propose (); + BootCommon::location_changed = true; + BootCommon::changed = true; + } + return `redraw; + } + if (Arch::x86_64 ()) { if (new_bl == "elilo") { // continue/cancel pop-up @@ -720,7 +736,7 @@ `HStretch (), `VBox ( `Label (""), - (lt == "none" || lt == "default" || lt == "zipl" || lt == "lilo" || lt == "grub2") + (lt == "none" || lt == "default" || lt == "zipl" || lt == "lilo" || lt == "grub2" || lt == "grub2-efi") ? `Empty() : "loader_options" ), `HSpacing (2) @@ -728,7 +744,7 @@ `VSpacing (0.4) )), `VStretch (), - (lt == "none" || lt == "default" || lt == "zipl" || lt == "lilo") + (lt == "none" || lt == "default" || lt == "zipl" || lt == "lilo" || lt == "grub2-efi") ? `Empty () : "loader_location", `VStretch (), @@ -737,8 +753,8 @@ : "inst_details", `VStretch () ), `HStretch ()), - "widget_names": (lt == "none" || lt == "default" || lt=="zipl" || lt == "grub2") - ? [ "loader_type", "loader_options", "loader_location"] + "widget_names": (lt == "none" || lt == "default" || lt=="zipl" || lt == "grub2-efi") + ? [ "loader_type", "loader_options" ] : [ "loader_type", "loader_options", "loader_location", "inst_details"] ], Modified: trunk/bootloader/src/routines/switcher.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/switcher… ============================================================================== --- trunk/bootloader/src/routines/switcher.ycp (original) +++ trunk/bootloader/src/routines/switcher.ycp Fri Mar 30 13:02:53 2012 @@ -24,6 +24,7 @@ import "BootPOWERLILO"; import "BootZIPL"; import "BootGRUB2"; +import "BootGRUB2EFI"; import "BootCommon"; /** @@ -40,7 +41,8 @@ "elilo" : BootELILO::GetFunctions, "zipl" : BootZIPL::GetFunctions, "ppc" : BootPOWERLILO::GetFunctions, - "grub2" : BootGRUB2::GetFunctions + "grub2" : BootGRUB2::GetFunctions, + "grub2-efi" : BootGRUB2EFI::GetFunctions ]; map<string,any> () gf = (map<string,any>())(bl_functions[bootloader]:nil); if (gf == nil) -- 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] r67832 - in /trunk/storage: package/ storage/src/include/
by aschnell＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: aschnell Date: Thu Mar 29 18:34:11 2012 New Revision: 67832 URL: http://svn.opensuse.org/viewcvs/yast?rev=67832&view=rev Log: - improved mount checks and feedback during resize (bnc#732766) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_check_generated.ycp trunk/storage/storage/src/include/custom_part_dialogs.ycp trunk/storage/storage/src/include/custom_part_lib.ycp trunk/storage/storage/src/include/ep-dialogs.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 Mar 29 18:34:11 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 18:30:25 CEST 2012 - aschnell(a)suse.de + +- improved mount checks and feedback during resize (bnc#732766) + +------------------------------------------------------------------- Thu Mar 29 12:14:35 CEST 2012 - fehr(a)suse.de - patch proofread text back into ycp Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_check_generated.ycp (original) +++ trunk/storage/storage/src/include/custom_part_check_generated.ycp Thu Mar 29 18:34:11 2012 @@ -585,49 +585,10 @@ if( !installation ) { - string mounts = Storage::DeviceMounted( part_name ); - if( mounts != "" ) - { - // popup text %1 is directory name - string message = sformat(_("The selected device is currently mounted on %1. -We *strongly* recommend to unmount it manually -before deleting it. - -Click Cancel unless you know exactly what you are doing. - -If you proceed, YaST will try unmounting before deleting it. -"), mounts ); - - - if( !Popup::ContinueCancel(message)) - { - return false; - } - else - { - symbol ret = `none; - do - { - if( !Storage::Umount( part_name ) ) - { - // popup text %1 is directory name - message = sformat(_("Unmount of %1 failed. -Remove the device anyway? -"), mounts ); - ret = Popup::AnyQuestion3( Label::WarningMsg(), message, - Label::YesButton(), - Label::NoButton(), - // button text - _("&Retry umount"), - `focus_yes ); - } - } - while( ret == `retry ); - if( ret == `no ) - return false; - } - } + if (!TryUmount(part_name, _("It cannot be deleted while mounted."), true)) + return false; } + if( !installation && curr_part["type"]:`unknown==`logical ) { boolean ok = true; Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Thu Mar 29 18:34:11 2012 @@ -1102,18 +1102,6 @@ return( ret ); } -define void FsysCannotResizeMountPopup( boolean lvm, string mount ) - ``{ - // %1 is either replaced by "logical volume" or by "partition" - string txt = sformat( _(" -The file system is currently mounted on %1. -It is not possible to resize the file system while it is mounted. - -Unmount the file system and retry resizing. -"), - mount ); - Popup::Error( txt ); - } define boolean FsysShrinkReiserWarning( boolean lvm ) ``{ Modified: trunk/storage/storage/src/include/custom_part_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_lib.ycp (original) +++ trunk/storage/storage/src/include/custom_part_lib.ycp Thu Mar 29 18:34:11 2012 @@ -820,30 +820,81 @@ } -define boolean CheckResizePossible( boolean ask, boolean lvm, integer resize, - symbol fsys, string mount ) - ``{ - map poss = FileSystems::IsResizable( fsys ); +boolean TryUmount(string device, string text, boolean allow_ignore) +{ + while (true) + { + string mountpoint = Storage::DeviceMounted(device); + if (isempty(mountpoint)) + return true; + + if (allow_ignore) + { + string full_text = sformat(_("The file system is currently mounted on %1."), mountpoint) + "\n\n" + + _("You can try to unmount it now, continue without unmounting or cancel. +Click Cancel unless you know exactly what you are doing."); + + symbol ret = Popup::AnyQuestion3(Label::WarningMsg(), full_text, + Label::ContinueButton(), + Label::CancelButton(), + // button text + _("Unmount"), + `focus_no); + + if (ret == `no) + return false; + + if (ret == `yes) + return true; + } + else + { + string full_text = sformat(_("The file system is currently mounted on %1."), mountpoint) + "\n\n" + + _("You can try to unmount it now or cancel. +Click Cancel unless you know exactly what you are doing."); + + boolean ret = Popup::AnyQuestion(Label::WarningMsg(), full_text, + // button text + _("Unmount"), + Label::CancelButton(), `focus_no); + + if (ret == false) + return false; + } + + if (Storage::Umount(device)) + return true; + } +} + + +boolean CheckResizePossible(string device, boolean ask, boolean lvm, integer resize, + symbol fsys) +{ + map<string, boolean> poss = FileSystems::IsResizable(fsys); + string mountpoint = Storage::DeviceMounted(device); + boolean ret = true; - y2milestone( "CheckResizePossible resize %1 ask %2 lvm %3 fsys %4 mount %5", - resize, ask, lvm, fsys, mount ); - if( size(mount)>0 && !Stage::initial() && resize < 0 && + y2milestone("CheckResizePossible device:%1 ask:%2 lvm:%3 resize:%4 fsys:%5", + device, ask, lvm, resize, fsys); + + if( !isempty(mountpoint) && !Stage::initial() && resize < 0 && !poss["mount_shrink"]:false && poss["shrink"]:false ) { - FsysCannotResizeMountPopup( lvm, mount ); - ret = false; + if (!TryUmount(device, _("It is not possible to shrink the file system while it is mounted."), true)) + ret = false; } - else if( size(mount)>0 && !Stage::initial() && resize > 0 && + else if( !isempty(mountpoint) && !Stage::initial() && resize > 0 && !poss["mount_extend"]:false && poss["extend"]:false ) { - FsysCannotResizeMountPopup( lvm, mount ); - ret = false; + if (!TryUmount(device, _("It is not possible to extend the file system while it is mounted."), true)) + ret = false; } - else if( size(mount)>0 && !Stage::initial() && resize != 0 && !lvm ) + else if( !isempty(mountpoint) && !Stage::initial() && resize != 0 && !lvm ) { - FsysCannotResizeMountPopup( lvm, mount ); - ret = false; + if (!TryUmount(device, _("It is not possible to resize the file system while it is mounted."), true)) + ret = false; } else if( resize < 0 && !poss["shrink"]:false ) { @@ -858,8 +909,7 @@ ret = FsysCannotGrowPopup( ask, lvm ); } y2milestone( "ret %1", ret ); - return( ret ); - } - + return ret; +} } Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-d… ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Thu Mar 29 18:34:11 2012 @@ -648,19 +648,22 @@ return false; } - integer cyl_size = 0; integer free_cyl_after = 0; string device = data["device"]:"error"; symbol used_fs = data["used_fs"]:`none; - integer used_k = FileSystems::MinFsSizeK(used_fs); + if (!data["format"]:false) { if (used_fs != `swap) { + if (used_fs == `ntfs && !TryUmount(device, _("It is not possible to check whether a NTFS +can be resized while it is mounted."), false)) + return false; + map free_data = Storage::GetFreeSpace(device, used_fs, true); if (isempty(free_data) || !free_data["ok"]:false) { @@ -834,12 +837,11 @@ if (size_k != old_size_k) { - string mountpoint = data["inactive"]:false ? "" : data["mount"]:""; + string mountpoint = Storage::DeviceMounted(device); boolean lvm = data["type"]:`unknown == `lvm; - //1 - ask & be interactive, 2 - we are on lvm, 3 - cyl.diff, 4 - filesystem, 5 - mountpoint if (!data["format"]:false && - !CheckResizePossible(false, lvm, size_k - old_size_k, used_fs, mountpoint)) + !CheckResizePossible(device, false, lvm, size_k - old_size_k, used_fs)) { //FIXME: To check whether the part. can be resized only //after user tries to do that is stupid - in some cases -- 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] r67831 - in /trunk/storage: package/yast2-storage.changes storage/src/include/custom_part_check_generated.ycp
by fehr＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: fehr Date: Thu Mar 29 18:08:31 2012 New Revision: 67831 URL: http://svn.opensuse.org/viewcvs/yast?rev=67831&view=rev Log: patch proofread text back into ycp Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_check_generated.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 Mar 29 18:08:31 2012 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Thu Mar 29 12:14:35 CEST 2012 - fehr(a)suse.de +- patch proofread text back into ycp - prevent invalid size values in tmpfs size (bnc#754326) ------------------------------------------------------------------- Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_check_generated.ycp (original) +++ trunk/storage/storage/src/include/custom_part_check_generated.ycp Thu Mar 29 18:08:31 2012 @@ -216,10 +216,9 @@ if( fat_system_mount || show_all_popups ) { // popup text - string message = _("You tried to mount a fat partition to one of -the following mount points: / /usr /home /opt /var. This will very likely -cause problems. Use a Linux file system, such as ext3 or ext4, for these mount -points. + string message = _("You tried to mount a FAT partition to one of the following mount +points: /, /usr, /home, /opt or /var. This will very likely cause problems. +Use a Linux file system, such as ext3 or ext4, for these mount points. Really use this setup? "); @@ -231,7 +230,7 @@ if( fat_system_boot || show_all_popups ) { // popup text - string message = _("You tried to mount a fat partition to the + string message = _("You tried to mount a FAT partition to the mount point /boot. This will very likely cause problems. Use a Linux file system, such as ext3 or ext4, for this mount point. -- 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] r67830 - /branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/lvm_ui_lib.ycp
by fehr＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: fehr Date: Thu Mar 29 18:01:05 2012 New Revision: 67830 URL: http://svn.opensuse.org/viewcvs/yast?rev=67830&view=rev Log: remove superfluous lvm_ui_lib.ycp Removed: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/lvm_ui_lib.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] r67829 - /branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/nfs.ycp
by fehr＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: fehr Date: Thu Mar 29 17:59:27 2012 New Revision: 67829 URL: http://svn.opensuse.org/viewcvs/yast?rev=67829&view=rev Log: remove superfluous nfs.ycp Removed: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/nfs.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] r67828 - in /branches/SuSE-Code-11-SP3-Branch/storage: disk/src/ libstorage/src/ package/ storage/src/ storage/src/include/ storage/src/modules/
by fehr＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: fehr Date: Thu Mar 29 17:52:34 2012 New Revision: 67828 URL: http://svn.opensuse.org/viewcvs/yast?rev=67828&view=rev Log: patched proofread texts back into source code Modified: branches/SuSE-Code-11-SP3-Branch/storage/disk/src/disk.ycp branches/SuSE-Code-11-SP3-Branch/storage/disk/src/disk_worker.ycp branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Btrfs.cc branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Dmraid.cc branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/DmraidCo.cc branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Nfs.cc branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Tmpfs.cc branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/auto_part_ui.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_check_generated.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_dialogs.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_helptexts.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_lib.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-all.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs-dialogs.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs-lib.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-dialogs.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-dm.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd-lib.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-import.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-lib.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-loop-dialogs.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-main.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-raid.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-settings.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-summary.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs-dialogs.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs-lib.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/lvm_ui_lib.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/nfs.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_disk_proposal.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_resize_dialog.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_resize_ui.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/FileSystems.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/Partitions.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/Storage.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageClients.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageFields.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageProposal.ycp branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageSettings.ycp Modified: branches/SuSE-Code-11-SP3-Branch/storage/disk/src/disk.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/disk/src/disk.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/disk/src/disk.ycp Thu Mar 29 17:52:34 2012 @@ -31,7 +31,7 @@ Never partition disks that may, in any way, be in use (mounted, swap, etc.) unless you know exactly what you are doing. Otherwise, the partitioning table will not be forwarded to the -kernel, which would most likely lead to data loss. +kernel, which will most likely lead to data loss. To continue despite this warning, click Yes. "); @@ -47,7 +47,7 @@ // text show during initialization `Label(_("Initializing...")), // helptext - _("Please wait, while volumes are being detected."), + _("Volumes are being detected."), false, false ); Modified: branches/SuSE-Code-11-SP3-Branch/storage/disk/src/disk_worker.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/disk/src/disk_worker.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/disk/src/disk_worker.ycp Thu Mar 29 17:52:34 2012 @@ -45,7 +45,7 @@ // translators: command line help text for disk module "help" : _("Disk partitioner"), // custum help text (should replace default one) - "customhelp" : _("Command line interface for the partitioner module is not available"), + "customhelp" : _("Command line interface for the partitioner module is not available."), "guihandler" : DiskSequence, ]; Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Btrfs.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Btrfs.cc (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Btrfs.cc Thu Mar 29 17:52:34 2012 @@ -720,14 +720,14 @@ { // displayed text during action, // %1$s and %2$s are replaced by a device names (e.g. /dev/hda1) - txt = sformat( _("Extending BTRFS volume %1$s by %2$s"), name().c_str(), + txt = sformat( _("Extending Btrfs volume %1$s by %2$s"), name().c_str(), dev.c_str() ); } else { // displayed text before action, // %1$s and %2$s are replaced by a device names (e.g. /dev/hda1) - txt = sformat( _("Extend BTRFS volume %1$s by %2$s"), name().c_str(), + txt = sformat( _("Extend Btrfs volume %1$s by %2$s"), name().c_str(), dev.c_str() ); } return( txt ); @@ -741,14 +741,14 @@ { // displayed text during action, // %1$s and %2$s are replaced by a device names (e.g. /dev/hda1) - txt = sformat( _("Reducing BTRFS volume %1$s by %2$s"), name().c_str(), + txt = sformat( _("Reducing Btrfs volume %1$s by %2$s"), name().c_str(), dev.c_str() ); } else { // displayed text before action, // %1$s and %2$s are replaced by a device names (e.g. /dev/hda1) - txt = sformat( _("Reduce BTRFS volume %1$s by %2$s"), name().c_str(), + txt = sformat( _("Reduce Btrfs volume %1$s by %2$s"), name().c_str(), dev.c_str() ); } return( txt ); Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Dmraid.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Dmraid.cc (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Dmraid.cc Thu Mar 29 17:52:34 2012 @@ -67,13 +67,13 @@ if( doing ) { // displayed text during action, %1$s is replaced by raid partition name e.g. pdc_dabaheedj_part1 - txt = sformat( _("Deleting raid partition %1$s"), d.c_str() ); + txt = sformat( _("Deleting RAID partition %1$s"), d.c_str() ); } else { // displayed text before action, %1$s is replaced by raid partition name e.g. pdc_dabaheedj_part1 // %2$s is replaced by size (e.g. 623.5 MB) - txt = sformat( _("Delete raid partition %1$s (%2$s)"), d.c_str(), + txt = sformat( _("Delete RAID partition %1$s (%2$s)"), d.c_str(), sizeString().c_str() ); } return( txt ); @@ -86,7 +86,7 @@ if( doing ) { // displayed text during action, %1$s is replaced by raid partition name e.g. pdc_dabaheedj_part1 - txt = sformat( _("Creating raid partition %1$s"), d.c_str() ); + txt = sformat( _("Creating RAID partition %1$s"), d.c_str() ); } else { @@ -94,7 +94,7 @@ { // displayed text before action, %1$s is replaced by raid partition e.g. pdc_dabaheedj_part1 // %2$s is replaced by size (e.g. 623.5 MB) - txt = sformat( _("Create swap raid partition %1$s (%2$s)"), + txt = sformat( _("Create swap RAID partition %1$s (%2$s)"), d.c_str(), sizeString().c_str() ); } else if( !mp.empty() ) @@ -105,7 +105,7 @@ // %2$s is replaced by size (e.g. 623.5 MB) // %3$s is replaced by file system type (e.g. reiserfs) // %4$s is replaced by mount point (e.g. /usr) - txt = sformat( _("Create raid partition %1$s (%2$s) for %4$s with %3$s"), + txt = sformat( _("Create RAID partition %1$s (%2$s) for %4$s with %3$s"), d.c_str(), sizeString().c_str(), fsTypeString().c_str(), mp.c_str() ); } @@ -115,7 +115,7 @@ // %2$s is replaced by size (e.g. 623.5 MB) // %3$s is replaced by file system type (e.g. reiserfs) // %4$s is replaced by mount point (e.g. /usr) - txt = sformat( _("Create encrypted raid partition %1$s (%2$s) for %4$s with %3$s"), + txt = sformat( _("Create encrypted RAID partition %1$s (%2$s) for %4$s with %3$s"), d.c_str(), sizeString().c_str(), fsTypeString().c_str(), mp.c_str() ); } @@ -124,14 +124,14 @@ { // displayed text before action, %1$s is replaced by raid partition e.g. pdc_dabaheedj_part1 // %2$s is replaced by size (e.g. 623.5 MB) - txt = sformat( _("Create extended raid partition %1$s (%2$s)"), + txt = sformat( _("Create extended RAID partition %1$s (%2$s)"), d.c_str(), sizeString().c_str() ); } else { // displayed text before action, %1$s is replaced by raid partition e.g. pdc_dabaheedj_part1 // %2$s is replaced by size (e.g. 623.5 MB) - txt = sformat( _("Create raid partition %1$s (%2$s)"), + txt = sformat( _("Create RAID partition %1$s (%2$s)"), d.c_str(), sizeString().c_str() ); } } @@ -147,7 +147,7 @@ // displayed text during action, %1$s is replaced by raid partition e.g. pdc_dabaheedj_part1 // %2$s is replaced by size (e.g. 623.5 MB) // %3$s is replaced by file system type (e.g. reiserfs) - txt = sformat( _("Formatting raid partition %1$s (%2$s) with %3$s"), + txt = sformat( _("Formatting RAID partition %1$s (%2$s) with %3$s"), d.c_str(), sizeString().c_str(), fsTypeString().c_str() ); } else @@ -158,7 +158,7 @@ { // displayed text before action, %1$s is replaced by raid partition e.g. pdc_dabaheedj_part1 // %2$s is replaced by size (e.g. 623.5 MB) - txt = sformat( _("Format raid partition %1$s (%2$s) for swap"), + txt = sformat( _("Format RAID partition %1$s (%2$s) for swap"), d.c_str(), sizeString().c_str() ); } else if( encryption==ENC_NONE ) @@ -167,7 +167,7 @@ // %2$s is replaced by size (e.g. 623.5 MB) // %3$s is replaced by file system type (e.g. reiserfs) // %4$s is replaced by mount point (e.g. /usr) - txt = sformat( _("Format raid partition %1$s (%2$s) for %4$s with %3$s"), + txt = sformat( _("Format RAID partition %1$s (%2$s) for %4$s with %3$s"), d.c_str(), sizeString().c_str(), fsTypeString().c_str(), mp.c_str() ); } @@ -177,7 +177,7 @@ // %2$s is replaced by size (e.g. 623.5 MB) // %3$s is replaced by file system type (e.g. reiserfs) // %4$s is replaced by mount point (e.g. /usr) - txt = sformat( _("Format encrypted raid partition %1$s (%2$s) for %4$s with %3$s"), + txt = sformat( _("Format encrypted RAID partition %1$s (%2$s) for %4$s with %3$s"), d.c_str(), sizeString().c_str(), fsTypeString().c_str(), mp.c_str() ); } @@ -187,7 +187,7 @@ // displayed text before action, %1$s is replaced by raid partition e.g. pdc_dabaheedj_part1 // %2$s is replaced by size (e.g. 623.5 MB) // %3$s is replaced by file system type (e.g. reiserfs) - txt = sformat( _("Format raid partition %1$s (%2$s) with %3$s"), + txt = sformat( _("Format RAID partition %1$s (%2$s) with %3$s"), d.c_str(), sizeString().c_str(), fsTypeString().c_str() ); } @@ -204,11 +204,11 @@ if( needShrink() ) // displayed text during action, %1$s is replaced by raid partition e.g. pdc_dabaheedj_part1 // %2$s is replaced by size (e.g. 623.5 MB) - txt = sformat( _("Shrinking raid partition %1$s to %2$s"), d.c_str(), sizeString().c_str() ); + txt = sformat( _("Shrinking RAID partition %1$s to %2$s"), d.c_str(), sizeString().c_str() ); else // displayed text during action, %1$s is replaced by raid partition e.g. pdc_dabaheedj_part1 // %2$s is replaced by size (e.g. 623.5 MB) - txt = sformat( _("Extending raid partition %1$s to %2$s"), d.c_str(), sizeString().c_str() ); + txt = sformat( _("Extending RAID partition %1$s to %2$s"), d.c_str(), sizeString().c_str() ); txt += Text(" ", " "); // text displayed during action txt += _("(progress bar might not move)"); @@ -218,11 +218,11 @@ if( needShrink() ) // displayed text before action, %1$s is replaced by raid partition e.g. pdc_dabaheedj_part1 // %2$s is replaced by size (e.g. 623.5 MB) - txt = sformat( _("Shrink raid partition %1$s to %2$s"), d.c_str(), sizeString().c_str() ); + txt = sformat( _("Shrink RAID partition %1$s to %2$s"), d.c_str(), sizeString().c_str() ); else // displayed text before action, %1$s is replaced by raid partition e.g. pdc_dabaheedj_part1 // %2$s is replaced by size (e.g. 623.5 MB) - txt = sformat( _("Extend raid partition %1$s to %2$s"), d.c_str(), sizeString().c_str() ); + txt = sformat( _("Extend RAID partition %1$s to %2$s"), d.c_str(), sizeString().c_str() ); } return( txt ); @@ -236,14 +236,14 @@ { // displayed text during action, %1$s is replaced by partition name (e.g. pdc_dabaheedj_part1), // %2$s is replaced by hexadecimal number (e.g. 8E) - txt = sformat( _("Setting type of raid partition %1$s to %2$X"), + txt = sformat( _("Setting type of RAID partition %1$s to %2$X"), d.c_str(), id() ); } else { // displayed text before action, %1$s is replaced by partition name (e.g. pdc_dabaheedj_part1), // %2$s is replaced by hexadecimal number (e.g. 8E) - txt = sformat( _("Set type of raid partition %1$s to %2$X"), + txt = sformat( _("Set type of RAID partition %1$s to %2$X"), d.c_str(), id() ); } return( txt ); Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/DmraidCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/DmraidCo.cc (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/DmraidCo.cc Thu Mar 29 17:52:34 2012 @@ -240,12 +240,12 @@ if( doing ) { // displayed text during action, %1$s is replaced by a name (e.g. pdc_igeeeadj), - txt = sformat( _("Removing raid %1$s"), name().c_str() ); + txt = sformat( _("Removing RAID %1$s"), name().c_str() ); } else { // displayed text before action, %1$s is replaced by a name (e.g. pdc_igeeeadj), - txt = sformat( _("Remove raid %1$s"), name().c_str() ); + txt = sformat( _("Remove RAID %1$s"), name().c_str() ); } return( txt ); } Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Nfs.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Nfs.cc (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Nfs.cc Thu Mar 29 17:52:34 2012 @@ -70,12 +70,12 @@ if( doing ) { // displayed text during action, %1$s is replaced by volume name e.g. hilbert:/work - txt = sformat( _("Removing nfs volume %1$s"), dev.c_str() ); + txt = sformat( _("Removing NFS volume %1$s"), dev.c_str() ); } else { // displayed text before action, %1$s is replaced by volume name e.g. hilbert:/work - txt = sformat( _("Remove nfs volume %1$s"), dev.c_str() ); + txt = sformat( _("Remove NFS volume %1$s"), dev.c_str() ); } return( txt ); } Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Storage.cc Thu Mar 29 17:52:34 2012 @@ -374,8 +374,7 @@ "If they are clean devices or contain partitions then you can choose to use\n" "MD Partitionable RAID sysbsystem to handle them. In case of clean device you\n" "will be able to install system on it and boot from such RAID.\n" - "Do you want MD Partitionable RAID subsystem to manage those partitions?" - ), boost::join(l, " ").c_str() ); + "Do you want MD Partitionable RAID subsystem to manage those partitions?"), boost::join(l, " ").c_str() ); if( yesnoPopupCb(txt) ) { Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Tmpfs.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Tmpfs.cc (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Tmpfs.cc Thu Mar 29 17:52:34 2012 @@ -72,12 +72,12 @@ if( doing ) { // displayed text during action, %1$s is replaced by path name e.g /var/run - txt = sformat( _("Removing Tmpfs volume from mount point %1$s"), orig_mp.c_str() ); + txt = sformat( _("Removing tmpfs volume from mount point %1$s"), orig_mp.c_str() ); } else { // displayed text before action, %1$s is replaced by path name e.g /var/run - txt = sformat( _("Remove Tmpfs volume from mount point %1$s"), orig_mp.c_str() ); + txt = sformat( _("Remove tmpfs volume from mount point %1$s"), orig_mp.c_str() ); } return( txt ); } Modified: branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes Thu Mar 29 17:52:34 2012 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Thu Mar 29 12:14:35 CEST 2012 - fehr(a)suse.de +- patched proofread texts back into source code - prevent invalid size values in tmpfs size (bnc#754326) ------------------------------------------------------------------- Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/auto_part_ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/auto_part_ui.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/auto_part_ui.ycp Thu Mar 29 17:52:34 2012 @@ -80,7 +80,7 @@ // pushbutton to choose the entire disk, erasing all data on // the disk this is an easy way to select all partitions on // the target disk - `Left(`PushButton (`id (`full), _("Use &entire hard disk")))); + `Left(`PushButton (`id (`full), _("Use &Entire Hard Disk")))); vbox_contents = add (vbox_contents, `VSpacing(0.5) ); @@ -131,11 +131,11 @@ `VSpacing(0.5), `Left (`RadioButton (`id (`part_id), // Radio button for using an entire (Windows) partition for Linux - _("&Delete Windows completely") ) ), + _("&Delete Windows Completely") ) ), `VSpacing(0.5), `Left (`RadioButton (`id (`resize), // Radio button for resizing a (Windows) partition - _("&Shrink Windows partition"), true ) ) + _("&Shrink Windows Partition"), true ) ) ) ) ) @@ -158,9 +158,10 @@ "); // helptext, part 2 of 4 helptext = helptext + _(" -You can either use the entire hard disk or one or more of the +Use either the entire hard disk or one or more of the partitions or free regions shown. -"); + +"); // helptext, part 3 of 4 helptext = helptext + _(" Notice: If you select a region that is not shown as free, you Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_check_generated.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_check_generated.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_check_generated.ycp Thu Mar 29 17:52:34 2012 @@ -216,8 +216,8 @@ if( fat_system_mount || show_all_popups ) { // popup text - string message = _("You tried to mount a fat partition to one of -the following mount points: / /usr /home /opt /var. This will very likely + string message = _("You tried to mount a FAT partition to one of the following mount +points: /, /usr, /home, /opt or /var. This will very likely cause problems. Use a Linux file system, such as ext3, for these mount points. @@ -231,7 +231,7 @@ if( fat_system_boot || show_all_popups ) { // popup text - string message = _("You tried to mount a fat partition to the + string message = _("You tried to mount a FAT partition to the mount point /boot. This will very likely cause problems. Use a Linux file system, such as ext3, for this mount point. @@ -294,7 +294,7 @@ // popup text, %1 is a size string message = sformat(_("Warning: Your boot partition is smaller than %1. -It is recommended to increase the size of /boot. +We recommend to increase the size of /boot. Really keep this size of boot partition? "), Storage::KByteToHumanStringOmitZeroes(12*1024)); @@ -318,8 +318,8 @@ string message = sformat(_("Warning: There is no partition mounted as /boot. To boot from your hard disk, a small /boot partition (approx. %1) is required. Consider creating one. -(Partitions assigned to /boot will automatically be changed to -type 0x41 PReP/CHRP). +Partitions assigned to /boot will automatically be changed to +type 0x41 PReP/CHRP. Really use the setup without /boot partition? "), Storage::KByteToHumanStringOmitZeroes(4*1024)); @@ -393,9 +393,9 @@ // popup text string message = sformat(_("Warning: With your current setup, your %2 installation will encounter problems when booting, because you have no -FAT partition mounted onto %1. +FAT partition mounted on %1. -This will give severe problems with the normal boot setup. +This will cause severe problems with the normal boot setup. If you do not know exactly what you are doing, use a normal FAT partition for your files below %1. @@ -414,7 +414,7 @@ encounter problems when booting, because you have no separate %1 partition on your RAID disk. -This will give severe problems with the normal boot setup. +This will cause severe problems with the normal boot setup. If you do not know exactly what you are doing, use a normal partition for your files below %1. @@ -440,8 +440,8 @@ { // popup text string message = _(" -You have not assigned a swap partition. There is nothing wrong with that, but -in most cases it is highly recommended to create and assign a swap partition. +You have not assigned a swap partition. In most cases, we highly recommend +to create and assign a swap partition. Swap partitions on your system are listed in the main window with the type \"Linux Swap\". An assigned swap partition has the mount point \"swap\". You can assign more than one swap partition, if desired. @@ -458,7 +458,7 @@ // popup text string message = _(" You chose to install onto an existing partition that will not be -formatted. YaST2 cannot guarantee your installation will succeed, +formatted. YaST cannot guarantee your installation will succeed, particularly in any of the following cases: ") + // continued popup text @@ -468,9 +468,9 @@ - if this partition does not yet contain a file system ") + // continued popup text -_("If in doubt, you might want to go back and mark this partition for +_("If in doubt, better go back and mark this partition for formatting, especially if it is assigned to one of the standard mount points -like /, /boot, /usr, /opt, or /var. +like /, /boot, /usr, /opt or /var. ") + // continued popup text _("If you decide to format the partition, all data on it will be lost. @@ -591,12 +591,12 @@ { // popup text %1 is directory name string message = sformat(_("The selected device is currently mounted on %1. -It is *strongly* recommended to unmount it manually +We *strongly* recommend to unmount it manually before deleting it. Click Cancel unless you know exactly what you are doing. -If you proceed, YaST2 will try unmounting before deleting it. +If you proceed, YaST will try unmounting before deleting it. "), mounts ); @@ -649,9 +649,8 @@ if( !ok ) { // popup text, %1 is a device name - Popup::Message(sformat(_("The device (%1) cannot be removed -Since it is a logical partition and another logical -partition with higher number is in use. + Popup::Message(sformat(_("The device (%1) cannot be removed since it is a logical partition and +another logical partition with a higher number is in use. "), part_name )); return( false ); } @@ -709,8 +708,8 @@ // popup text string message = sformat(_("The selected extended partition contains partitions which are currently mounted: %1 -It is *strongly* recommended to unmount these partitions before you delete the extended partition. -Please choose Cancel unless you know exactly what you are doing. +We *strongly* recommend to unmount these partitions before you delete the extended partition. +Choose Cancel unless you know exactly what you are doing. "), mounted_parts ); if( ! Popup::ContinueCancel(message)) Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_dialogs.ycp Thu Mar 29 17:52:34 2012 @@ -53,7 +53,7 @@ string label = ""; if( format ) // label text - label = _("Don't forget what you enter here!"); + label = _("Do not forget what you enter here!"); if( tmpcrypt ) { if( size(label)>0 ) @@ -81,7 +81,7 @@ // translator comment: %1 is the device name, %2 is a directory // example: "...password for device /dev/hda6 mounted on /var" - string enter = sformat(_("Enter your crypt password for + string enter = sformat(_("Enter your encryption password for device %1 mounted on %2. "),device,mount); @@ -94,7 +94,7 @@ `HBox( `HSpacing(1), // heading text - `Heading(_("Enter your password for the encrypted file system")), + `Heading(_("Enter your Password for the Encrypted File System")), `HSpacing(1) ), `VSpacing(2), @@ -109,7 +109,7 @@ `Password(`id("pw1"), // Label: get password for user root // Please use newline if label is longer than 40 characters - _("&Enter a password for your file system:"), ""), + _("&Enter a Password for your File System:"), ""), `HSpacing(15)), `VSpacing(0.5), @@ -117,7 +117,7 @@ `Password(`id("pw2"), // Label: get same password again for verification // Please use newline if label is longer than 40 characters - _("Reenter the password for &verification:"), ""), + _("Reenter the Password for &Verification:"), ""), `HSpacing(15)) ), `HSpacing(4) @@ -157,7 +157,10 @@ if ( pw1 != pw2 ) { // popup text - Popup::Message(_("The first and the second version\nof the password do not match!\nPlease try again.")); + Popup::Message(_("The first and the second version +of the password do not match! +Try again. +")); } else if (pw1 == "") { @@ -211,7 +214,7 @@ posdot = search( query, "," ); if( posdot!=nil ) { - Popup::Error(_("No floating point number!")); + Popup::Error(_("No floating point number.")); ret = `error; } else @@ -409,11 +412,12 @@ if( new["enc_type"]:`none==`none && new["type"]:`unknown!=`tmpfs ) { // help text, richtext format - helptext = helptext + _("Mount in /etc/fstab By: + helptext = helptext + _("Mount in /etc/fstab by: Normally, a file system to mount is identified in /etc/fstab -by the device name. This identification can be changed so the file system to mount -is found by searching for a UUID or a volume label. Not all file systems can be -mounted by UUID or a volume label. If an option is disabled, it is not possible. +by the device name. This identification can be changed so the file system +to mount is found by searching for a UUID or a volume label. Not all file +systems can be mounted by UUID or a volume label. If an option is disabled, +this is not possible. "); // help text, richtext format @@ -434,10 +438,10 @@ `VBox( `Left( `RadioButton( `id(`device), // label text - _("&Device name") )), + _("&Device Name") )), `Left( `RadioButton( `id(`label), // label text - _("Volume &label") )), + _("Volume &Label") )), `Left( `RadioButton( `id(`uuid), // label text "U&UID" )) @@ -556,7 +560,7 @@ `VBox( `HSpacing(50), // heading text - `Left(`Heading(_("Fstab options:"))), + `Left(`Heading(_("Fstab Options:"))), `VStretch(), `VSpacing(1), `HBox(`HStretch(), @@ -665,7 +669,7 @@ // popup text %1 is a number Popup::Error( sformat(_(" Maximum volume label length for the selected file system -is %1. Your volume label was truncated to this size. +is %1. Your volume label has been truncated to this size. "), max_len )); } if( search(new["label"]:"","/")!=nil ) @@ -837,7 +841,7 @@ return `VBox( `ComboBox(`id(`fs), `opt(`hstretch, `notify), // label text - _("File &system"), filesystems), + _("File &System"), filesystems), `PushButton(`id(`fs_options), `opt(`hstretch), // button text _("O&ptions...")) @@ -855,7 +859,7 @@ return `VBox( `Left(`CheckBox(`id(`crypt_fs), `opt(`notify), // button text - _("&Encrypt device"), cr))); + _("&Encrypt Device"), cr))); } @@ -1020,7 +1024,7 @@ your Linux installation might be damaged. Unmount the partition if possible. If you are unsure, -it is recommended to abort. Do not proceed unless you know +we recommend to abort. Do not proceed unless you know exactly what you are doing. Continue? @@ -1041,13 +1045,15 @@ if( !lvm ) // Popup text txt = _(" -The file system on the partition cannot be shrunk by YaST2. -Only fat, ext2, ext3 and reiser allow shrinking of a file system."); +YaST cannot shrink the file system on the partition. +Only FAT, ext2, ext3 and reiser allow shrinking of a file system. +"); else // Popup text txt = _(" -The file system on the logical volume cannot be shrunk by YaST2. -Only fat, ext2, ext3 and reiser allow shrinking of a file system."); +YaST cannot shrink the file system on the logical volume. +Only FAT, ext2, ext3 and reiser allow shrinking of a file system. +"); if( ask ) { txt = txt + "\n"; @@ -1079,13 +1085,15 @@ if( !lvm ) // Popup text txt = _(" -The file system on the selected partition cannot be extended by YaST2. -Only fat, ext2, ext3, xfs, and reiser allow extending a file system."); +YaST cannot extend the file system on the selected partition. +Only FAT, ext2, ext3, XFS and reiser allow extending a file system. +"); else // Popup text txt = _(" -The file system on the selected logical volume cannot be extended by YaST2. -Only fat, ext2, ext3, xfs, and reiser allow extending a file system."); +YaST cannot extend the file system on the selected logical volume. +Only FAT, ext2, ext3, XFS and reiser allow extending a file system. +"); if( ask ) { txt = txt + "\n\n"; @@ -1227,7 +1235,7 @@ // popup text, %1 is replaced by device name string message = sformat(_("The selected device contains partitions that are currently mounted: %1 -It is *strongly* recommended to unmount these partitions before deleting the partition table. +We *strongly* recommended to unmount these partitions before deleting the partition table. Choose Cancel unless you know exactly what you are doing. "), mounted_parts ); @@ -1320,8 +1328,9 @@ ``{ // help text, richtext format string helptext = _(" -Here it is possible to create and remove subvolumes -from an BTRFS filesystem."); +Create and remove subvolumes +from a Btrfs filesystem. +"); list<map> old_subvol = new["subvol"]:[]; @@ -1422,7 +1431,7 @@ { if( changed ) { - if( Popup::YesNo( _("Modifications done so far in Dialog get lost!")) ) + if( Popup::YesNo( _("Modifications done so far in this dialog will be lost.")) ) new["subvol"] = old_subvol; else ret = `again; Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_helptexts.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_helptexts.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_helptexts.ycp Thu Mar 29 17:52:34 2012 @@ -64,8 +64,8 @@ { helptext = helptext + _(" This mount point corresponds to a temporary filesystem like /tmp or /var/tmp. -You may leave the crypt password empty. If you do this, the system will create -a random password at system startup for you. This means, you will lose all +If you leave the encryption password empty, the system will create +a random password at system startup for you. This means, you will lose all data on these filesystems at system shutdown. "); @@ -109,8 +109,9 @@ // help text for cryptofs string helptext = _(" -You will need to enter your crypt fs password. -"); +You will need to enter your encryption password. + +"); // help text, continued helptext = helptext + _(" @@ -127,21 +128,23 @@ define string ia64_gpt_text() { return( _("Warning: With your current setup, your installation -will encounter problems when booting, because the disk you -have your /boot partition on does not contain a GPT disk label. +will encounter problems when booting, because the disk on which +your /boot partition is located does not contain a GPT disk label. It will probably not be possible to boot such a setup. If you need to use this disk for installation, you should destroy -the disk label in the expert partitioner.") ); +the disk label in the expert partitioner. +") ); } define string ia64_gpt_fix_text() { - return( _("Warning: Your system states that is reqires an EFI + return( _("Warning: Your system states that it reqires an EFI boot setup. Since the selected disk does not contain a -GPT disk label we create a GPT label on this disk. +GPT disk label YaST will create a GPT label on this disk. -You need to mark all partitions on this disk for removal.") ); +You need to mark all partitions on this disk for removal. +") ); } } Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_lib.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/custom_part_lib.ycp Thu Mar 29 17:52:34 2012 @@ -83,10 +83,10 @@ { // error popup text ret = Popup::YesNo( -_("You have selected not to mount automatically at start-up a file system +_("You have selected to not automatically mount at start-up a file system that may contain files that the system needs to work properly. -This might lead to trouble. +This may cause problems. Really do this? ")); @@ -149,8 +149,8 @@ { // error popup text ret = Popup::YesNo( -_("You have set the option to be mountable by users for a file system -that may contain files that need to be executable. +_("You have set a file system as mountable by users. The file system +may contain files that need to be executable. This usually causes problems. @@ -447,8 +447,8 @@ This file system is not supported in %1;. It is completely untested and might not be well-integrated -in the system. Do not file bugs against the file system -itself if it does not work properly or at all. +in the system. Do not report bugs against this file system +if it does not work properly or at all. Really use this file system? "), Product::name ); Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-all.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-all.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-all.ycp Thu Mar 29 17:52:34 2012 @@ -99,9 +99,10 @@ if (!display_info["TextMode"]:false) { // helptext - helptext = helptext + _("By double clicking on a table entry -you can navigate to the view with detailed information about the -device."); + helptext = helptext + _("By double clicking a table entry, +you navigate to the view with detailed information about the +device. +"); } else { @@ -186,12 +187,14 @@ if ((ProductFeatures::GetBooleanFeature("partitioning", "use_separate_multipath_module") == true) || (Mode::normal() && WFM::ClientExists("multipath"))) // popup text - CallConfig(_("Calling Multipath configuration cancels all current changes. -Really call Multipath configuration?"), ["yast2-multipath"], "multipath"); + CallConfig(_("Calling multipath configuration cancels all current changes. +Really call multipath configuration? +"), ["yast2-multipath"], "multipath"); else // popup text - CallConfig(_("Calling Multipath configuration cancels all current changes. -Really call Multipath configuration?"), nil, "multipath-simple"); + CallConfig(_("Calling multipath configuration cancels all current changes. +Really call multipath configuration? +"), nil, "multipath-simple"); break; case `cryptpwd: Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs-dialogs.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs-dialogs.ycp Thu Mar 29 17:52:34 2012 @@ -121,7 +121,7 @@ string MiniWorkflowStepResizeVolumeHelptext() { // helptext - string helptext = _("Change the devices that are used by the BTRFS volume."); + string helptext = _("Change the devices that are used by the Btrfs volume."); return helptext; } Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs-lib.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs-lib.ycp Thu Mar 29 17:52:34 2012 @@ -15,7 +15,7 @@ if (device == nil) { // error popup - Popup::Error(_("No BTRFS device selected.")); + Popup::Error(_("No Btrfs device selected.")); return; } @@ -47,7 +47,7 @@ if (device == nil) { // error popup - Popup::Error(_("No BTRFS device selected.")); + Popup::Error(_("No Btrfs device selected.")); return; } @@ -100,7 +100,7 @@ if (device == nil) { // error popup - Popup::Error(_("No BTRFS device selected.")); + Popup::Error(_("No Btrfs device selected.")); return; } Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-btrfs.ycp Thu Mar 29 17:52:34 2012 @@ -78,7 +78,7 @@ `VBox( `HStretch(), // heading - `IconAndHeading(_("Btrfs Volumes (BTRFS)"), StorageIcons::dm_icon ), + `IconAndHeading(_("Btrfs Volumes"), StorageIcons::dm_icon ), `Table(`id(`table), `opt(`keepSorting, `notify, `notifyContextMenu), table_header, table_contents), ArrangeButtons([ // push button text @@ -90,7 +90,7 @@ )); // helptext - string helptext = _("This view shows all BTRFS volumes."); + string helptext = _("This view shows all Btrfs volumes."); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } @@ -135,7 +135,8 @@ // helptext string helptext = _("This view shows detailed information about the -selected BTRFS volume."); +selected Btrfs volume. +"); Wizard::RestoreHelp(helptext + StorageFields::OverviewHelptext(fields)); } @@ -191,7 +192,8 @@ // helptext string helptext = _("This view shows all devices used by the -selected BTRFS volume."); +selected Btrfs volume. +"); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-dialogs.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-dialogs.ycp Thu Mar 29 17:52:34 2012 @@ -21,8 +21,9 @@ // helptext helptext = helptext + _("If you want to encrypt all data on the -volume select Encrypt device. Changing the encryption on an existing -volume will delete all data on it."); +volume, select Encrypt Device. Changing the encryption on an existing +volume will delete all data on it. +"); // helptext helptext = helptext + _("Then, choose whether the partition should @@ -482,16 +483,16 @@ if (data["used_fs"]:`unknown == `swap) // helptext helptext = helptext + _(" -The file system used for this volume is swap. You may leave the crypt password -empty but then the swap device cannot be used for hibernating (suspend to -disk). +The file system used for this volume is swap. You can leave the encryption +password empty, but then the swap device cannot be used for hibernating +(suspend to disk). "); else // helptext helptext = helptext + _(" This mount point corresponds to a temporary filesystem like /tmp or /var/tmp. -You may leave the crypt password empty. If you do this, the system will create +If you leave the encryption password empty, the system will create a random password at system startup for you. This means, you will lose all data on these filesystems at system shutdown. @@ -536,9 +537,9 @@ if( two_pw ) { - label = _("All data previously present on the volume will be lost!"); + label = _("All data stored on the volume will be lost!"); label = label + "\n"; - label = label + _("Don't forget what you enter here!"); + label = label + _("Do not forget what you enter here!"); label = label + "\n"; } if (empty_pw_allowed) @@ -549,7 +550,7 @@ ad = `Password( `id(`pw2), `opt(`hstretch), // Label: get same password again for verification // Please use newline if label is longer than 40 characters - _("Reenter the password for &verification:"), ""); + _("Reenter the Password for &Verification:"), ""); term contents = `HVSquash(`FrameWithMarginBox(_("Password"), @@ -557,7 +558,7 @@ `Password(`id(`pw1), `opt(`hstretch), // Label: get password for user root // Please use newline if label is longer than 40 characters - _("&Enter a password for your file system:"), ""), + _("&Enter a Password for your File System:"), ""), ad, `VSpacing(0.5), `Left(`Label(label)) @@ -665,7 +666,9 @@ { y2error("Failed to retrieve FreeSpace %1, filesystem %2", device, data["used_fs"]:`none); //FIXME: Really? - Popup::Error(sformat(_("Partition %1 cannot be resized\nbecause the filesystem seems to be inconsistent"), device)); + Popup::Error(sformat(_("Partition %1 cannot be resized +because the filesystem seems to be inconsistent. +"), device)); return false; } Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-dm.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-dm.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-dm.ycp Thu Mar 29 17:52:34 2012 @@ -55,9 +55,10 @@ ); // helptext - string helptext = _("This view shows all Device Mapper devices -except for those already included in some other view. Thus Multipath Disks, -BIOS RAIDs and LVM logical volumes are not shown here."); + string helptext = _("This view shows all Device Mapper devices except for those already +included in some other view. Therefore multipath disks, +BIOS RAIDs and LVM logical volumes are not shown here. +"); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd-lib.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd-lib.ycp Thu Mar 29 17:52:34 2012 @@ -434,9 +434,10 @@ string helptext = _("Select one or more (if available) hard disks that will have the same partition layout as this disk. -Disks marked with '*' sign contain one or +Disks marked with the sign '*' contain one or more partitions. After cloning, these -partitions will be deleted."); +partitions will be deleted. +"); list <string> AvailableTargetDisks() { @@ -483,9 +484,10 @@ } if (isempty(myparts)) { - Popup::Error(_("There are no partitions on this disk (a clonable -disk must have at least one partition). -Create some partitions before cloning the disk.")); + Popup::Error(_("There are no partitions on this disk, but a clonable +disk must have at least one partition. +Create partitions before cloning the disk. +")); return; } @@ -530,7 +532,7 @@ list <string> selected_disks = (list <string>) UI::QueryWidget(`id(`tdisk), `SelectedItems); if (isempty(selected_disks)) { - Popup::Error(_("Select some target disk for creating a clone")); + Popup::Error(_("Select a target disk for creating a clone")); UI::SetFocus(`id(`tdisk)); ret = nil; continue; Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd.ycp Thu Mar 29 17:52:34 2012 @@ -171,7 +171,8 @@ // helptext string helptext = _("This view shows all hard disks including -iSCSI disks, BIOS RAIDs and Multipath disks and their partitions."); +iSCSI disks, BIOS RAIDs and multipath disks and their partitions. +"); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } @@ -307,7 +308,7 @@ expert_cmds = add(expert_cmds, `item(`id(`clone_disk), // menu entry text - _("Clone This Disk"))); + _("Clone this Disk"))); if (String::StartsWith(device, "/dev/dasd")) { @@ -336,8 +337,9 @@ // helptext string helptext = _("This view shows all partitions of the selected -hard disk. If the hard disk is used by e.g. BIOS RAID or multipath no -partitions are shown here."); +hard disk. If the hard disk is used by e.g. BIOS RAID or multipath, no +partitions are shown here. +"); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } @@ -403,7 +405,8 @@ // helptext string helptext = _("This view shows all devices used by the selected hard disk. The view is only available for BIOS RAIDs, partitioned -software RAIDs and Multipath Disks."); +software RAIDs and multipath disks. +"); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-import.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-import.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-import.ycp Thu Mar 29 17:52:34 2012 @@ -219,9 +219,10 @@ string FstabAddDialogHelptext() { // help text, richtext format - string helptext = _("YaST2 has scanned your hard disks and found -one or several existing Linux systems with mount points. The old mount points -are shown in the table."); + string helptext = _("YaST has scanned your hard disks and found one or several existing +Linux systems with mount points. The old mount points are shown in +the table. +"); // help text, richtext format helptext = helptext + _("You can choose whether the existing system @@ -270,7 +271,7 @@ `opt(`decorated), `VBox( `VSpacing(0.45), // dialog heading - `Left(`Heading(_("Import Mount Points from existing System:"))), + `Left(`Heading(_("Import Mount Points from Existing System:"))), `MarginBox(1, 0.5, `VBox( `Left(`ReplacePoint(`id(`device), `Empty())), @@ -279,7 +280,7 @@ navigate_buttons, `VSpacing(0.45), // checkbox label - `Left(`CheckBox(`id(`format_sys), _("Format system volumes"), true)) + `Left(`CheckBox(`id(`format_sys), _("Format System Volumes"), true)) ) ), `ButtonBox( @@ -390,7 +391,7 @@ } else { - Popup::Error(_("Wrong Password provided.")); + Popup::Error(_("Wrong Password Provided.")); } } else if( size(pwd)==0 ) Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-lib.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-lib.ycp Thu Mar 29 17:52:34 2012 @@ -85,9 +85,10 @@ list<string> volumes = Storage::GetAffectedDevices( device ); return ( ConfirmRecursiveDelete( device, volumes, _("Confirm Deleting Partition Used by LVM"), - sformat(_("The selected partition is used by volume group \"%1\" -To keep system in consistent state, the following volume group -and its logical volumes will be deleted:"), used_by_device), + sformat(_("The selected partition is used by volume group \"%1\". +To keep the system in a consistent state, the following volume group +and its logical volumes will be deleted: +"), used_by_device), sformat( _("Delete partition \"%1\" and volume group \"%2\" now?"), device, used_by_device) )); break; @@ -97,9 +98,10 @@ list<string> volumes = Storage::GetAffectedDevices( device ); return ( ConfirmRecursiveDelete( device, volumes, _("Confirm Deleting Partition Used by RAID"), - sformat(_("The selected partition belongs to RAID \"%1\" -To keep system in consistent state, the following -RAID device will be deleted:"), used_by_device), + sformat(_("The selected partition belongs to RAID \"%1\". +To keep the system in a consistent state, the following +RAID device will be deleted: +"), used_by_device), sformat( _("Delete partition \"%1\" and RAID \"%2\" now?"), device, used_by_device) )); Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-loop-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-loop-dialogs.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-loop-dialogs.ycp Thu Mar 29 17:52:34 2012 @@ -29,16 +29,16 @@ // helptext helptext = helptext + _(" -Size: This is the size of the loop file. The file system to -create in the encrypted loop device will have this size. +Size: This is the size of the loop file. The file system +created in the encrypted loop device will have this size. "); // helptext helptext = helptext + _(" -NOTE: During installation, there cannot be any consistency -checks about file size and path names because the file system is not -accessible. It will be created at the end of installation. Be -careful about the size and path name you provide. +NOTE: During installation, YaST cannot carry out consistency +checks of file size and path names because the file system is not +accessible. It will be created at the end of the installation. Be +careful when providing the size and path name. "); return helptext; Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-main.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-main.ycp Thu Mar 29 17:52:34 2012 @@ -213,9 +213,9 @@ // tree node label `item(`id(`nfs), `icon(StorageIcons::nfs_icon), _("NFS"), open(`nfs)), // tree node label - `item(`id(`btrfs), `icon(StorageIcons::nfs_icon), _("BTRFS"), open(`btrfs)), + `item(`id(`btrfs), `icon(StorageIcons::nfs_icon), _("Btrfs"), open(`btrfs)), // tree node label - `item(`id(`tmpfs), `icon(StorageIcons::nfs_icon), _("TMPFS"), open(`tmpfs)), + `item(`id(`tmpfs), `icon(StorageIcons::nfs_icon), _("tmpfs"), open(`tmpfs)), // tree node label `item(`id(`unused), `icon(StorageIcons::unused_icon), _("Unused Devices"), open(`unused)) ]) Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-raid.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-raid.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-raid.ycp Thu Mar 29 17:52:34 2012 @@ -105,7 +105,7 @@ ); // helptext - string helptext = _("This view shows all RAIDs except of BIOS RAIDs."); + string helptext = _("This view shows all RAIDs except BIOS RAIDs."); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-settings.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-settings.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-settings.ycp Thu Mar 29 17:52:34 2012 @@ -115,7 +115,7 @@ `Left(`HBox( `MultiSelectionBox(`id(`visible_fields), `opt(`shrinkable, `notify), // multi selection box label - _("Visible Information On Storage Devices"), + _("Visible Information on Storage Devices"), PreselectVisibleFields()), `HStretch() )) @@ -131,20 +131,23 @@ // helptext helptext = helptext + _("Default Mount by gives the mount by method for newly created file systems. Device Name uses the kernel -device name which is not persistent. Device ID and Device Path +device name, which is not persistent. Device ID and Device Path use names generated by udev from hardware information. These should be persistent but unfortunately this is not always true. Finally UUID and -Volume Label use the file systems UUID and label."); +Volume Label use the file systems UUID and label. +"); // helptext helptext = helptext + _("Default File System gives the file -system type for newly created file file systems."); +system type for newly created file systems. +"); // helptext helptext = helptext + _("Alignment of Newly Created Partitions determines how created partitions are aligned. cylinder is the traditional alignment at cylinder boundaries of the disk. optimal aligns the -partitions for best performance according to hints provided by linux kernel -or tries to be compatible with Windows Vista and Win 7."); +partitions for best performance according to hints provided by the Linux +kernel or tries to be compatible with Windows Vista and Win 7. +"); // helptext helptext = helptext + _("Show Storage Devices by controls Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-summary.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-summary.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-summary.ycp Thu Mar 29 17:52:34 2012 @@ -22,7 +22,7 @@ ); // helptext - string helptext = _("This view show the installation summary."); + string helptext = _("This view shows the installation summary."); Wizard::RestoreHelp(helptext); } Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs-dialogs.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs-dialogs.ycp Thu Mar 29 17:52:34 2012 @@ -21,7 +21,7 @@ ]; // dialog title - string title = _("Add Tmpfs Mount"); + string title = _("Add tmpfs Mount"); symbol widget = MiniWorkflow::Run(title, StorageIcons::dm_icon, aliases, sequence, "FormatMount"); Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs-lib.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs-lib.ycp Thu Mar 29 17:52:34 2012 @@ -15,7 +15,7 @@ if (device == nil) { // error popup - Popup::Error(_("No TMPFS device selected.")); + Popup::Error(_("No tmpfs device selected.")); return; } Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-tmpfs.ycp Thu Mar 29 17:52:34 2012 @@ -70,7 +70,7 @@ `VBox( `HStretch(), // heading - `IconAndHeading(_("Tmpfs Volumes (TMPFS)"), StorageIcons::dm_icon ), + `IconAndHeading(_("tmpfs Volumes"), StorageIcons::dm_icon ), `Table(`id(`table), `opt(`keepSorting, `notify, `notifyContextMenu), table_header, table_contents), ArrangeButtons([ // push button text @@ -82,7 +82,7 @@ )); // helptext - string helptext = _("This view shows all TMPFS volumes."); + string helptext = _("This view shows all tmpfs volumes."); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } @@ -127,7 +127,8 @@ // helptext string helptext = _("This view shows detailed information about the -selected TMPFS volume."); +selected tmpfs volume. +"); Wizard::RestoreHelp(helptext + StorageFields::OverviewHelptext(fields)); } @@ -162,7 +163,7 @@ Greasemonkey::Transform( `VBox( // heading - `IconAndHeading(sformat(_("Tmpfs mounted at %1"), device), StorageIcons::lvm_lv_icon), + `IconAndHeading(sformat(_("tmpfs mounted at %1"), device), StorageIcons::lvm_lv_icon), `DumbTab(`id(`tab), [ // push button text `item(`id(`overview), _("&Overview")) Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/lvm_ui_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/lvm_ui_lib.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/lvm_ui_lib.ycp Thu Mar 29 17:52:34 2012 @@ -37,16 +37,13 @@ string help_text = ""; // helptext LVM partitioning. - help_text = _("Here, create the logical -volumes used to store your data. + help_text = _("Create the logical volumes used to store your data. "); // helptext LVM partitioning. - help_text = help_text + _(" -Logical volumes are -usable almost everywhere normal disk partitions can be used. -You can create file systems on logical volumes and use them, for example, as swap -or as raw partitions for databases. + help_text = help_text + _(" Logical volumes can be used almost everywhere where normal disk +partitions can be used. Create file systems on logical volumes and use +them, for example, as swap or as raw partitions for databases. "); // helptext LVM partitioning. @@ -60,7 +57,7 @@ // helptext LVM partitioning. help_text = help_text + _(" The logical volumes need to be large enough -to hold all the files to install now, but you do not necessarily need to +to hold all the files to install, but you do not necessarily need to allocate all your physical storage now. The file systems can be increased later while your system is in use. @@ -89,11 +86,9 @@ "); // helptext LVM partitioning. - help_text = help_text + _(" -Under normal circumstances, there is no need to have more than one volume -group. If you need more than one volume group for special reasons, -create them here. Each volume group must have at least one partition -that belongs to that volume group. + help_text = help_text + _(" Under normal circumstances, there is no need to have more than one +volume group. If you need more anyway, create them here. Each volume +group must have at least one partition. "); // helptext LVM partitioning. @@ -228,7 +223,7 @@ define term get_pv_content( list table_list, list vg_list, string vg_size_str ) ``{ // button text - string lvm_mp_button = _("LVM Multipath detection"); + string lvm_mp_button = _("LVM Multipath Detection"); return( `HBox(`HSpacing(2.5), `VBox( `VSpacing(0.1), @@ -248,11 +243,11 @@ `Top(`PushButton( `id(`vg_remove_vg), `opt(`hstretch), // button text - _("Remove &group"))), + _("Remove &Group"))), `Bottom(`PushButton( `id(`vg_add_vg), `opt(`hstretch), // button text - _("A&dd group")))))) + _("A&dd Group")))))) )), `VSpacing(0.2), `VWeight(50, get_pv_table_content( table_list )) Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/nfs.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/nfs.ycp Thu Mar 29 17:52:34 2012 @@ -38,7 +38,7 @@ // help text richtext format // %1 is replaced by description text for server name string helptext = sformat( _(" -%1: This must be the name of a nfs server. +%1: This must be the name of a NFS server. The server needs to be accessible. "), sv ); @@ -46,7 +46,7 @@ // %1 is replaced by description text for nfs path helptext = helptext + sformat( _(" %1: This is the absolute path exported on the -nfs server. +NFS server. "), sp ); return helptext; Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_disk_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_disk_proposal.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_disk_proposal.ycp Thu Mar 29 17:52:34 2012 @@ -216,8 +216,8 @@ // %1 is replaced by button text help_text = help_text + sformat(_(" To make only small adjustments to the proposed -setup (like e.g. changing filesystem types), choose -%1 and do these modification in the expert +setup (like changing filesystem types), choose +%1 and modify the settings in the expert partitioner dialog. "), deletechars(modify_str,"&")); @@ -232,17 +232,17 @@ // help text continued help_text = help_text + sformat(_(" If the suggestion does not fit your needs, create -your own partition setup starting with the partitions as -currently present on the disks. For this, select +your own partition setup starting with the partitions +currently present on the disks. Select %1. This is also the option to choose for -advanced options like RAID and encryption. +advanced configurations like RAID and encryption. "), deletechars(detailed_str,"&")); // help text continued // %1 is replaced by button text help_text = help_text + _(" -To create an LVM based proposal, choose the corresponding button. +To create an LVM-based proposal, choose the corresponding button. "); Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_resize_dialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_resize_dialog.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_resize_dialog.ycp Thu Mar 29 17:52:34 2012 @@ -203,10 +203,11 @@ // help text (common to both modes), continued helptext = helptext + _(" -The actual resizing will be performed only after you confirm all your -settings in the last installation dialog. Until then, your Windows +The actual resizing will not be performed until after you confirm all your +settings in the last installation dialog. Until then your Windows partition will remain untouched. -"); + +"); // help text (common to both modes), continued helptext = helptext + _(" @@ -263,8 +264,9 @@ helptext = helptext + _(" Drag the slider or enter a numeric value in either -input field to adjust the suggested value. -"); +input field to adjust the suggested values. + +"); // help text (graphical mode), continued helptext = helptext + _(" @@ -318,8 +320,9 @@ // help text (non-graphical mode), continued helptext = helptext + _(" -Windows Used is the size of the used part of your Windows partition. -"); +Windows Used is the size of the space your Windows partition uses. + +"); // help text (non-graphical mode), continued helptext = helptext + _(" Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_resize_ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_resize_ui.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/inst_resize_ui.ycp Thu Mar 29 17:52:34 2012 @@ -475,11 +475,11 @@ // of free space and that he should terminate the installation now. string explanation = sformat( _("An error has occurred. -Insufficient space is available on the Windows partition to allow for +The space available on the Windows partition is not sufficient for the minimum Linux installation. -To install Linux, first boot Windows and uninstall some -applications or delete some data. +To install Linux, boot Windows first and uninstall some +applications or delete data to free space. You need at least %1 MB of free space on the Windows device, including Windows workspace and @@ -583,10 +583,11 @@ // help text (common to both modes), continued helptext = helptext + _(" -The actual resizing will be performed only after you confirm all your -settings in the last installation dialog. Until then, your Windows +The actual resizing will not be performed until after you confirm all your +settings in the last installation dialog. Until then your Windows partition will remain untouched. -"); + +"); // help text (common to both modes), continued helptext = helptext + _(" @@ -643,8 +644,9 @@ helptext = helptext + _(" Drag the slider or enter a numeric value in either -input field to adjust the suggested value. -"); +input field to adjust the suggested values. + +"); // help text (graphical mode), continued helptext = helptext + _(" @@ -698,8 +700,9 @@ // help text (non-graphical mode), continued helptext = helptext + _(" -Windows Used is the size of the used part of your Windows partition. -"); +Windows Used is the size of the space your Windows partition uses. + +"); // help text (non-graphical mode), continued helptext = helptext + _(" Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/FileSystems.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/FileSystems.ycp Thu Mar 29 17:52:34 2012 @@ -191,11 +191,11 @@ list<map<symbol, any> > options = [ $[ // button text - `widget : `Left(`CheckBox(`id("opt_readonly"), _("Mount &read-only"), false)), + `widget : `Left(`CheckBox(`id("opt_readonly"), _("Mount &Read-Only"), false)), `query_key : "opt_readonly", // help text, richtext format `help_text : _("Mount Read-Only: -No writing to the file system is possible. Default is false. +Writing to the file system is not possible. Default is false. "), `type : `boolean, `str_opt : $[ 1 : "ro", "default" : "" ], @@ -203,18 +203,19 @@ ], $[ // button text - `widget : `Left(`CheckBox(`id("opt_noatime"), _("No &access time"), false)), + `widget : `Left(`CheckBox(`id("opt_noatime"), _("No &Access Time"), false)), `query_key : "opt_noatime", // help text, richtext format - `help_text : _("No access time: -Access times are not updated when a file is read. Default is false."), + `help_text : _("No Access Time: +Access times are not updated when a file is read. Default is false. +"), `type : `boolean, `str_opt : $[ 1 : "noatime", "default" : "" ], `str_scan : [[ "noatime", 1 ], ["atime", 0 ]], ], $[ // button text - `widget : `Left(`CheckBox(`id("opt_user"), _("Mountable by &user"), false)), + `widget : `Left(`CheckBox(`id("opt_user"), _("Mountable by &User"), false)), `query_key : "opt_user", // help text, richtext format `help_text : _("Mountable by User: @@ -233,8 +234,7 @@ The file system is not automatically mounted when the system starts. An entry in /etc/fstab is created and the file system is mounted with the appropriate options when the command <tt>mount <mount point></tt> -(<mount point> is the directory to which the file system is mounted) -is given. Default is false. +is entered (<mount point> is the directory to which the file system is mounted). Default is false. "), `type : `boolean, `str_opt : $[ 1 : "noauto", "default" : "" ], @@ -270,7 +270,7 @@ // help text, richtext format `help_text : _("Data Journaling Mode: Specifies the journaling mode for file data. -<tt>journal</tt> -- All data is committed into the journal prior to being +<tt>journal</tt> -- All data is committed to the journal prior to being written into the main file system. Highest performance impact. <tt>ordered</tt> -- All data is forced directly out to the main file system prior to its metadata being committed to the journal. Medium performance impact. @@ -319,7 +319,7 @@ ``{ map<symbol,any> opt = $[ // label text - `widget : `TextEntry(`id("opt_arbitrary"), _("Arbitrary option &value"), ""), + `widget : `TextEntry(`id("opt_arbitrary"), _("Arbitrary Option &Value"), ""), `query_key : "opt_arbitrary", // help text, richtext format `help_text : _("Arbitrary Option Value: @@ -399,29 +399,30 @@ ], $[ // label text - `widget : `ComboBox(`id("opt_fat_size"), `opt(`hstretch), _("FAT &size"), ["auto", + `widget : `ComboBox(`id("opt_fat_size"), `opt(`hstretch), _("FAT &Size"), ["auto", `item(`id("12"), "12 bit"), `item(`id("16"), "16 bit"), `item(`id("32"), "32 bit") ]), `query_key : "opt_fat_size", `option_str : "-F", // help text, richtext format - `help_text : _("FAT size: -Specifies the type of file allocation tables used (12, 16, or 32-bit). If auto is specified, YaST2 will automatically select the value most suitable for the file system size. + `help_text : _("FAT Size: +Specifies the type of file allocation tables used (12, 16, or 32-bit). If auto is specified, YaST will automatically select the value most suitable for the file system size. ") ], $[ // label text - `widget : `TextEntry(`id("opt_root_dir_entries"), `opt(`hstretch), _("Root &dir entries"), "auto"), + `widget : `TextEntry(`id("opt_root_dir_entries"), `opt(`hstretch), _("Root &Dir Entries"), "auto"), `query_key : "opt_root_dir_entries", `option_str : "-r", `between : [ 112, -1], `valid_chars : "0123456789", // popup text - `error_text : _("The minimum size for \"Root dir entries\" is 112. Please try again."), + `error_text : _("The minimum size for \"Root Dir Entries\" is 112. Try again."), // help text, richtext format - `help_text : _("Root dir entries: -Select the number of entries available in the root directory.") + `help_text : _("Root Dir Entries: +Select the number of entries available in the root directory. +") ] ]; @@ -429,22 +430,23 @@ list< map<symbol, any> > reiserfs_options = [ $[ // label text - `widget : `ComboBox(`id("opt_hash"), `opt(`hstretch), _("Hash &function"), ["auto", "r5", "tea" ,"rupasov" ]), + `widget : `ComboBox(`id("opt_hash"), `opt(`hstretch), _("Hash &Function"), ["auto", "r5", "tea" ,"rupasov" ]), `query_key : "opt_hash", `option_str : "--hash", `option_blank : true, // help text, richtext format - `help_text : _("Hash function: -This specifies the name of the hash function to use to sort the file names in directories.") + `help_text : _("Hash Function: +This specifies the name of the hash function to use to sort the file names in directories. +") ], $[ // label text - `widget : `ComboBox(`id("opt_format"), `opt(`hstretch), _("FS &revision"), ["auto", "3.5", "3.6" ]), + `widget : `ComboBox(`id("opt_format"), `opt(`hstretch), _("FS &Revision"), ["auto", "3.5", "3.6" ]), `query_key : "opt_format", `option_str : "--format", `option_blank : true, // help text, richtext format - `help_text : _("FS revision: + `help_text : _("FS Revision: This option defines the reiserfs format revision to use. '3.5' is for backwards compatibility with kernels of the 2.2.x series. '3.6' is more recent, but can only be used with kernel versions greater than or equal to 2.4. ") ] @@ -454,12 +456,12 @@ list< map<symbol, any> > xfs_options = [ $[ // label text - `widget : `ComboBox(`id("opt_blocksize"), `opt(`hstretch), _("Block &size in bytes"), ["auto","512","1024", "2048","4096" /*,"8192", "16384","32768"*/ ]), + `widget : `ComboBox(`id("opt_blocksize"), `opt(`hstretch), _("Block &Size in Bytes"), ["auto","512","1024", "2048","4096" /*,"8192", "16384","32768"*/ ]), `query_key : "opt_blocksize", `option_str : "-bsize=", // help text, richtext format - `help_text : _("Block size: -Specify the size of blocks in bytes. Valid block size values are 512, 1024, 2048, and 4096 bytes per block. If auto is selected, the standard block size of 4096 is used. + `help_text : _("Block Size: +Specify the size of blocks in bytes. Valid block size values are 512, 1024, 2048 and 4096 bytes per block. If auto is selected, the standard block size of 4096 is used. ") ], $[ @@ -473,28 +475,28 @@ ], $[ // label text - `widget : `ComboBox(`id("opt_max_inode_space"), `opt(`hstretch), _("&Percentage of inode space"),["auto", "5", "10", "15", "20","25","30", + `widget : `ComboBox(`id("opt_max_inode_space"), `opt(`hstretch), _("&Percentage of Inode Space"),["auto", "5", "10", "15", "20","25","30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", `item(`id("0"), "100") ]), `query_key : "opt_max_inode_space", `option_str : "-imaxpct=", // help text, richtext format - `help_text : _("Percentage of inode space: -The option \"Percentage of inode space\" specifies the maximum percentage of space in the file system that can be allocated to inodes. + `help_text : _("Percentage of Inode Space: +The option \"Percentage of Inode Space\" specifies the maximum percentage of space in the file system that can be allocated to inodes. ") ], $[ // label text - `widget : `ComboBox(`id("opt_inode_align"), `opt(`hstretch), _("Inode &aligned"),[ "auto", `item(`id("1"), "true"), + `widget : `ComboBox(`id("opt_inode_align"), `opt(`hstretch), _("Inode &Aligned"),[ "auto", `item(`id("1"), "true"), `item( `id("0"), "false") ]), `query_key : "opt_inode_align", `option_str : "-ialign=", // help text, richtext format `help_text : _("Inode Aligned: The option \"Inode Aligned\" is used to specify whether inode allocation is or -is not aligned. The default is that inodes are aligned. Aligned inode access -is normally more efficient than unaligned access. +is not aligned. By default inodes are aligned, which +is usually more efficient than unaligned access. ") ] ]; @@ -519,18 +521,21 @@ */ $[ // label text - `widget : `TextEntry(`id("opt_log_size"), `opt(`hstretch),_("&Log size in megabytes"), "auto"), + `widget : `TextEntry(`id("opt_log_size"), `opt(`hstretch),_("&Log Size in Megabytes"), "auto"), `query_key : "opt_log_size", `option_str : "-s", // no way to find out the max log size ???? `between : [ 0 , -1 ], // -> -1 = infinite `valid_chars : "0123456789", // popup text - `error_text : _("The \"Log size\" value is incorrect.\nPlease enter a value greater than zero."), + `error_text : _("The \"Log Size\" value is incorrect. +Enter a value greater than zero. +"), // xgettext: no-c-format // help text, richtext format - `help_text : _("Log size -Set the log size (in megabytes). If auto, the default is 40% of the aggregate size.") + `help_text : _("Log Size +Set the log size (in megabytes). If auto, the default is 40% of the aggregate size. +") ], $[ // label text @@ -543,13 +548,15 @@ list< map<symbol, any> > ext2_options = [ $[ // label text - `widget : `TextEntry(`id("opt_raid"), `opt(`hstretch), _("Stride &length in blocks"), "none" ), + `widget : `TextEntry(`id("opt_raid"), `opt(`hstretch), _("Stride &Length in Blocks"), "none" ), `query_key : "opt_raid", `option_str : "-Rstride=", `valid_chars : "0123456789", `between : [ 1, -1], // popup text - `error_text : _("The \"Stride length in blocks\" value is not possible.\nPlease select a value greater than 1."), + `error_text : _("The \"Stride Length in Blocks\" value is invalid. +Select a value greater than 1. +"), // help text, richtext format `help_text : _("Stride Length in Blocks: Set RAID-related options for the file system. Currently, the only supported @@ -559,28 +566,33 @@ ], $[ // label text - `widget : `ComboBox(`id("opt_blocksize"), `opt(`hstretch), _("Block &size in bytes"), ["auto","1024", "2048","4096" /*,"8192", "16384","32768"*/ ]), + `widget : `ComboBox(`id("opt_blocksize"), `opt(`hstretch), _("Block &Size in Bytes"), ["auto","1024", "2048","4096" /*,"8192", "16384","32768"*/ ]), `query_key : "opt_blocksize", `option_str : "-b", // help text, richtext format - `help_text : _("Block size: -Specify the size of blocks in bytes. Valid block size values are 1024, 2048, and 4096 bytes per block. If auto is selected, the block size is determined by the file system size and the expected use of the file system.\n") + `help_text : _("Block Size: +Specify the size of blocks in bytes. Valid block size values are 1024, 2048, and 4096 bytes per block. If auto is selected, the block size is determined by the file system size and the expected use of the file system. +") ], $[ // label text - `widget : `ComboBox(`id("opt_inode_density"), `opt(`hstretch), _("Bytes per &inode"),["auto","1024", "2048","4096","8192", "16384","32768" ]), + `widget : `ComboBox(`id("opt_inode_density"), `opt(`hstretch), _("Bytes per &Inode"),["auto","1024", "2048","4096","8192", "16384","32768" ]), `query_key : "opt_inode_density", `option_str : "-i", // help text, richtext format - `help_text : _("Bytes per inode: -Specify the bytes to inode ratio. YaST2 creates an inode for every <bytes-per-inode> bytes of space on the disk. The larger the bytes-per-inode ratio, the fewer inodes will be created. -Generally, this value should not be smaller than the block size of the file system, since too many inodes will be created in this case. It is not possible to expand the -number of inodes on a file system after its creation, so be sure to enter a reasonable value for this parameter. + `help_text : _("Bytes per Inode: +Specify the bytes to inode ratio. YaST creates an inode for every +<bytes-per-inode> bytes of space on the disk. The larger the +bytes-per-inode ratio, the fewer inodes will be created. Generally, this +value should not be smaller than the block size of the file system, or else +too many inodes will be created. It is not possible to expand the number of +inodes on a file system after its creation. So be sure to enter a reasonable +value for this parameter. ") ], $[ // label text - `widget : `TextEntry(`id("opt_reserved_blocks"), `opt(`hstretch), _("Percentage of blocks &reserved for root"), "auto" ), + `widget : `TextEntry(`id("opt_reserved_blocks"), `opt(`hstretch), _("Percentage of Blocks &Reserved for root"), "auto" ), `query_key : "opt_reserved_blocks", `option_str : "-m", //`default : 5, @@ -588,22 +600,25 @@ `str_length : 6, `valid_chars : "0123456789.", // popup text - `error_text : _("The \"Percentage of blocks reserved for root\" value is incorrect.\nAllowed are float numbers not larger than 99. (e.g. 0.5)"), + `error_text : _("The \"Percentage of Blocks Reserved for root\" value is incorrect. +Allowed are float numbers no larger than 99 (e.g. 0.5). +"), // xgettext: no-c-format // help text, richtext format - `help_text : _("Percentage of blocks reserved for root: Specify the percentage of blocks reserved for the super user. The default is computed so that normally 1 Gig is reserved. Upper limit for reserved default is 5.0, lowest reserved default is 0.1.") + `help_text : _("Percentage of Blocks Reserved for root: Specify the percentage of blocks reserved for the super user. The default is computed so that normally 1 Gig is reserved. Upper limit for reserved default is 5.0, lowest reserved default is 0.1.") ], $[ // checkbox text - `widget : `CheckBox(`id("opt_reg_checks"), `opt(`hstretch), _("Disable regular checks")), + `widget : `CheckBox(`id("opt_reg_checks"), `opt(`hstretch), _("Disable Regular Checks")), `query_key : "opt_reg_checks", `option_str : "-c 0 -i 0", `option_cmd : `tunefs, `type : `boolean, `default : false, // help text, richtext format - `help_text : _("Disable regular checks: -Disable regular file system check at booting.\n") + `help_text : _("Disable Regular Checks: +Disable regular file system check at booting. +") ] ]; Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/Partitions.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/Partitions.ycp Thu Mar 29 17:52:34 2012 @@ -756,20 +756,20 @@ } // popup text %1 is replaced by disk name e.g. /dev/hda text = text + sformat( _(" -The partitioning on your disk %1 is either not readable by -the partitioning tool parted used to change the -partition table or is not supported by this tool. +The partitioning on your disk %1 is either not readable or not +supported by the partitioning tool parted used to change the +partition table. -You may use the partitions on disk %1 as they are or -format them and assign mount points to them, but you -cannot add, edit, resize, or remove partitions from that -disk here.\n"), disk ); +You can use the partitions on disk %1 as they are or +format them and assign mount points, but you cannot add, edit, +resize, or remove partitions from that disk here. +"), disk ); if( expert_partitioner ) { // popup text text = text + _(" -You may initialize the disk partition table to a sane state in the Expert +You can initialize the disk partition table to a sane state in the Expert Partitioner by selecting \"Expert\"->\"Create New Partition Table\", but this will destroy all data on all partitions of this disk. "); Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/Storage.ycp Thu Mar 29 17:52:34 2012 @@ -2547,7 +2547,7 @@ Popup::Error( sformat(_("Could not set encryption. System error code is %1. -The crypt password provided could be incorrect. +The encryption password provided could be incorrect. "), ret )); LibStorage::StorageInterface::forgetCryptPassword( sint, device ); } @@ -3544,7 +3544,7 @@ Popup::Error( sformat(_("Could not set encryption. System error code is %1. -The crypt password provided could be incorrect. +The encryption password provided could be incorrect. "), i )); y2milestone( "CheckCryptOk dev:%1 pwlen:%2 ret:%3", dev, size(fs_passwd), i==0 ); @@ -3618,7 +3618,7 @@ `Password(`id(`pw2), `opt(`hstretch), // Label: get same password again for verification // Please use newline if label is longer than 40 characters - _("Reenter the password for &verification:"), ""), + _("Reenter the Password for &Verification:"), ""), `HSpacing(13)) ); UI::OpenDialog( @@ -3643,7 +3643,7 @@ `Password(`id(`pw1), `opt(`hstretch), // Label: get password for encrypted volume // Please use newline if label is longer than 40 characters - _("&Enter encryption password:"), ""), + _("&Enter Encryption Password:"), ""), `HSpacing(13)), ad), `HSpacing(4) @@ -3710,8 +3710,7 @@ term ad = `Empty(); if( size(dev2)>0 ) ad = `VBox( - `Left( `Label( _( -"The following encrypted volumes are already available."))), + `Left( `Label( _("The following encrypted volumes are already available."))), `Left(`RichText(HTML::List(sort(dev2)))), `VSpacing(0.2) ); @@ -3728,8 +3727,7 @@ `VBox ( `Left (`Heading (_("Encrypted Volume Activation"))), `VSpacing(0.2), - `Left( `Label( _( -"The following volumes contain an encryption signature but the + `Left( `Label( _("The following volumes contain an encryption signature but the passwords are not yet known. The passwords need to be known if the volumes are needed either during an update or if they contain an encrypted LVM physical volume."))), @@ -3737,7 +3735,7 @@ `Left(`RichText(HTML::List(sort(dev1)))), `VSpacing(0.2), ad, - `Left(`Label( _("Do you want to provide crypt passwords?"))), + `Left(`Label( _("Do you want to provide encryption passwords?"))), button_box ) ) @@ -3780,8 +3778,7 @@ boolean ret = true; boolean rescan_done = false; // text in help field - string helptext = _( -"Enter encryption password for any of the + string helptext = _("Enter encryption password for any of the devices in the locked devices list. Password will be tried for all devices."); // header text @@ -3796,10 +3793,10 @@ if( ret ) { // label text, multiple device names follow - string label = _("Please provide password for any of the following devices:"); + string label = _("Provide password for any of the following devices:"); if( size(crvol["inactive"]:[])==1 ) // label text, one device name follows - label = _("Please provide password for the following device:"); + label = _("Provide password for the following device:"); foreach( string s, crvol["inactive"]:[], ``{ label = label + sformat("\n%1", s ); @@ -4553,7 +4550,7 @@ { txt = sformat( _(" Device %1 cannot be removed because this would indirectly change -device %2 which contains activated swap that is needed to run +device %2, which contains activated swap that is needed to run the installation. "), p["device"]:"", pl[pos,"device"]:"" ); } @@ -4561,7 +4558,7 @@ { txt = sformat( _(" Device %1 cannot be removed because this would indirectly change -device %2 which contains data needed to perform the installation. +device %2, which contains data needed to perform the installation. "), p["device"]:"", pl[pos,"device"]:"" ); } Popup::Message( txt ); @@ -4576,7 +4573,8 @@ { txt = sformat(_(" Partition %1 cannot be removed since other partitions on the -disk %2 are in used."), p["device"]:"", disk["device"]:""); +disk %2 are used. +"), p["device"]:"", disk["device"]:""); Popup::Message(txt); ret = false; }; @@ -5189,7 +5187,7 @@ if (!PackagesProposal::SetResolvables(proposal_ID, `package, pkgs)) { y2error("PackagesProposal::SetResolvables() for %1 failed", pkgs); - Report::Error(sformat(_("Add the following resolvables failed: %1"), pkgs)); + Report::Error(sformat(_("Adding the following resolvables failed: %1"), pkgs)); } if( Stage::initial() ) Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageClients.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageClients.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageClients.ycp Thu Mar 29 17:52:34 2012 @@ -89,7 +89,7 @@ y2milestone("CommitErrorPopup error%1 last_action%2 extended_message:%3", error, last_action, extended_message); - string text = _("Failure occurred during following action:") + "\n" + last_action + "\n\n"; + string text = _("Failure occurred during the following action:") + "\n" + last_action + "\n\n"; string tmp = LibStorage::StorageInterface::getErrorString(sint, error); if (!isempty(tmp)) @@ -123,7 +123,7 @@ `Password(`id(`password), // Label: get password for device // Please use newline if label is longer than 40 characters - sformat(_("&Enter password for device %1:"), device), password), + sformat(_("&Enter Password for Device %1:"), device), password), `ButtonBox( `PushButton(`id(`ok), `opt(`default), Label::OKButton()), `PushButton(`id(`cancel), Label::CancelButton()) Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageFields.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageFields.ycp Thu Mar 29 17:52:34 2012 @@ -128,12 +128,12 @@ case `mount_by: // Column header - header = add(header, _("Mount By")); + header = add(header, _("Mount by")); break; case `used_by: // Column header - header = add(header, _("Used By")); + header = add(header, _("Used by")); break; case `start_cyl: @@ -148,7 +148,7 @@ case `fs_id: // Column header - header = add(header, `Right(_("FS Id"))); + header = add(header, `Right(_("FS ID"))); break; case `uuid: @@ -320,7 +320,7 @@ case `fs_id: // helptext for table column and overview entry - ret = ret + _("FS Id shows the file system id."); + ret = ret + _("FS ID shows the file system id."); break; case `fs_type: @@ -347,15 +347,17 @@ case `mount_by: // helptext for table column and overview entry - ret = ret + _("Mount By indicates how the file system -is mounted: (Kernel) by Kernel Name, (Label) by File System Label, (UUID) by -File System UUID, (ID) by Device ID, and (Path) by Device Path."); + ret = ret + _("Mount by indicates how the file system +is mounted: (Kernel) by kernel name, (Label) by file system label, (UUID) by +file system UUID, (ID) by device ID, and (Path) by device path. +"); if (Mode::normal()) // helptext for table column and overview entry ret = ret + " " + _("A question mark (?) indicates that the file system is not listed in <tt>/etc/fstab</tt>. It is either mounted -manually or by some automount system. When changing setting of this volume -YaST will not update <tt>/etc/fstab</tt>."); +manually or by some automount system. When changing settings for this volume +YaST will not update <tt>/etc/fstab</tt>. +"); break; case `mount_point: @@ -412,7 +414,8 @@ case `stripes: // helptext for table column and overview entry ret = ret + _("Stripes shows the stripe number for LVM -logical volumes and, if greater than one, in parenthesise the stripe size."); +logical volumes and, if greater than one, the stripe size in parenthesis. +"); break; case `type: @@ -423,8 +426,9 @@ case `udev_id: // helptext for table column and overview entry - ret = ret + _("Device Id shows the persistent device -ids. This field can be empty."); + ret = ret + _("Device ID shows the persistent device +IDs. This field can be empty. +"); break; case `udev_path: @@ -436,8 +440,8 @@ case `used_by: // helptext for table column and overview entry ret = ret + _("Used By shows if a device is used by -e.g. RAID or LVM. If you do not use such things, it is perfectly normal for -this column to be empty."); +e.g. RAID or LVM. If not, this column is empty. +"); break; case `uuid: @@ -634,7 +638,7 @@ return value; else // row label, %1 is replace by mount by method - return sformat(_("Mount By: %1"), value); + return sformat(_("Mount by: %1"), value); } case `used_by: @@ -646,7 +650,7 @@ integer n = size(data["used_by"]:[]); return mergestring(maplist(integer i, Integer::Range(n == 0 ? 1 : n), { // row label, %1 is replaced by number, %2 is replace by device name e.g. /dev/system - return sformat(_("Used By %1: %2"), i+1, String::EscapeTags(UsedByString(data["used_by", i]:$[]))); + return sformat(_("Used by %1: %2"), i+1, String::EscapeTags(UsedByString(data["used_by", i]:$[]))); }), HTML::Newline()); } } @@ -916,7 +920,7 @@ return value; else // row label, %1 is replace by file system id - return sformat(_("FS Id: %1"), value); + return sformat(_("FS ID: %1"), value); } case `file_path: Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageProposal.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageProposal.ycp Thu Mar 29 17:52:34 2012 @@ -3059,7 +3059,7 @@ Storage::CanDelete( p, target[s]:$[], false)) { if( usable_for_win_resize(p,false) ) - p["dtxt"] = _("Resize impossible due to inconsistent fs. Try checking fs under Windows."); + p["dtxt"] = _("Resize impossible due to inconsistent file system. Try checking file system under Windows."); p["delete"] = true; } return( p ); @@ -3824,7 +3824,7 @@ Storage::CanDelete( p, target[s]:$[], false)) { if( usable_for_win_resize(p,false) ) - p["dtxt"] = _("Resize impossible due to inconsistent fs. Try checking fs under Windows."); + p["dtxt"] = _("Resize impossible due to inconsistent file system. Try checking file system under Windows."); p["delete"] = true; } return( p ); @@ -4140,7 +4140,7 @@ vb = add( vb, `Left(`HBox(`HSpacing(3), `CheckBox(`id(`btrfs), `opt(`notify), // Label text - _("Use &Btrfs as default Filesystem"), + _("Use &Btrfs as Default File System"), GetProposalBtrfs() )))); term frame = `VBox( `VSpacing(3*space), `HVCenter( `VBox( `Left(`Label( `opt(`boldFont), _("Proposal settings"))), `VSpacing(0.3), `HVCenter(vb)) )); @@ -4177,7 +4177,7 @@ // Label: get same password again for verification // Please use newline if label is longer than 40 characters _("Reenter the password for verification:"), "")), - `Label(_("Don't forget what you enter here!")), + `Label(_("Do not forget what you enter here!")), `ButtonBox( `PushButton(`id(`ok), `opt(`default), Label::OKButton()), `PushButton(`id(`cancel), Label::CancelButton()) Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageSettings.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageSettings.ycp (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/modules/StorageSettings.ycp Thu Mar 29 17:52:34 2012 @@ -148,7 +148,7 @@ { list<string> tmp = [ _("Default Mount-by:") + " " + substring(tostring(Storage::GetDefaultMountBy()), 1), - _("Default Filesystem:") + " " + substring(tostring(Partitions::DefaultFs()), 1), + _("Default File System:") + " " + substring(tostring(Partitions::DefaultFs()), 1), _("Show Storage Devices by:") + " " + substring(tostring(display_name), 1), _("Partition Alignment:") + " " + substring(tostring(Storage::GetPartitionAlignment()), 7), _("Visible Information on Storage Devices:") + " " + HTML::List(visible_fields) -- 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] r67827 - in /trunk/tune: hwinfo/src/routines.ycp hwinfo/src/system_settings_dialogs.ycp package/yast2-tune.changes
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 16:43:51 2012 New Revision: 67827 URL: http://svn.opensuse.org/viewcvs/yast?rev=67827&view=rev Log: - merged proofread texts Modified: trunk/tune/hwinfo/src/routines.ycp trunk/tune/hwinfo/src/system_settings_dialogs.ycp trunk/tune/package/yast2-tune.changes Modified: trunk/tune/hwinfo/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/hwinfo/src/routines.ycp?rev… ============================================================================== --- trunk/tune/hwinfo/src/routines.ycp (original) +++ trunk/tune/hwinfo/src/routines.ycp Thu Mar 29 16:43:51 2012 @@ -261,7 +261,7 @@ // tree node string - CPU information "mhz" : [ _("Frequency"), "yast-hardware"], // tree node string - CPU information - "fdiv_bug" : [ _( "Floating point division bug"), "yast-hardware"], + "fdiv_bug" : [ _("Floating point division bug"), "yast-hardware"], // tree node string - CPU information "flags" : [ _("Flags"), "yast-hardware"], // tree node string - CPU information Modified: trunk/tune/hwinfo/src/system_settings_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/hwinfo/src/system_settings_… ============================================================================== --- trunk/tune/hwinfo/src/system_settings_dialogs.ycp (original) +++ trunk/tune/hwinfo/src/system_settings_dialogs.ycp Thu Mar 29 16:43:51 2012 @@ -100,9 +100,9 @@ "store" : StoreElevatorSettings, // help text for the scheduler widget, do not translate 'cfg' "help" : _("<big>Global I/O Scheduler</big> -It is possible to select the algorithm which orders and sends commands to disk +Select the algorithm which orders and sends commands to disk devices. This is a global option, it will be used for all disk devices in the -system. If the option is not configured the default (usually 'cfq') scheduler +system. If the option is not configured, the default scheduler (usually 'cfq') will be used. See the documentation in the /usr/src/linux/Documentation/block directory (package kernel-source) for more information. "), Modified: trunk/tune/package/yast2-tune.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/package/yast2-tune.changes?… ============================================================================== --- trunk/tune/package/yast2-tune.changes (original) +++ trunk/tune/package/yast2-tune.changes Thu Mar 29 16:43:51 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 16:43:33 CEST 2012 - jsuchome(a)suse.cz + +- merged proofread texts + +------------------------------------------------------------------- Tue Oct 4 07:57:10 UTC 2011 - lslezak(a)suse.cz - removed obsoleted idedma module (doesn't work with new libata -- 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] r67826 - /trunk/s390/src/modules/Xpram.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 16:28:35 2012 New Revision: 67826 URL: http://svn.opensuse.org/viewcvs/yast?rev=67826&view=rev Log: - merged proofread texts Modified: trunk/s390/src/modules/Xpram.ycp Modified: trunk/s390/src/modules/Xpram.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/Xpram.ycp?rev=6… ============================================================================== --- trunk/s390/src/modules/Xpram.ycp (original) +++ trunk/s390/src/modules/Xpram.ycp Thu Mar 29 16:28:35 2012 @@ -127,7 +127,7 @@ y2milestone("Service::Stop (xpram) returns %1", bret); if (! bret) { - Report::Error (_("Error stopping xpram. Please try \"rcxpram stop\" manually.")); + Report::Error (_("Error stopping xpram. Try \"rcxpram stop\" manually.")); } else { @@ -151,7 +151,7 @@ bret = Service::Start ("xpram"); if (! bret) { - Report::Error (_("Error starting xpram. Please try \"rcxpram start\" manually.")); + Report::Error (_("Error starting xpram. Try \"rcxpram start\" manually.")); } y2milestone("Service::Start (xpram) returns %1", bret); } -- 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] r67825 - in /trunk/wagon: package/yast2-wagon.changes src/modules/Wagon.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 16:27:41 2012 New Revision: 67825 URL: http://svn.opensuse.org/viewcvs/yast?rev=67825&view=rev Log: - merged proofread texts Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/modules/Wagon.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Thu Mar 29 16:27:41 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 16:27:31 CEST 2012 - jsuchome(a)suse.cz + +- merged proofread texts + +------------------------------------------------------------------- Wed Mar 7 08:14:29 UTC 2012 - lslezak(a)suse.cz - ensure that the migration products are removed (bnc#750746) Modified: trunk/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/modules/Wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/modules/Wagon.ycp (original) +++ trunk/wagon/src/modules/Wagon.ycp Thu Mar 29 16:27:41 2012 @@ -668,8 +668,8 @@ // Product is going to be upgraded (removed + installed new version) if (contains (products_to_be_upgraded, name) || sles_for_vmware_upgrade) { map <string,any> old_product = find(map<string,any> p, products, {return p["name"]:"" == (sles_for_vmware_upgrade ? "SUSE_SLES" : name) && p["status"]:`unknown == `removed;}); - string old_product_name = old_product["name"]:_("No name defined"); - string old_display_name = old_product["display_name"]:old_product["short_name"]:old_product["name"]:_("No name defined"); + string old_product_name = old_product["name"]:_("No name defined."); + string old_display_name = old_product["display_name"]:old_product["short_name"]:old_product["name"]:_("No name defined."); y2milestone ("Detected product upgrade from: '%1' to: '%2'", old_display_name, display_name); y2milestone ("Product will be upgraded to: %1 (this is the new one)", product); -- 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] r67824 - /tags/stable-2_22_4/users/
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 16:26:25 2012 New Revision: 67824 URL: http://svn.opensuse.org/viewcvs/yast?rev=67824&view=rev Log: Created tag stable-2_22_4 for users Added: tags/stable-2_22_4/users/ - copied from r67823, trunk/users/ -- 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] r67823 - in /trunk/users: VERSION package/yast2-users.changes src/Users.pm src/UsersUI.ycp src/groups.ycp src/helps.ycp src/inst_user_first.ycp src/users.ycp src/users_plugin_quota.ycp src/widgets.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 16:25:52 2012 New Revision: 67823 URL: http://svn.opensuse.org/viewcvs/yast?rev=67823&view=rev Log: - merged proofread texts Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/Users.pm trunk/users/src/UsersUI.ycp trunk/users/src/groups.ycp trunk/users/src/helps.ycp trunk/users/src/inst_user_first.ycp trunk/users/src/users.ycp trunk/users/src/users_plugin_quota.ycp trunk/users/src/widgets.ycp Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=67823&r1=67822… ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Thu Mar 29 16:25:52 2012 @@ -1 +1 @@ -2.22.3 +2.22.4 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.change… ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Thu Mar 29 16:25:52 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 29 16:25:07 CEST 2012 - jsuchome(a)suse.cz + +- merged proofread texts +- 2.22.4 + +------------------------------------------------------------------- Thu Mar 22 11:18:07 CET 2012 - jsuchome(a)suse.cz - User specific LDAP configuration moved here from ldap-client, Modified: trunk/users/src/Users.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/Users.pm?rev=67823&r1=… ============================================================================== --- trunk/users/src/Users.pm (original) +++ trunk/users/src/Users.pm Thu Mar 29 16:25:52 2012 @@ -4984,7 +4984,8 @@ # additional sentence for error popup my $more = (($self->NISAvailable () || $self->LDAPAvailable ()) && ($type eq "local" || $type eq "system")) ? __(" -The existing username might belong to NIS or LDAP user.") : ""; +The existing username might belong to a NIS or LDAP user. +") : ""; # error popup, %1 might be additional sentence ("The existing username...") return sformat (__("There is a conflict between the entered username and an existing username. %1 @@ -5180,9 +5181,10 @@ if ($uid == $dir_uid) { # chown is not needed (#25200) # yes/no popup - $ret{"question"} = sprintf (__("The home directory selected (%s) + $ret{"question"} = sprintf (__("The selected home directory (%s) already exists and is owned by the currently edited user. -Use this directory?"), $home); +Use this directory? +"), $home); $ret{"owned"} = 1; } # maybe it is home of some user marked to delete... Modified: trunk/users/src/UsersUI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersUI.ycp?rev=67823&… ============================================================================== --- trunk/users/src/UsersUI.ycp (original) +++ trunk/users/src/UsersUI.ycp Thu Mar 29 16:25:52 2012 @@ -174,7 +174,7 @@ "Icecast streaming server" : _("Icecast streaming server"), // User name for user: "lighttpd" - "user for lighttpd" : _("user for lighttpd"), + "user for lighttpd" : _("User for lighttpd"), // User name for user: "nagios" "User for Nagios" : _("User for Nagios"), Modified: trunk/users/src/groups.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/groups.ycp?rev=67823&r… ============================================================================== --- trunk/users/src/groups.ycp (original) +++ trunk/users/src/groups.ycp Thu Mar 29 16:25:52 2012 @@ -195,7 +195,7 @@ ], "batchmode" :$[ // translators: command line help text for batchmode option - "help" : _("Don't ask for missing data; return error instead.") + "help" : _("Do not ask for missing data; return error instead.") ], ], "mappings" : $[ Modified: trunk/users/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/helps.ycp?rev=67823&r1… ============================================================================== --- trunk/users/src/helps.ycp (original) +++ trunk/users/src/helps.ycp Thu Mar 29 16:25:52 2012 @@ -129,7 +129,7 @@ // Help text 4.5/6 _("Umask for Home Directory -Umask which is used for creating new home directories. +Umask to use for creating new home directories. ") + // Help text 5/6: @@ -414,12 +414,12 @@ if (UsersRoutines::CryptedHomesEnabled ()) { // help text for directory encryption - helptext = helptext + _("To encrypt the user's home directory, enable Use Encrypted Home Directory and set the directory size. Encrypting a user's home directory does not provide strong security from other users. If this machine is shared among multiple users, it may be possible for a user to compromise system security, obtain another user's key, and gain access to the encrypted data. If strong security is required, the system should not be physically shared."); + helptext = helptext + _("To encrypt the user's home directory, enable Use Encrypted Home\nDirectory and set the directory size. Encrypting a user's home directory\ndoes not provide strong security from other users. If this machine is shared\namong multiple users, it may be possible for a user to compromise system\nsecurity by obtaining another user's key and gaining access to the encrypted data. If strong security is required, the system should not be physically shared."); } else { // help text for directory encryption - helptext = helptext + _("Home directories cannot be encrypted when fingerprint reader device is used. To encrypt the user's home directory, disable fingerprint configuration first."); + helptext = helptext + _("Home directories cannot be encrypted if a fingerprint reader device is used. To encrypt the user's home directory, disable fingerprint configuration first."); } } @@ -457,7 +457,7 @@ // help text 8/8 _(" Additional Groups: -Select the additional groups in which the user should be a member. +Select additional groups in which the user should be a member. "); return helptext; @@ -500,7 +500,7 @@ */ define string EditUserPasswordDialogHelp() ``{ // Help text 1/6 - return _("Activate Force Password Change to force user to change the password at the next login. If Last Password Change is set to Never, user will be forced to change the password.") + + return _("Activate Force Password Change to force the user to change the\npassword at the next login. If Last Password Change is set to\nNever, the user will be forced to change the password.") + // Help text 2/6 _(" Modified: trunk/users/src/inst_user_first.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_user_first.ycp?re… ============================================================================== --- trunk/users/src/inst_user_first.ycp (original) +++ trunk/users/src/inst_user_first.ycp Thu Mar 29 16:25:52 2012 @@ -221,7 +221,7 @@ ") + // Help text for password expert dialog - _("SHA-512 is the current standard hash method, using other algorithms is not recommended unless needed for compatibility purpose."); + _("SHA-512 is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes."); // help text for main add user dialog string main_help () { Modified: trunk/users/src/users.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/users.ycp?rev=67823&r1… ============================================================================== --- trunk/users/src/users.ycp (original) +++ trunk/users/src/users.ycp Thu Mar 29 16:25:52 2012 @@ -217,7 +217,7 @@ ], "batchmode" :$[ // translators: command line help text for batchmode option - "help" : _("Don't ask for missing data; return error instead.") + "help" : _("Do not ask for missing data; return error instead.") ], ], "mappings" : $[ Modified: trunk/users/src/users_plugin_quota.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/users_plugin_quota.ycp… ============================================================================== --- trunk/users/src/users_plugin_quota.ycp (original) +++ trunk/users/src/users_plugin_quota.ycp Thu Mar 29 16:25:52 2012 @@ -135,7 +135,7 @@ string what = config["what"]:"user"; // helptext for quota - string help_text = _("Here, configure quota settings of the user on selected file systems.") + + string help_text = _("Configure quota settings for the user on selected file systems.") + // helptext for quota, cont. _("Define a size limit by specifying the number of 1 KB blocks the @@ -151,11 +151,11 @@ if (what == "group") { // helptext for quota - help_text = _("Here, configure quota settings of the group on selected file systems.") + + help_text = _("Configure quota settings for the group on selected file systems.") + // helptext for quota, cont. _("Define a size limit by specifying the number of 1 kB blocks the -group may have on this file system. Additionally, you can define an inode limit specifying the number of inodes the group may have on the file system. +group may use on this file system. Additionally, you can define an inode limit specifying the number of inodes the group may use on the file system. ") + // helptext for quota, cont. @@ -231,7 +231,7 @@ `VSpacing (0.4), `VSpacing (0.4), // frame label - `Frame (_("I-nodes Limits"), `HBox (`HSpacing (0.5), `VBox ( + `Frame (_("I-nodes Limit"), `HBox (`HSpacing (0.5), `VBox ( `IntField (`id ("quota_inodes_soft"), // intfield label _("S&oft limit"), 0, max, quota_inodes_soft), @@ -283,7 +283,7 @@ if (sel != current || ret == `next) { // error popup - string msg = _("Soft limit cannot be set higher than the hard limit."); + string msg = _("Soft limit cannot be higher than the hard limit."); if ((integer) UI::QueryWidget(`id ("quota_blocks_soft"), `Value) > (integer) Modified: trunk/users/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/widgets.ycp?rev=67823&… ============================================================================== --- trunk/users/src/widgets.ycp (original) +++ trunk/users/src/widgets.ycp Thu Mar 29 16:25:52 2012 @@ -178,7 +178,7 @@ "); // Help text for password expert dialog 4/5 - help_text = help_text + _("SHA-512 is the current standard hash method, using other algorithms is not recommended unless needed for compatibility purpose."); + help_text = help_text + _("SHA-512 is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes."); UI::OpenDialog( `VBox( @@ -256,7 +256,7 @@ // help text 2/3 _("It seems that you are running a NIS server. In some network environments, -you could be unable to log in to a NIS client when a user password is +you might be unable to log in to a NIS client when a user password is encrypted with a method other than DES. ") + -- 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] r67822 - in /trunk/tv: package/yast2-tv.changes src/ui.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 16:16:15 2012 New Revision: 67822 URL: http://svn.opensuse.org/viewcvs/yast?rev=67822&view=rev Log: - merged proofread texts Modified: trunk/tv/package/yast2-tv.changes trunk/tv/src/ui.ycp Modified: trunk/tv/package/yast2-tv.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/package/yast2-tv.changes?rev=… ============================================================================== --- trunk/tv/package/yast2-tv.changes (original) +++ trunk/tv/package/yast2-tv.changes Thu Mar 29 16:16:15 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 16:15:57 CEST 2012 - jsuchome(a)suse.cz + +- merged proofread texts + +------------------------------------------------------------------- Tue Oct 4 13:13:35 UTC 2011 - lslezak(a)suse.cz - do not write "options i2c-algo-bit bit_test=1" line to Modified: trunk/tv/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/src/ui.ycp?rev=67822&r1=67821… ============================================================================== --- trunk/tv/src/ui.ycp (original) +++ trunk/tv/src/ui.ycp Thu Mar 29 16:16:15 2012 @@ -182,11 +182,12 @@ if (!Popup::ContinueCancel(sformat(_("Card '%1' (or its driver) is currently disabled. There might be serious reasons for this like: -- the card is not supported by the driver -- the driver does not work correctly with this card -- the system may be unstable or may completely freeze +- the card is not supported by the driver, +- the driver does not work correctly with this card, +- enabling the card may make the system unstable or freeze it. -Really configure and enable the card?"), Tv::current_card["name"]:""))) +Really configure and enable the card? +"), Tv::current_card["name"]:""))) { continue; } -- 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] r67821 - in /trunk/tftp-server: package/yast2-tftp-server.changes src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 16:11:58 2012 New Revision: 67821 URL: http://svn.opensuse.org/viewcvs/yast?rev=67821&view=rev Log: - merge proofread texts Modified: trunk/tftp-server/package/yast2-tftp-server.changes trunk/tftp-server/src/dialogs.ycp Modified: trunk/tftp-server/package/yast2-tftp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tftp-server/package/yast2-tftp-s… ============================================================================== --- trunk/tftp-server/package/yast2-tftp-server.changes (original) +++ trunk/tftp-server/package/yast2-tftp-server.changes Thu Mar 29 16:11:58 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 16:11:47 CEST 2012 - jsuchome(a)suse.cz + +- merge proofread texts + +------------------------------------------------------------------- Fri Nov 25 10:55:51 CET 2011 - locilka(a)suse.cz - Fixed firewall service name (bnc#729793) Modified: trunk/tftp-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tftp-server/src/dialogs.ycp?rev=… ============================================================================== --- trunk/tftp-server/src/dialogs.ycp (original) +++ trunk/tftp-server/src/dialogs.ycp Thu Mar 29 16:11:58 2012 @@ -96,9 +96,9 @@ help_text = help_text + _("Note that TFTP and FTP are not the same."); // dialog help text help_text = help_text + _("Boot Image Directory: -Specify the directory where served files are -located. The usual value is <tt>/tftpboot</tt>. It is created if it -does not exist. The server uses this as its root directory (using the <tt>-s</tt> option). +Specify the directory where served files are located. The usual value is +<tt>/tftpboot</tt>. The directory will be created if it does not exist. +The server uses this as its root directory (using the <tt>-s</tt> option). "); help_text = help_text + fw_cwm_widget["help"]:""; -- 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] r67820 - in /trunk/system-profile: package/yast2-system-profile.changes src/dialogs.ycp src/texts.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 16:11:12 2012 New Revision: 67820 URL: http://svn.opensuse.org/viewcvs/yast?rev=67820&view=rev Log: - merge proofread texts Modified: trunk/system-profile/package/yast2-system-profile.changes trunk/system-profile/src/dialogs.ycp trunk/system-profile/src/texts.ycp Modified: trunk/system-profile/package/yast2-system-profile.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/system-profile/package/yast2-sys… ============================================================================== --- trunk/system-profile/package/yast2-system-profile.changes (original) +++ trunk/system-profile/package/yast2-system-profile.changes Thu Mar 29 16:11:12 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 16:11:02 CEST 2012 - jsuchome(a)suse.cz + +- merge proofread texts + +------------------------------------------------------------------- Wed Sep 28 22:55:04 CEST 2011 - visnov(a)suse.cz - set dialog title Modified: trunk/system-profile/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/system-profile/src/dialogs.ycp?r… ============================================================================== --- trunk/system-profile/src/dialogs.ycp (original) +++ trunk/system-profile/src/dialogs.ycp Thu Mar 29 16:11:12 2012 @@ -92,7 +92,7 @@ y2milestone("executeSmoltCmd returned emtpy or nil data, thus an error occurred."); // (bnc#441221) fix typo string errMsg1 = _("An error occurred while gathering system information."); - string errMsg2 = _("Please make sure that the smolt package is installed."); + string errMsg2 = _("Make sure that the smolt package is installed."); Popup::Message(sformat("%1\n%2", errMsg1, errMsg2)); } } @@ -102,8 +102,10 @@ UI::ReplaceWidget(`id(`smoltDataReplace), `RichText(`id(`smoltData), `opt(`plainText), "")); UI::ChangeWidget(`id(`smoltData), `Value, sysData); UI::RecalcLayout(); - string notifyHeading = _("System profile was sent successfully."); - string notifyBody = _("Find a URL an your password to edit and comment your\nprofile online at the end of the system profile details."); + string notifyHeading = _("System profile has been successfully sent."); + string notifyBody = _("At the end of the system profile details, find a URL and your password to edit +and comment your profile online. +"); Popup::Notify(sformat("%1\n\n%2", notifyHeading, notifyBody)); } Modified: trunk/system-profile/src/texts.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/system-profile/src/texts.ycp?rev… ============================================================================== --- trunk/system-profile/src/texts.ycp (original) +++ trunk/system-profile/src/texts.ycp Thu Mar 29 16:11:12 2012 @@ -38,9 +38,17 @@ * All descriptions are here */ map DESC = $[ - "short" : _("Driver development is prioritized based on hardware popularity.\nPlease send your system profile to influence this work."), - "long" : _("Driver development is prioritized based on hardware popularity.\nPlease send your system profile to a community database to help\ncreating current statistics."), - "smolt" : _("Driver development is prioritized based on hardware popularity.\nThe community project smolt creates statistics from contributed\nsystem profiles. Please send your system profile to support smolt.") + "short" : _("Driver development is prioritized according to hardware popularity. +Please send your system profile to influence this work. +"), + "long" : _("Driver development is prioritized according to hardware popularity. +Please send your system profile to a community database to help +creating current statistics. +"), + "smolt" : _("Driver development is prioritized according to hardware popularity. +The community project Smolt creates statistics from contributed +system profiles. Please send your system profile to support Smolt. +") ]; @@ -58,8 +66,8 @@ * All helps are here */ map HELPS = $[ - "c1" : _("Linux driver development is prioritized based on hardware popularity. You can submit your system profile to a community database to influence this work."), - "c2" : _("To keep your system profile updated in this database please activate to send the data monthly."), + "c1" : _("Linux driver development is prioritized according to hardware popularity. You can submit your system profile to a community database to influence this work."), + "c2" : _("To keep your system profile updated in this database, activate sending the data monthly."), "c3" : _("Your system profile will be transmitted to the smolt project. Visit http://smolts.org for details."), "c4" : _("Once you sent your profile manually, you will receive a URL and a password to edit and comment your profile online. Press Send Profile to send the profile manually.") ]; @@ -71,7 +79,7 @@ "sendOnce" : _("Send Profile Once"), "sendProfileMonthly" : _("Send profile monthly."), "disbleSendingProfile" : _("Do not send profile monthly."), - "errorWhileSending" : _("An error occurred and the system profile was not sent."), + "errorWhileSending" : _("An error occurred and the system profile has not been sent."), "serverOrNetworkDown" : _("Maybe your network is disconnected or the target server is down.") ]; -- 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] r67819 - in /trunk/sysconfig: package/yast2-sysconfig.changes src/complex.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 16:10:05 2012 New Revision: 67819 URL: http://svn.opensuse.org/viewcvs/yast?rev=67819&view=rev Log: - merge proofread texts Modified: trunk/sysconfig/package/yast2-sysconfig.changes trunk/sysconfig/src/complex.ycp Modified: trunk/sysconfig/package/yast2-sysconfig.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/package/yast2-sysconfi… ============================================================================== --- trunk/sysconfig/package/yast2-sysconfig.changes (original) +++ trunk/sysconfig/package/yast2-sysconfig.changes Thu Mar 29 16:10:05 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 16:09:54 CEST 2012 - jsuchome(a)suse.cz + +- merge proofread texts + +------------------------------------------------------------------- Tue Sep 27 10:44:00 CEST 2011 - visnov(a)suse.cz - set dialog title Modified: trunk/sysconfig/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/src/complex.ycp?rev=67… ============================================================================== --- trunk/sysconfig/src/complex.ycp (original) +++ trunk/sysconfig/src/complex.ycp Thu Mar 29 16:10:05 2012 @@ -754,7 +754,7 @@ ), `VSpacing(1), // help rich text displayed after module start (1/2) - `RichText(`id(`rt), _("System Configuration EditorWith the system configuration editor, you can change some system settings. You can also use YaST2 to configure your hardware and system settings.") + + `RichText(`id(`rt), _("System Configuration EditorWith the system configuration editor, you can change some system settings. You can also use YaST to configure your hardware and system settings.") + // help rich text displayed after module start (2/2) _("Note: Descriptions are not translated because they are read directly from configuration files.")), // push button label - displayed only in autoinstallation config mode -- 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] r67818 - in /trunk/support: package/yast2-support.changes src/Support.ycp src/dialogs.ycp src/helps.ycp src/supportconfig_conf.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 16:09:30 2012 New Revision: 67818 URL: http://svn.opensuse.org/viewcvs/yast?rev=67818&view=rev Log: - merge proofread texts Modified: trunk/support/package/yast2-support.changes trunk/support/src/Support.ycp trunk/support/src/dialogs.ycp trunk/support/src/helps.ycp trunk/support/src/supportconfig_conf.ycp Modified: trunk/support/package/yast2-support.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/package/yast2-support.ch… ============================================================================== --- trunk/support/package/yast2-support.changes (original) +++ trunk/support/package/yast2-support.changes Thu Mar 29 16:09:30 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 16:09:16 CEST 2012 - jsuchome(a)suse.cz + +- merge proofread texts + +------------------------------------------------------------------- Fri Aug 5 12:35:28 CEST 2011 - tgoettlicher(a)suse.de - fixed .desktop file (bnc #681249) Modified: trunk/support/src/Support.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/src/Support.ycp?rev=6781… ============================================================================== --- trunk/support/src/Support.ycp (original) +++ trunk/support/src/Support.ycp Thu Mar 29 16:09:30 2012 @@ -242,7 +242,7 @@ global boolean Read() { /* Support read dialog caption */ - string caption = _("Initializing support Configuration"); + string caption = _("Initializing Support Configuration"); configuration = (map)SCR::Read(.etc.supportconfig.all); foreach(map<string, any> row, configuration["value"]:[], { @@ -272,7 +272,7 @@ global boolean Write() { /* Support read dialog caption */ - string caption = _("Saving support Configuration"); + string caption = _("Saving Support Configuration"); // TODO FIXME And set the right number of stages integer steps = 2; Modified: trunk/support/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/src/dialogs.ycp?rev=6781… ============================================================================== --- trunk/support/src/dialogs.ycp (original) +++ trunk/support/src/dialogs.ycp Thu Mar 29 16:09:30 2012 @@ -49,7 +49,7 @@ `Frame(_("Open Novell Support Center"), `VBox( `HStretch (), - `Left (`Label(_("This will start a browser with Novell Support Center Portal."))), + `Left (`Label(_("This will start a browser connecting to the Novell Support Center Portal."))), `HBox ( `HStretch(), `HStretch(), @@ -67,7 +67,7 @@ `Frame(`opt (`hstretch), _("Collect Data"), `VBox( `HStretch (), - `Left (`Label(_("This will create tarball with collected log files."))), + `Left (`Label(_("This will create a tarball containing the collected log files."))), `HBox ( `HStretch(), `HStretch(), @@ -86,7 +86,7 @@ `Frame(`opt (`hstretch), _("Upload Data"), `VBox( `HStretch (), - `Label(_("This will upload collected logs into specified URL.")), + `Label(_("This will upload the collected logs to the specified URL.")), `HBox ( `HStretch(), `HStretch(), @@ -115,15 +115,16 @@ break; else if (ret == `browser){ - if (Support::browser==nil) Popup::Error(_("Couldn't find any installed browser.")); + if (Support::browser==nil) Popup::Error(_("Could not find any installed browser.")); else{ string url="'http://www.novell.com/center/eservice'"; if (0 == SCR::Execute (.target.bash, "env|grep LOGNAME|cut -d'=' -f2- | grep root")) { - if (Popup::ContinueCancel (sformat (_("YaST will run a web browser as superuser. Consider -running it as a non-provileged user and entering URL + if (Popup::ContinueCancel (sformat (_("YaST will run a Web browser as superuser. Consider +running it as a non-provileged user and entering the URL %1. -Start web browser?"), url))) +Start Web browser? +"), url))) { y2milestone("Executing browser %1 with URL %2", Support::browser, url); SCR::Execute(.target.bash, sformat("%1 %2", Support::browser, url)); @@ -170,7 +171,7 @@ term contents = `Frame("", `VBox( load_save, - `CheckBoxFrame(`id(`upload), _("Upload log files tarball into URL"), true, + `CheckBoxFrame(`id(`upload), _("Upload log files tarball to URL"), true, `Left( `InputField(`id(`url), _("Upload Target"), url) ) ) ) @@ -500,7 +501,7 @@ )), `Frame (_("Upload Information"), `VBox( `Left(`InputField(`id(`target), _("Upload Target"), deletechars(Support::options["VAR_OPTION_UPLOAD_TARGET"]:"", "'"))), - `Left(`InputField(`id(`novell_number), _("Novell 11 digit service request number"), Support::novell_number)) + `Left(`InputField(`id(`novell_number), _("Novell 11-digit service request number"), Support::novell_number)) ))); Wizard::SetContentsButtons(caption, contents, HELPS["contact"]:"", Modified: trunk/support/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/src/helps.ycp?rev=67818&… ============================================================================== --- trunk/support/src/helps.ycp (original) +++ trunk/support/src/helps.ycp Thu Mar 29 16:09:30 2012 @@ -37,8 +37,8 @@ map HELPS = $[ /* Read dialog help 1/2 */ - "read" : _("<big>Initializing support Configuration</big> -Please wait... + "read" : _("<big>Initializing Support Configuration</big> + ") + /* Read dialog help 2/2 */ @@ -47,8 +47,8 @@ "), /* Write dialog help 1/2 */ - "write" : _("<big>Saving support Configuration</big> -Please wait... + "write" : _("<big>Saving Support Configuration</big> + ") + /* Write dialog help 2/2 */ @@ -65,7 +65,7 @@ /* Summary dialog help 2/3 */ _("<big>Adding a support:</big> -Choose an support from the list of detected supports. +Choose a support from the list of detected supports. If your support was not detected, use Other (not detected). Then press Configure. ") + @@ -79,9 +79,10 @@ /* Ovreview dialog help 1/3 */ "overview" : _(" <big>Opening Novell Support Center</big> -To start a web browser that opens the Novell Support Center Portal, use Open Novell Support Center. +To start a Web browser that opens the Novell Support Center Portal, use Open Novell Support Center. You can then open a Service Request with Novell Technical Support. Make sure you write down -the Service Request number to include in the supportconfig data upload.") +the Service Request number to include in the supportconfig data upload. +") /* Ovreview dialog help 2/3 */ + _("<big>Collecting Data</big> To run the supportconfig data collection tool, use Collect Data") @@ -96,13 +97,15 @@ gather the most data or only gather a minimum amount of data.") /* Configure1 dialog help 2/3 */ + _("<big>Expert Settings</big> -Select Use Custom and the Expert Settings button -to select specific data sets to collect.") +Select Use Custom and click the Expert Settings button +to select specific data sets to collect. +") /* Configure1 dialog help 3/3 */ + _("<big>Options</big> -You can collect additional information. Usually these options are not -necessary, but can be included when circumstances require."), +Collect additional information. Usually these options are not +necessary, but can be included if circumstances require more information. +"), /* Expert dialog help 1/1 */ "expert_params" : _("<big>Default Options</big> @@ -125,49 +128,61 @@ scp://central.server.foo.com/supportconfig/archives") /* Contact dialog help 4/4 */ + _("Note: If you are uploading a supportconfig tarball to Novell Technical Support, -make sure you include the Novell 11 digit service request number from your open service request."), +make sure you include the Novell 11-digit service request number from your open service request. +"), /* Collecting data dialkog help 1/1 */ "collecting" : _("<big>Collecting Data</big>> -Please wait while the data is being collected."), +Data is being collected. +"), /* Data review dialog help 1/1 */ "review" : _("<big>Collected Data Review</big> Review the data collected by supportconfig. If you do not want to share some of the collected data, -use Remove from Data and selected file will be removed."), +use Remove from Data and the selected file will be removed. +"), /* Configure1 dialog help 1/3 */ "upload_save" : _("<big>Upload supportconfig tarball to Novell Technical Support</big> -If you want to store copy of supportconfig tarball, select target directory and be sure that this option - is checked. - ") + +If you want to store a copy of the supportconfig tarball, select the target +directory and make sure that this option is checked. + +") + /* Configure1 dialog help 2/3 */ _("<big>Upload URL</big> -This option has default value where supportconfig tarball will be uploaded. +This option has the location to which the supportconfig tarball will be uploaded +as default value. Change this value only in special cases. -") + + +") + /* Configure1 dialog help 3/3, %1 is a URL */ sformat (_("<big>Privacy Policy</big> -You can find the Novell's privacy policy at -%1."), +Find Novell's privacy policy at +%1. +"), "http://www.novell.com/company/policies/privacy/"), "upload_select" : _("<big>Upload supportconfig tarball to Novell Technical Support</big> -If you have supportconfig tarball already created, write full path into Package with log files field. - ") + +If you have already created the supportconfig tarball, write the full path +into the Package with log files field. + +") + /* Configure1 dialog help 2/3 */ _("<big>Upload URL</big> -This option has default value where supportconfig tarball will be uploaded. +This option has the location to which the supportconfig tarball will be uploaded +as default value. Change this value only in special cases. -") + + +") + /* Configure1 dialog help 3/3 */ sformat (_("<big>Privacy Policy</big> -You can find the Novell's privacy policy at -%1."), +Find Novell's privacy policy at +%1. +"), "http://www.novell.com/company/policies/privacy/"), /* Configure2 dialog help 1/2 */ Modified: trunk/support/src/supportconfig_conf.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/src/supportconfig_conf.y… ============================================================================== --- trunk/support/src/supportconfig_conf.ycp (original) +++ trunk/support/src/supportconfig_conf.ycp Thu Mar 29 16:09:30 2012 @@ -14,43 +14,44 @@ "OPTION_EDIR" : _("Novell eDirectory health check information. novell-edir.txt"), "OPTION_ENV" : _("System environment information, including sysctl and root's environment. env.txt"), "OPTION_ETC" : _("Recursively gets *.conf files, along with various other configuration files in /etc. etc.txt"), -"OPTION_EVMS" : _("Enterprise Volume Management System related information. evms.txt"), +"OPTION_EVMS" : _("Enterprise Volume Management System-related information. evms.txt"), "OPTION_HA" : _("Heartbeat/high availabilty cluster information. ha.txt"), "OPTION_ISCSI" : _("iSCSI target and initiator information. fs-iscsi.txt"), "OPTION_LDAP" : _("LDAP related information, including a root DSE search. ldap.txt"), -"OPTION_LUM" : _("Novell Linux User Management related information, including a root DSE, UNIX Config and workstation object searches. novell-lum.txt"), -"OPTION_LVM" : _("Linux Volume Management related information. lvm.txt"), -"OPTION_MEM" : _("Memory related information. memory.txt"), +"OPTION_LUM" : _("Novell Linux User Management-related information, including a root DSE, UNIX Config and workstation object searches. novell-lum.txt"), +"OPTION_LVM" : _("Linux Volume Management-related information. lvm.txt"), +"OPTION_MEM" : _("Memory-related information. memory.txt"), "OPTION_MOD" : _("System kernel module information. modules.txt"), "OPTION_MPIO" : _("Native device mapper multipathing information. mpio.txt"), -"OPTION_NCP" : _("Novell Core Protocol related information. novell-ncp.txt"), -"OPTION_NCS" : _("Novell Cluster Services related information. novell-ncs.txt"), -"OPTION_NET" : _("Network related information, including firewall rules. network.txt"), -"OPTION_NFS" : _("Network File System related information. nfs.txt"), -"OPTION_NSS" : _("Novell Storage Services related information. novell-nss.txt"), -"OPTION_NTP" : _("Network Time Protocol related information. ntp.txt"), -"OPTION_OCFS2" : _("OCFS2 file system related information. ocfs2.txt"), +"OPTION_NCP" : _("Novell Core Protocol-related information. novell-ncp.txt"), +"OPTION_NCS" : _("Novell Cluster Services-related information. novell-ncs.txt"), +"OPTION_NET" : _("Network-related information, including firewall rules. network.txt"), +"OPTION_NFS" : _("Network File System-related information. nfs.txt"), +"OPTION_NSS" : _("Novell Storage Services-related information. novell-nss.txt"), +"OPTION_NTP" : _("Network Time Protocol-related information. ntp.txt"), +"OPTION_OCFS2" : _("OCFS2 file system-related information. ocfs2.txt"), "OPTION_OFILES" : _("List of all open files using lsof. open-files.txt"), -"OPTION_OPENWBEM" : _("OpenWBEM related information. openwbem.txt"), -"OPTION_PAM" : _("Pluggable Authentication Module related information, including user account information. pam.txt"), -"OPTION_PRINT" : _("Printing and CUPS related information. print.txt"), +"OPTION_OPENWBEM" : _("OpenWBEM-related information. openwbem.txt"), +"OPTION_PAM" : _("Pluggable Authentication Module-related information, including user account information. pam.txt"), +"OPTION_PRINT" : _("Printing and CUPS-related information. print.txt"), "OPTION_PROC" : _("Includes key /proc file content. proc.txt"), -"OPTION_RCD" : _("Update daemon related information. updates-daemon.txt"), +"OPTION_RCD" : _("Update daemon-related information. updates-daemon.txt"), "OPTION_RUG" : _("Update client related information. updates.txt"), -"OPTION_SAR" : _("System Activity Reporting related information, including copies of the SAR data files. sar.txt"), -"OPTION_SLERT" : _("SLES Real Time kernel related information. slert.txt"), +"OPTION_SAR" : _("System Activity Reporting-related information, including copies of the SAR data files. sar.txt"), +"OPTION_SLERT" : _("SLES Real Time kernel-related information. slert.txt"), "OPTION_SLP" : _("Service Location Protocol related information. slp.txt"), -"OPTION_SMART" : _("Self-Monitoring, Analysis, and Reporting Technology related information for hard disks. WARNING: Some hard disk controllers and drives do not -behave kindly. Probing SMART data has been known to change file systems to read only mode or even hang the server. Make sure probing SMART data -works in your environment before enabling this option. fs-smartmon.txt"), -"OPTION_SMB" : _("Samba and CIFS related information. samba.txt"), -"OPTION_SRAID" : _("Software RAID related information. fs-softraid.txt"), +"OPTION_SMART" : _("Self-Monitoring, Analysis, and Reporting Technology-related information for hard disks. WARNING: Some hard disk controllers and drives do not +behave nicely. Probing SMART data has been known to change file systems to read only mode or even hang the server. Make sure probing SMART data +works in your environment before enabling this option. fs-smartmon.txt +"), +"OPTION_SMB" : _("Samba and CIFS-related information. samba.txt"), +"OPTION_SRAID" : _("Software RAID-related information. fs-softraid.txt"), "OPTION_SSH" : _("Secure Shell server information. ssh.txt"), "OPTION_SYSCONFIG" : _("Configuration files found in /etc/sysconfig. sysconfig.txt"), -"OPTION_UDEV" : _("UDEV device manager related information. udev.txt"), -"OPTION_X" : _("X graphical system related information. x.txt"), -"OPTION_XEN" : _("XEN virtualization related information. xen.txt"), -"ADD_OPTION_EDIR_SEARCH": _("Tells the supportconfig to search the file system for all eDirectory instances files. If set, ADD_OPTION_FSLIST is automatically set as well. -e"), +"OPTION_UDEV" : _("UDEV device manager-related information. udev.txt"), +"OPTION_X" : _("X graphical system-related information. x.txt"), +"OPTION_XEN" : _("XEN virtualization-related information. xen.txt"), +"ADD_OPTION_EDIR_SEARCH": _("Tells supportconfig to search the file system for all eDirectory instances files. If set, ADD_OPTION_FSLIST is automatically set as well. -e"), "ADD_OPTION_FSLIST" : _("A full file list using find from the root of the filesytem. -L, fs-files.txt"), "ADD_OPTION_LOGS" : _("Includes the entire log file, including comments, instead of just VAR_OPTION_LINE_COUNT lines of it. Additional rotated logs are included if available. -l"), "ADD_OPTION_MIN_DISKSCAN": _("Minimizes the amount of disk information and detailed scanning. -d"), @@ -75,7 +76,7 @@ "VAR_OPTION_SAR_FILES_LIMIT" :_("The maximum number of SAR data files to include in the supportconfig tarball."), -"VAR_OPTION_SILENT" :_("When set to 1, supportconfig runs in quiet mode. This option is useful if you plan on running regular supportconfigs in a cron job for example. Set with -Q."), +"VAR_OPTION_SILENT" :_("When set to 1, supportconfig runs in quiet mode. This option is useful if you\nplan on running supportconfig regularly in a cron job for example. Set with -Q."), "VAR_OPTION_UPLOAD_TARGET" :_("Used to specify where the supportconfig tarball will be uploaded, when using the -u srnum startup option. You can specify any FTP server that supports anonymous uploads. The default is Novell's public ftp server.") -- 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] r67817 - /tags/stable-2_22_0/sudo/
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 16:08:28 2012 New Revision: 67817 URL: http://svn.opensuse.org/viewcvs/yast?rev=67817&view=rev Log: Created tag stable-2_22_0 for sudo Added: tags/stable-2_22_0/sudo/ - copied from r67816, trunk/sudo/ -- 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] r67816 - in /trunk/sudo: VERSION package/yast2-sudo.changes src/Sudo.ycp src/dialog-host.ycp src/dialog-spec.ycp src/dialogs.ycp src/helps.ycp yast2-sudo.spec.in
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 16:08:03 2012 New Revision: 67816 URL: http://svn.opensuse.org/viewcvs/yast?rev=67816&view=rev Log: - merge proofread texts - confirmed license - 2.22.0 Modified: trunk/sudo/VERSION trunk/sudo/package/yast2-sudo.changes trunk/sudo/src/Sudo.ycp trunk/sudo/src/dialog-host.ycp trunk/sudo/src/dialog-spec.ycp trunk/sudo/src/dialogs.ycp trunk/sudo/src/helps.ycp trunk/sudo/yast2-sudo.spec.in Modified: trunk/sudo/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/VERSION?rev=67816&r1=67815&… ============================================================================== --- trunk/sudo/VERSION (original) +++ trunk/sudo/VERSION Thu Mar 29 16:08:03 2012 @@ -1 +1 @@ -2.21.1 +2.22.0 Modified: trunk/sudo/package/yast2-sudo.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/package/yast2-sudo.changes?… ============================================================================== --- trunk/sudo/package/yast2-sudo.changes (original) +++ trunk/sudo/package/yast2-sudo.changes Thu Mar 29 16:08:03 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Mar 29 16:06:50 CEST 2012 - jsuchome(a)suse.cz + +- merge proofread texts +- confirmed license +- 2.22.0 + +------------------------------------------------------------------- Thu Sep 22 11:39:21 CEST 2011 - visnov(a)suse.cz - set dialog title Modified: trunk/sudo/src/Sudo.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/Sudo.ycp?rev=67816&r1=6… ============================================================================== --- trunk/sudo/src/Sudo.ycp (original) +++ trunk/sudo/src/Sudo.ycp Thu Mar 29 16:08:03 2012 @@ -395,7 +395,7 @@ global boolean Abort() { if (Sudo::GetModified()) { - return Popup::YesNo( _("All changes will be lost. Really quit sudo configuration without saving ?")); + return Popup::YesNo( _("All changes will be lost. Really quit sudo configuration without saving?")); } else return true; Modified: trunk/sudo/src/dialog-host.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/dialog-host.ycp?rev=678… ============================================================================== --- trunk/sudo/src/dialog-host.ycp (original) +++ trunk/sudo/src/dialog-host.ycp Thu Mar 29 16:08:03 2012 @@ -45,7 +45,7 @@ term contents = `VBox ( `Left( `InputField(`id("host_alias_name"),_("Alias Name (in CAPITALS)"))), `Left(`Label(_("Hostnames or Networks in the Alias"))), - `Table(`id("host_alias_members"),`header(_("Host Names/Networks")),[]), + `Table(`id("host_alias_members"),`header(_("Hostnames/Networks")),[]), `Left(`HBox( `PushButton ( `id ( "add_host" ), `opt(`key_F3), " " + Label::AddButton() + " "), `PushButton ( `id ( "edit_host" ), `opt(`key_F4), " " + Label::EditButton() + " "), Modified: trunk/sudo/src/dialog-spec.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/dialog-spec.ycp?rev=678… ============================================================================== --- trunk/sudo/src/dialog-spec.ycp (original) +++ trunk/sudo/src/dialog-spec.ycp Thu Mar 29 16:08:03 2012 @@ -94,12 +94,12 @@ spec["tag"] = ""; if (spec["user"]:"" == "") { - Popup::Error(_("User name must not be empty.")); + Popup::Error(_("Username must not be empty.")); UI::SetFocus(`id("user_name")); continue; } if (spec["host"]:"" == "") { - Popup::Error(_("Host name must not be empty.")); + Popup::Error(_("Hostname must not be empty.")); UI::SetFocus(`id("host_name")); continue; } @@ -108,7 +108,7 @@ continue; } if (spec["commands"]:[] == [] ) { - Popup::Error(_("Command list must have at least one entry")); + Popup::Error(_("Command list must have at least one entry.")); UI::SetFocus(`id("commands")); continue; } Modified: trunk/sudo/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/dialogs.ycp?rev=67816&r… ============================================================================== --- trunk/sudo/src/dialogs.ycp (original) +++ trunk/sudo/src/dialogs.ycp Thu Mar 29 16:08:03 2012 @@ -171,8 +171,8 @@ boolean confirm_delete = true; if(Sudo::SearchRules("host",name)) { - if (!Popup::ContinueCancel (sformat(_("Host alias %1 is being used in one of sudo rules. -Deleting it may result in an inconsistent sudo configuration file. Really delete it ? + if (!Popup::ContinueCancel (sformat(_("Host alias %1 is being used in one of the sudo rules. +Deleting it may result in an inconsistent sudo configuration file. Really delete it? "), name))) confirm_delete = false; } @@ -214,8 +214,8 @@ boolean confirm_delete = true; if(Sudo::SearchRules("user",name)) { - if ( !Popup::ContinueCancel (sformat(_("User alias %1 is being used in one of sudo rules . -Deleting it may result in an inconsistent sudo configuration file. Really delete it ? + if ( !Popup::ContinueCancel (sformat(_("User alias %1 is being used in one of the sudo rules. +Deleting it may result in an inconsistent sudo configuration file. Really delete it? "), name))) confirm_delete = false; } @@ -256,8 +256,8 @@ boolean confirm_delete = true; if(Sudo::SearchRules("run_as","(" + name + ")")) { - if (!Popup::ContinueCancel (sformat(_("RunAs alias %1 is being used in one of sudo rules. -Deleting it may result in an inconsistent sudo configuration file. Really delete it ? + if (!Popup::ContinueCancel (sformat(_("RunAs alias %1 is being used in one of the sudo rules. +Deleting it may result in an inconsistent sudo configuration file. Really delete it? "), name))) confirm_delete = false; } @@ -299,8 +299,8 @@ boolean confirm_delete = true; if(Sudo::SearchRules("commands",name)) { - if (!Popup::ContinueCancel (sformat(_("Command alias %1 is being used in one of sudo rules. -Deleting it may result in an inconsistent sudo configuration file. Really delete it ? + if (!Popup::ContinueCancel (sformat(_("Command alias %1 is being used in one of the sudo rules. +Deleting it may result in an inconsistent sudo configuration file. Really delete it? "), name))) confirm_delete = false; } Modified: trunk/sudo/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/helps.ycp?rev=67816&r1=… ============================================================================== --- trunk/sudo/src/helps.ycp (original) +++ trunk/sudo/src/helps.ycp Thu Mar 29 16:08:03 2012 @@ -38,7 +38,7 @@ /* Read dialog help 1/2 */ "read" : _("<big>Initializing sudo Configuration</big> -Please wait... + ") + /* Read dialog help 2/2 */ @@ -48,7 +48,7 @@ /* Write dialog help 1/2 */ "write" : _("<big>Saving sudo Configuration</big> -Please wait... + ") + /* Write dialog help 2/2 */ Modified: trunk/sudo/yast2-sudo.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/yast2-sudo.spec.in?rev=6781… ============================================================================== --- trunk/sudo/yast2-sudo.spec.in (original) +++ trunk/sudo/yast2-sudo.spec.in Thu Mar 29 16:08:03 2012 @@ -1,8 +1,8 @@ @HEADER-COMMENT@ @HEADER@ -Group: System/YaST -License: GPL-2.0+ +Group: System/YaST +License: GPL-2.0 Requires: yast2-users # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 -- 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] r67815 - in /trunk/sshd: package/yast2-sshd.changes src/dialogs.ycp src/helps.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 16:05:31 2012 New Revision: 67815 URL: http://svn.opensuse.org/viewcvs/yast?rev=67815&view=rev Log: - merge proofread texts Modified: trunk/sshd/package/yast2-sshd.changes trunk/sshd/src/dialogs.ycp trunk/sshd/src/helps.ycp Modified: trunk/sshd/package/yast2-sshd.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/package/yast2-sshd.changes?… ============================================================================== --- trunk/sshd/package/yast2-sshd.changes (original) +++ trunk/sshd/package/yast2-sshd.changes Thu Mar 29 16:05:31 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 16:05:19 CEST 2012 - jsuchome(a)suse.cz + +- merge proofread texts + +------------------------------------------------------------------- Mon Sep 26 15:14:18 CEST 2011 - visnov(a)suse.cz - set dialog title Modified: trunk/sshd/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/src/dialogs.ycp?rev=67815&r… ============================================================================== --- trunk/sshd/src/dialogs.ycp (original) +++ trunk/sshd/src/dialogs.ycp Thu Mar 29 16:05:31 2012 @@ -81,7 +81,7 @@ _("General Login Settings"), `MarginBox (mbox_x, mbox_y, `VBox ( /* A check box */ - `Left(`CheckBox(`id("PrintMotd"), _("Print &Message of the Day After Login"))), + `Left(`CheckBox(`id("PrintMotd"), _("Print &Message of the Day after Login"))), /* A check box */ `Left(`CheckBox(`id("PermitRootLogin"), _("Permi&t Root Login"))) )) Modified: trunk/sshd/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/src/helps.ycp?rev=67815&r1=… ============================================================================== --- trunk/sshd/src/helps.ycp (original) +++ trunk/sshd/src/helps.ycp Thu Mar 29 16:05:31 2012 @@ -16,11 +16,13 @@ /* Read dialog help */ "read" : _("<big>Initializing the sshd Configuration</big> -Please wait... "), + +"), /* Write dialog help */ "write" : _("<big>Saving the sshd Configuration</big> -Please wait... "), + +"), /* Server Configuration dialog help */ "server_configuration" : _("<big>Server Configuration</big> @@ -57,7 +59,8 @@ /* Protocol and Cipher Settings dialog help*/ "proto_settings" : _("<big>Protocol and Cipher Settings</big> -Configure SSHD protocol version and cipher settings here. "), +Configure SSHD protocol version and cipher settings. +"), ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0