Author: aschnell Date: Mon Sep 1 16:52:20 2008 New Revision: 50532 URL: http://svn.opensuse.org/viewcvs/yast?rev=50532&view=rev Log: - work on messages Modified: trunk/storage/storage/src/include/ep-hd.ycp trunk/storage/storage/src/include/ep-lvm.ycp trunk/storage/storage/src/include/ep-raid.ycp trunk/storage/storage/src/include/ep-unused.ycp trunk/storage/storage/src/modules/DevicesSelectionBox.ycp trunk/storage/storage/src/modules/DualMultiSelectionBox.ycp trunk/storage/storage/src/modules/Partitions.ycp trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageFields.ycp Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-hd.ycp?rev=50532&r1=50531&r2=50532&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Mon Sep 1 16:52:20 2008 @@ -90,6 +90,7 @@ UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( + // heading `IconAndHeading(_("Hard Disks"), hd_icon), `Table(`id(`table), `opt(`keepSorting, `notify), table_header, table_contents), @@ -211,9 +212,12 @@ `HStretch(), StorageFields::Overview(fields, target_map, device), `HBox( + // push button text `PushButton(`id(`delete), _("Delete...")), `HStretch(), + // push button text `PushButton(`id(`smart), _("Smart...")), + // push button text `PushButton(`id(`hdparm), _("HD Parm...")) ) ) @@ -286,11 +290,16 @@ `Table(`id(`table), `opt(`keepSorting, `notify), table_header, table_contents), `HBox( + // push button text `PushButton(`id(`add), _("Add...")), + // push button text `PushButton(`id(`edit), _("Edit...")), + // push button text `PushButton(`id(`resize), _("Resize...")), + // push button text `PushButton(`id(`delete), _("Delete...")), `HStretch(), + // menu button text `MenuButton(_("Expert..."), expert_cmds) ) )); @@ -389,10 +398,14 @@ UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( + // heading `IconAndHeading(sformat(_("Hard Disk: %1"), device), hd_icon), `DumbTab(`id(`tab), [ + // tab heading `item(`id(`overview), _("&Overview")), + // tab heading `item(`id(`partitions), _("&Partitions")), + // tab heading `item(`id(`devices), _("&Used Devices")) ], `ReplacePoint(`id(`tab_panel), TabPanel::empty_panel) @@ -428,8 +441,11 @@ `IconAndHeading(sformat(_("Partition: %1"), device), hd_part_icon), StorageFields::Overview(fields, target_map, device), `HBox( + // push button text `PushButton(`id(`edit), _("Edit...")), + // push button text `PushButton(`id(`resize), _("Resize...")), + // push button text `PushButton(`id(`delete), _("Delete...")), `HStretch() ) Modified: trunk/storage/storage/src/include/ep-lvm.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-lvm.ycp?rev=50532&r1=50531&r2=50532&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-lvm.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm.ycp Mon Sep 1 16:52:20 2008 @@ -31,10 +31,12 @@ UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( + // heading `IconAndHeading(_("Volume Management"), lvm_icon), `Table(`id(`table), `opt(`keepSorting, `notify), table_header, table_contents), `HBox( + // push button text `PushButton(`id(`add), _("Add Volume Group...")), `HStretch() ) @@ -75,7 +77,9 @@ `HStretch(), StorageFields::Overview(fields, target_map, device), `HBox( + // push button text `PushButton(`id(`resize), _("Resize...")), + // push button text `PushButton(`id(`delete), _("Delete...")), `HStretch() ) @@ -130,9 +134,13 @@ `Table(`id(`table), `opt(`keepSorting, `notify), table_header, table_contents), `HBox( + // push button text `PushButton(`id(`add), _("Add...")), + // push button text `PushButton(`id(`edit), _("Edit...")), + // push button text `PushButton(`id(`resize), _("Resize...")), + // push button text `PushButton(`id(`delete), _("Delete...")), `HStretch() ) @@ -216,10 +224,14 @@ UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( + // heading `IconAndHeading(sformat(_("Volume Group: %1"), device), lvm_icon), `DumbTab(`id(`tab), [ + // push button text `item(`id(`overview), _("&Overview")), + // push button text `item(`id(`lvs), _("&Logical Volumes")), + // push button text `item(`id(`pvs), _("&Physical Volumes")) ], `ReplacePoint(`id(`tab_panel), TabPanel::empty_panel) @@ -251,11 +263,15 @@ Greasemonkey::Transform( `VBox( `HStretch(), + // heading `IconAndHeading(sformat(_("Logical Volume: %1"), device), lvm_lv_icon), StorageFields::Overview(fields, target_map, device), `HBox( + // push button text `PushButton(`id(`edit), _("Edit...")), + // push button text `PushButton(`id(`resize), _("Resize...")), + // push button text `PushButton(`id(`delete), _("Delete...")), `HStretch() ) Modified: trunk/storage/storage/src/include/ep-raid.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-raid.ycp?rev=50532&r1=50531&r2=50532&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-raid.ycp (original) +++ trunk/storage/storage/src/include/ep-raid.ycp Mon Sep 1 16:52:20 2008 @@ -31,10 +31,12 @@ Greasemonkey::Transform( `VBox( `HStretch(), + // heading `IconAndHeading(_("RAID"), raid_icon), `Table(`id(`table), `opt(`keepSorting, `notify), table_header, table_contents), `HBox( + // push button text `Left(`PushButton(`id(`add), _("Add RAID..."))), `HStretch() ) @@ -77,8 +79,11 @@ `HStretch(), StorageFields::Overview(fields, target_map, part_device), `HBox( + // push button text `PushButton(`id(`edit), _("Edit...")), + // push button text `PushButton(`id(`resize), _("Resize...")), + // push button text `PushButton(`id(`delete), _("Delete...")), `HStretch() ) @@ -156,9 +161,12 @@ UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( + // heading `IconAndHeading(sformat(_("RAID: %1"), device), raid_icon), `DumbTab(`id(`tab), [ + // push button text `item(`id(`overview), _("&Overview")), + // push button text `item(`id(`devices), _("&Used Devices")) ], `ReplacePoint(`id(`tab_panel), TabPanel::empty_panel) Modified: trunk/storage/storage/src/include/ep-unused.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-unused.ycp?rev=50532&r1=50531&r2=50532&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-unused.ycp (original) +++ trunk/storage/storage/src/include/ep-unused.ycp Mon Sep 1 16:52:20 2008 @@ -47,6 +47,7 @@ UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( + // heading `IconAndHeading(_("Unused Devices"), unused_icon), `Table(`id(`table), `opt(`keepSorting, `notify), table_header, table_contents) Modified: trunk/storage/storage/src/modules/DevicesSelectionBox.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/DevicesSelectionBox.ycp?rev=50532&r1=50531&r2=50532&view=diff ============================================================================== --- trunk/storage/storage/src/modules/DevicesSelectionBox.ycp (original) +++ trunk/storage/storage/src/modules/DevicesSelectionBox.ycp Mon Sep 1 16:52:20 2008 @@ -56,6 +56,7 @@ term UnselectedSizeTerm(list<map> unselected_devices) { integer size_k = Sum(unselected_devices); + // footer text, %1 is replaced by size return `Left(`Label(sformat(_("Total size: %1"), Storage::KByteToHumanString(size_k)))); } @@ -63,6 +64,7 @@ term SelectedSizeTerm(list<map> selected_devices) { integer size_k = selected_size_function(selected_devices); + // footer text, %1 is replaced by size return `Left(`Label(sformat(_("Resulting size: %1"), Storage::KByteToHumanString(size_k)))); } Modified: trunk/storage/storage/src/modules/DualMultiSelectionBox.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/DualMultiSelectionBox.ycp?rev=50532&r1=50531&r2=50532&view=diff ============================================================================== --- trunk/storage/storage/src/modules/DualMultiSelectionBox.ycp (original) +++ trunk/storage/storage/src/modules/DualMultiSelectionBox.ycp Mon Sep 1 16:52:20 2008 @@ -49,10 +49,14 @@ )), `MarginBox(1, 1, `HSquash(`VBox( + // push button text `PushButton(`id(`add), `opt(`hstretch), _("Add") + " " + UI::Glyph(`ArrowRight)), + // push button text `PushButton(`id(`add_all), `opt(`hstretch), _("Add All") + " " + UI::Glyph(`ArrowRight)), `VSpacing(1), + // push button text `PushButton(`id(`remove), `opt(`hstretch), UI::Glyph(`ArrowLeft) + " " + _("Remove")), + // push button text `PushButton(`id(`remove_all), `opt(`hstretch), UI::Glyph(`ArrowLeft) + " " + _("Remove All")) ))), `HWeight(1, `VBox( Modified: trunk/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Partitions.ycp?rev=50532&r1=50531&r2=50532&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Partitions.ycp (original) +++ trunk/storage/storage/src/modules/Partitions.ycp Mon Sep 1 16:52:20 2008 @@ -777,6 +777,7 @@ } else { + // popup text text = text + _(" Safely ignore this message if you do not intend to use Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=50532&r1=50531&r2=50532&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Mon Sep 1 16:52:20 2008 @@ -300,6 +300,7 @@ if (locker_name == nil) { if (!Popup::AnyQuestion(Label::ErrorMsg(), + // error popup _("The storage subsystem is locked by an unknown application. You must quit that application before you can continue."), Label::ContinueButton(), Label::CancelButton(), `focus_no)) @@ -308,6 +309,7 @@ else { if (!Popup::AnyQuestion(Label::ErrorMsg(), + // error popup sformat(_("The storage subsystem is locked by the application \"%1\" (%2). You must quit that application before you can continue."), locker_name, locker_pid), Label::ContinueButton(), Label::CancelButton(), Modified: trunk/storage/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageFields.ycp?rev=50532&r1=50531&r2=50532&view=diff ============================================================================== --- trunk/storage/storage/src/modules/StorageFields.ycp (original) +++ trunk/storage/storage/src/modules/StorageFields.ycp Mon Sep 1 16:52:20 2008 @@ -42,6 +42,17 @@ }; + string BooleanToHumanString(boolean value) + { + if (value) + // human text for Boolean value + return _("Yes"); + else + // human text for Boolean value + return _("No"); + } + + string UsedByString(symbol ub_type, string used_by) { switch(ub_type) @@ -428,6 +439,7 @@ if (style == `table) return value; else + // row label, %1 is replace by device name return sformat(_("Device: %1"), value); } @@ -437,6 +449,7 @@ if (style == `table) return value; else + // row label, %1 is replace by size return sformat(_("Size: %1"), value); } @@ -487,6 +500,7 @@ if (style == `table) return value; else + // row label return sformat(_("Type: %1"), value); } @@ -505,15 +519,17 @@ if (style == `table) return value; else + // row label return sformat(_("Format: %1"), value); } case `encrypted: { - string value = data["enc_type"]:`none != `none ? _("Yes") : _("No"); + string value = BooleanToHumanString(data["enc_type"]:`none != `none); if (style == `table) return value; else + // row label, %1 is replace by "Yes" or "No" return sformat(_("Encrypted: %1"), value); } @@ -523,6 +539,7 @@ if (style == `table) return value; else + // row label, %1 is replace by file system name e.g. "Ext3" return sformat(_("File System: %1"), value); } @@ -534,6 +551,7 @@ if (style == `table) return value; else + // row label, %1 is replace by mount point e.g. "/mnt" return sformat(_("Mount Point: %1"), value); } @@ -548,6 +566,7 @@ if (style == `table) return value; else + // row label, %1 is replace by mount by method return sformat(_("Mount By: %1"), value); } @@ -557,6 +576,7 @@ if (style == `table) return value; else + // row label, %1 is replace by used by device name e.g. /dev/system return sformat(_("Used By: %1"), value); } @@ -566,6 +586,7 @@ if (style == `table) return value; else + // row label, %1 is replace by file system uuid return sformat(_("UUID: %1"), value); } @@ -575,6 +596,7 @@ if (style == `table) return value; else + // row label, %1 is replace by file system label return sformat(_("Label: %1"), value); } @@ -584,6 +606,7 @@ if (style == `table) return value; else + // row label, %1 is replace by udev device path return sformat(_("Device Path: %1"), value); } @@ -594,6 +617,7 @@ } else { integer n = size(data["udev_id"]:[]); return mergestring(maplist(integer i, Integer::Range(n == 0 ? 1 : n), { + // row label, %1 is replaced by number, %2 is replace by udef device id return sformat(_("Device ID %1: %2"), i+1, data["udev_id", i]:""); }), HTML::Newline()); } @@ -605,6 +629,7 @@ if (style == `table) return value; else + // row label, %1 is replace by bios id return sformat(_("BIOS ID: %1"), value); } @@ -614,6 +639,7 @@ if (style == `table) return value; else + // row label, %1 is replace by disk label e.g. "MSDOS" or "GPT" return sformat(_("Disk Label: %1"), value); } @@ -623,6 +649,7 @@ if (style == `table) return value; else + // row label, %1 is replace by vendor name return sformat(_("Vendor: %1"), value); } @@ -632,6 +659,7 @@ if (style == `table) return value; else + // row label, %1 is replace by model string return sformat(_("Model: %1"), value); } @@ -641,6 +669,7 @@ if (style == `table) return value; else + // row label, %1 is replace by bus name e.g. "SCSI" return sformat(_("Bus: %1"), value); } @@ -652,6 +681,7 @@ if (style == `table) return value; else + // row label, %1 is replace by metadata version string return sformat(_("Metadata: %1"), value); } @@ -663,6 +693,7 @@ if (style == `table) return value; else + // row label, %1 is replace by size return sformat(_("PE Size: %1"), value); } @@ -681,6 +712,7 @@ if (style == `table) return value; else + // row label, %1 is replace by integer return sformat(_("Stripes: %1"), value); } @@ -690,6 +722,7 @@ if (style == `table) return value; else + // row label, %1 is replace by raid type e.g. "RAID1" return sformat(_("RAID Type: %1"), value); } @@ -703,6 +736,7 @@ if (style == `table) return value; else + // row label, %1 is replace by size return sformat(_("Chunk Size: %1"), value); } @@ -716,6 +750,7 @@ if (style == `table) return value; else + // row label, %1 is replace by algorithm name return sformat(_("Parity Algorithm: %1"), value); } @@ -727,6 +762,7 @@ if (style == `table) return value; else + // row label, %1 is replace by integer return sformat(_("Number of Cylinders: %1"), value); } @@ -738,6 +774,7 @@ if (style == `table) return value; else + // row label, %1 is replace by size return sformat(_("Cylinder Size: %1"), value); } @@ -753,6 +790,7 @@ if (style == `table) return value; else + // row label, %1 is replace by integer return sformat(_("Start Cylinder: %1"), value); } @@ -768,6 +806,7 @@ if (style == `table) return value; else + // row label, %1 is replace by integer return sformat(_("End Cylinder: %1"), value); } @@ -778,6 +817,7 @@ if (style == `table) return value; else + // row label, %1 is replace by file system id return sformat(_("FS Id: %1"), value); } break; @@ -788,6 +828,7 @@ if (style == `table) return value; else + // row label, %1 is replace by file path e.g. "/data/secret" return sformat(_("File Path: %1"), value); } @@ -799,6 +840,7 @@ if (style == `table) return value; else + // row label, %1 is replace by wwpn return sformat(_("WWPN: %1"), value); } @@ -810,6 +852,7 @@ if (style == `table) return value; else + // row label, %1 is replace by lun return sformat(_("LUN: %1"), value); } @@ -821,6 +864,7 @@ if (style == `table) return value; else + // row label, %1 is replace by port id return sformat(_("Port ID: %1"), value); } @@ -1080,16 +1124,22 @@ { switch (field) { case `heading_device: + // heading return _("Device:"); case `heading_filesystem: + // heading return _("File System:"); case `heading_hd: + // heading return _("Hard Disk:"); case `heading_fc: + // heading return _("Fibre Channel:"); case `heading_lvm: + // heading return _("LVM:"); case `heading_md: + // heading return _("RAID:"); default: y2error("unknown field %1", field); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org