Author: aschnell Date: Tue Sep 2 11:50:27 2008 New Revision: 50561 URL: http://svn.opensuse.org/viewcvs/yast?rev=50561&view=rev Log: - work on messages Modified: trunk/storage/storage/src/include/ep-dm-dialogs.ycp trunk/storage/storage/src/include/ep-loop-dialogs.ycp trunk/storage/storage/src/include/ep-lvm-dialogs.ycp trunk/storage/storage/src/include/ep-nfs.ycp trunk/storage/storage/src/include/ep-raid-dialogs.ycp Modified: trunk/storage/storage/src/include/ep-dm-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-dm-dialogs.ycp?rev=50561&r1=50560&r2=50561&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-dm-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dm-dialogs.ycp Tue Sep 2 11:50:27 2008 @@ -23,6 +23,7 @@ "Password" : $[ `finish : `finish ] ]; + // dialog title string title = sformat(_("Edit DM %1"), device); symbol widget = MiniWorkflow::Run(title, dm_icon, aliases, sequence, "FormatMount"); Modified: trunk/storage/storage/src/include/ep-loop-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-loop-dialogs.ycp?rev=50561&r1=50560&r2=50561&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-loop-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-loop-dialogs.ycp Tue Sep 2 11:50:27 2008 @@ -8,38 +8,38 @@ textdomain "storage"; - string MiniWorkflowStepLoopNameSizeHelp() + string MiniWorkflowStepLoopNameSizeHelptext() { // TODO - // help text - string help = _(" + // helptext + string helptext = _(" <p><b>Path Name of Loop File:</b><br>This must be an absolute path to the file containing the data for the encrypted loop device to set up.</p> "); - // help text - help = help + _(" + // helptext + helptext = helptext + _(" <p><b>Create Loop File:</b><br>If this is checked, the file will be created with the size given in the next field. <b>NOTE:</b> If the file already exists, all data in it is lost.</p> "); - // help text - help = help + _(" + // helptext + helptext = helptext + _(" <p><b>Size:</b><br>This is the size of the loop file. The file system to create in the encrypted loop device will have this size.</p> "); - // help text - help = help + _(" + // helptext + helptext = helptext + _(" <p><b>NOTE:</b> 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.</p> "); - return help; + return helptext; } @@ -54,16 +54,20 @@ term contents = `HVSquash( `VBox( + // input field label `Left(`MinWidth(25, `InputField(`id(`fpath), `opt(`hstretch), _("Path Name of Loop File"), fpath))), + // push button text Mode::normal() ? `Left(`PushButton(`id(`browse), _("Browse..."))) : `Empty(), `VSpacing(0.75), + // check box text `LeftCheckBoxWithAttachment(`id(`create_file), `opt(`notify), _("Create Loop File"), + // input field label `MinWidth(15, `InputField(`id(`size), `opt(`shrinkable), _("Size"), Storage::KByteToHumanString(size_k)))) ) ); - MiniWorkflow::SetContents(Greasemonkey::Transform(contents), MiniWorkflowStepLoopNameSizeHelp()); + MiniWorkflow::SetContents(Greasemonkey::Transform(contents), MiniWorkflowStepLoopNameSizeHelptext()); MiniWorkflow::SetLastStep(false); UI::ChangeWidget(`id(`create_file), `Value, create_file); @@ -100,12 +104,14 @@ string tmp = (string) UI::QueryWidget(`id(`size), `Value); if (!Storage::HumanStringToKByte(tmp, size_k)) { + // error popup, %1 and %2 are replaced by sizes Popup::Error(sformat(_("The size entered is invalid. Enter a value like \"%1\" or \"%2\"."), Storage::KByteToHumanString(500*1024), Storage::KByteToHumanString(1024*1024))); widget = `again; } else if (size_k < min_size_k) { + // error popup, %1 is replaced by size Popup::Error(sformat(_("The size entered is invalid. Enter a size of at least %1."), Storage::KByteToHumanString(min_size_k))); widget = `again; @@ -147,6 +153,7 @@ "Password" : $[ `finish : `finish ] ]; + // dialog title string title = _("Add Crypt File"); symbol widget = MiniWorkflow::Run(title, lvm_lv_icon, aliases, sequence, "NameSize"); @@ -170,6 +177,7 @@ "Password" : $[ `finish : `finish ] ]; + // dialog title string title = sformat(_("Edit Crypt File %1"), device); symbol widget = MiniWorkflow::Run(title, dm_icon, aliases, sequence, "FormatMount"); Modified: trunk/storage/storage/src/include/ep-lvm-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-lvm-dialogs.ycp?rev=50561&r1=50560&r2=50561&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-lvm-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm-dialogs.ycp Tue Sep 2 11:50:27 2008 @@ -293,7 +293,10 @@ "TheOne" : $[ `finish : `finish ] ]; - symbol widget = MiniWorkflow::Run(_("Add Volume Group"), lvm_icon, aliases, sequence, "TheOne"); + // dialog title + string title = _("Add Volume Group"); + + symbol widget = MiniWorkflow::Run(title, lvm_icon, aliases, sequence, "TheOne"); return widget == `finish; } @@ -438,6 +441,7 @@ "Commit" : $[ `finish : `finish ] ]; + // dialog title string title = sformat(_("Resize Volume Group %1"), data["device"]:"error"); symbol widget = MiniWorkflow::Run(title, lvm_icon, aliases, sequence, "TheOne"); @@ -517,6 +521,7 @@ "Commit" : $[ `finish : `finish ] ]; + // dialog title string title = sformat(_("Add Logical Volume on %1"), "/dev/" + data["vg_name"]:"error"); symbol widget = MiniWorkflow::Run(title, lvm_lv_icon, aliases, sequence, "Name"); @@ -540,6 +545,7 @@ "Password" : $[ `finish : `finish ] ]; + // dialog title string title = sformat(_("Edit Logical Volume %1"), device); symbol widget = MiniWorkflow::Run(title, lvm_lv_icon, aliases, sequence, "FormatMount"); Modified: trunk/storage/storage/src/include/ep-nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-nfs.ycp?rev=50561&r1=50560&r2=50561&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-nfs.ycp (original) +++ trunk/storage/storage/src/include/ep-nfs.ycp Tue Sep 2 11:50:27 2008 @@ -30,6 +30,7 @@ Greasemonkey::Transform( `VBox( `HStretch(), + // heading `IconAndHeading(_("Network File System (NFS)"), nfs_icon), /*`Table(`id(`table), `opt(`keepSorting, `notify), table_header, table_contents), @@ -43,6 +44,7 @@ ) ); + // helptext string helptext = _("<p>NFS TODO</p>"); WFM::CallFunction("nfs-client4part", [ "FromStorage", $[ "shares" : nfs_shares ] ] ); @@ -73,11 +75,14 @@ UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( + // heading `IconAndHeading(sformat(_("NFS Path: %1"), part_device), nfs_icon), `HStretch(), StorageFields::Overview(fields, target_map, part_device), `HBox( + // push button text `PushButton(`id(`edit), "Edit..."), + // push button text `PushButton(`id(`delete), "Delete..."), `HStretch() ) @@ -85,6 +90,7 @@ ) ); + // helptext string helptext = _("<p>NFS TODO</p>"); Wizard::RestoreHelp(helptext + StorageFields::OverviewHelptext(fields)); Modified: trunk/storage/storage/src/include/ep-raid-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-raid-dialogs.ycp?rev=50561&r1=50560&r2=50561&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-raid-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-raid-dialogs.ycp Tue Sep 2 11:50:27 2008 @@ -24,6 +24,7 @@ { map info = $[ "raid0" : "RAID0", "raid1" : "RAID1", "raid5" : "RAID5", "raid6" : "RAID6", "raid10" : "RAID10", "multipath" : "Multipath RAID" ]; + // error popup, %1 is replaced by raid type e.g. "RAID1", %2 is replaced by integer Popup::Error(sformat(_("For %1, select at least %2 device.", "For %1, select at least %2 devices.", min_num), info[raid_type]:"error", min_num)); return false; @@ -42,7 +43,7 @@ } - string MiniWorkflowStepRaidTypeDevicesHelp() + string MiniWorkflowStepRaidTypeDevicesHelptext() { // TODO @@ -103,6 +104,7 @@ contains(devices, dev["device"]:""); }); term contents = `VBox(`Left( + // heading `HVSquash(`Frame(_("RAID Type"), `RadioButtonGroup(`id(`raid_type), `VBox( @@ -124,10 +126,12 @@ contents = add(contents, `VSpacing(1)); contents = add(contents, DevicesSelectionBox::Create(unused_devices, used_devices, fields, callback, + // label for selection box _("Available Devices:"), + // label for selection box _("Selected Devices:"))); - MiniWorkflow::SetContents(Greasemonkey::Transform(contents), MiniWorkflowStepRaidTypeDevicesHelp()); + MiniWorkflow::SetContents(Greasemonkey::Transform(contents), MiniWorkflowStepRaidTypeDevicesHelptext()); MiniWorkflow::SetLastStep(false); symbol widget = nil; @@ -174,7 +178,7 @@ } - string MiniWorkflowStepRaidOptionsHelp() + string MiniWorkflowStepRaidOptionsHelptext() { // TODO @@ -212,7 +216,9 @@ if (raid_type == "raid5") options = add(options, - `Left(`ComboBoxSelected(`id(`parity_algorithm), `opt(`hstretch), _("Parity &Algorithm"), + `Left(`ComboBoxSelected(`id(`parity_algorithm), `opt(`hstretch), + // combo box label + _("Parity &Algorithm"), [ `item(`id(`left_asymmetric), "left-asymmetric"), `item(`id(`left_symmetric), "left-symmetric"), `item(`id(`right_asymmetric), "right-asymmetric"), @@ -220,9 +226,10 @@ `id(parity_algorithm))) ); + // heading term contents = `HVSquash(`Frame(_("RAID Options"), options)); - MiniWorkflow::SetContents(Greasemonkey::Transform(contents), MiniWorkflowStepRaidOptionsHelp()); + MiniWorkflow::SetContents(Greasemonkey::Transform(contents), MiniWorkflowStepRaidOptionsHelptext()); MiniWorkflow::SetLastStep(false); symbol widget = nil; @@ -333,6 +340,7 @@ "Password" : $[ `finish : `finish ] ]; + // dialog title string title = sformat(_("Add RAID %1"), data["device"]:"error"); symbol widget = MiniWorkflow::Run(title, raid_icon, aliases, sequence, "TypeDevices"); @@ -351,6 +359,7 @@ "TheOne" : $[ `finish : `finish ] ]; + // dialog title string title = sformat(_("Resize RAID %1"), data["device"]:"error"); symbol widget = MiniWorkflow::Run(title, raid_icon, aliases, sequence, "TheOne"); @@ -374,6 +383,7 @@ "Password" : $[ `finish : `finish ] ]; + // dialog title string title = sformat(_("Edit RAID %1"), device); symbol widget = MiniWorkflow::Run(title, raid_icon, aliases, sequence, "FormatMount"); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org