From owner-p4-projects@FreeBSD.ORG Fri May 26 03:37:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB05716A60E; Fri, 26 May 2006 03:37:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 44AED16A459 for ; Fri, 26 May 2006 03:37:30 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE42043D53 for ; Fri, 26 May 2006 03:37:29 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4Q3aVcI006759 for ; Fri, 26 May 2006 03:36:31 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4Q3aVe0006756 for perforce@freebsd.org; Fri, 26 May 2006 03:36:31 GMT (envelope-from soc-andrew@freebsd.org) Date: Fri, 26 May 2006 03:36:31 GMT Message-Id: <200605260336.k4Q3aVe0006756@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 97849 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 May 2006 03:37:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=97849 Change 97849 by soc-andrew@soc-andrew_serv on 2006/05/26 03:36:05 Replace "this disk" with the disk name Change "formatted" -> "created" Change "primary partition" to "install partition" Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/220_format_disk.lua#5 edit .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/250_partition_disk.lua#4 edit .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/270_install_bootblocks.lua#3 edit .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/300_select_part.lua#3 edit .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/400_select_subparts.lua#3 edit .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/407_create_subparts.lua#2 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/220_format_disk.lua#5 (text+ko) ==== @@ -21,19 +21,19 @@ if dd:is_geometry_bios_friendly() then valid_msg = _( "This geometry should enable you to boot from " .. - "this disk. Unless you have a pressing reason " .. + "%s. Unless you have a pressing reason " .. "to do otherwise, it is recommended that you use " .. - "it.\n\n" + "it.\n\n", dd:get_name() ) else c_cyl, c_head, c_sec = dd:get_normalized_geometry() valid_msg = _( "This geometry will NOT enable you to boot from " .. - "this disk! Unless you have a pressing reason " .. + "%s! Unless you have a pressing reason " .. "to do otherwise, it is recommended that you use " .. "the following modified geometry:\n\n" .. "%d cylinders, %d heads, %d sectors\n\n", - c_cyl, c_head, c_sec + dd:get_name(), c_cyl, c_head, c_sec ) end local end_msg = _( @@ -50,17 +50,20 @@ { id = "cyl", name = _("Cylinders"), - short_desc = _("Enter the number of cylinders in this disk's geometry") + short_desc = _("Enter the number of cylinders in %s's geometry", + dd:get_name()) }, { id = "head", name = _("Heads"), - short_desc = _("Enter the number of heads in this disk's geometry") + short_desc = _("Enter the number of heads in %s's geometry", + dd:get_name()) }, { id = "sec", name = _("Sectors"), - short_desc = _("Enter the number of sectors in this disk's geometry") + short_desc = _("Enter the number of sectors in %s's geometry", + dd:get_name()) }, }, @@ -191,20 +194,21 @@ effect = function(step) local response = App.ui:present{ id = "format_disk", - name = _("Format this Disk?"), + name = _("Format %s?", App.state.sel_disk:get_name()), short_desc = _( - "Would you like to format this disk?\n\n" .. - "You should format the disk if it is new, " .. + "Would you like to format %s?\n\n" .. + "You should format %s if it is new, " .. "or if you wish to start from a clean " .. - "slate. You should NOT format the disk " .. + "slate. You should NOT format %s " .. "if it contains information that you " .. - "want to keep." + "want to keep.", App.state.sel_disk:get_name(), + App.state.sel_disk:get_name(), App.state.sel_disk:get_name() ), actions = { { id = "ok", - name = _("Format this Disk") + name = _("Format %s", App.state.sel_disk:get_name()) }, { id = "skip", ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/250_partition_disk.lua#4 (text+ko) ==== @@ -80,20 +80,23 @@ if start ~= offset then App.ui:inform(_( "WARNING: The partition layout currently " .. - "on this disk is non-standard. It may " .. + "on %s is non-standard. It may " .. "have gaps in between partitions, or the " .. "partitions may be listed in something " .. "other than strictly increading order. " .. "\n\nWhile %s can handle this situation, " .. "this installer's partition editor cannot " .. "at present. You will be given the option " .. - "to completely repartition this disk, but " .. + "to completely repartition %s, but " .. "if you wish to retain any existing " .. "information on the disk, you should exit " .. "the installer and use a tool such as " .. "`fdisk' to manually create a %s partition " .. "on it before continuing.", - App.conf.product.name, App.conf.product.name + App.state.sel_disk:get_name(), + App.conf.product.name, + App.state.sel_disk:get_name(), + App.conf.product.name )) return populate_one_big_partition(dd) end @@ -158,11 +161,12 @@ name = _("Edit Partitions"), short_desc = _("Select the partitions (also known " .. "as `slices' in BSD tradition) you want to " .. - "have on this disk.\n\n" .. + "have on %s.\n\n" .. "For Size, enter a raw size in sectors " .. "(1 gigabyte = 2097152 sectors) " .. "or a single '*' to indicate " .. - "'use the remaining space on the disk'."), + "'use the remaining space on the disk'.", + App.state.sel_disk:get_name()), special = "bsdinstaller_edit_partitions", minimum_width = "64", @@ -756,7 +760,7 @@ name = _("Partition Disk?"), short_desc = _( "One or more subpartitions of one or more " .. - "primary partitions of the selected disk " .. + "install partitions of the selected disk " .. "are already in use (they are currently " .. "mounted on mountpoints in the filesystem.) " .. "You cannot repartition the disk under " .. @@ -797,39 +801,42 @@ if App.state.sel_disk:get_part_count() == 0 then App.ui:inform(_( - "No valid partitions were found on this disk. " .. + "No valid partitions were found on %s. " .. "You will have to create at least one in which " .. "to install %s." .. "\n\n" .. "A single partition covering the entire disk " .. "will be selected for you by default, but if you " .. "wish, you may create multiple partitions instead.", + App.state.sel_disk:get_name(), App.conf.product.name )) return let_user_edit_partitions(step, populate_one_big_partition) end + print(type(App.state.sel_disk)) local response = App.ui:present{ id = "partition_disk", name = _("Partition Disk?"), short_desc = _( - "You may now partition this disk if you desire." .. + "You may now partition %s if you desire." .. "\n\n" .. - "If you formatted this disk, and would now like to install " .. + "If you formatted %s, and would now like to install " .. "multiple operating systems on it, you can reserve a part " .. "of the disk for each of them here. Create multiple " .. "partitions, one for each operating system." .. "\n\n" .. - "If this disk already has operating systems on it that you " .. + "If %s already has operating systems on it that you " .. "wish to keep, you should be careful not to change the " .. "partitions that they are on, if you choose to partition." .. - "\n\n" .. - "Partition this disk?" + App.state.sel_disk:get_name(), + App.state.sel_disk:get_name(), + App.state.sel_disk:get_name() ), actions = { { id = "ok", - name = _("Partition Disk"), + name = _("Partition %s", App.state.sel_disk:get_name()), effect = function() return let_user_edit_partitions(step, populate_from_disk) end ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/270_install_bootblocks.lua#3 (text+ko) ==== @@ -52,7 +52,7 @@ "from a partition of the disk. It is generally not " .. "required unless:\n\n" .. "- your BIOS does not support legacy mode; or\n" .. - "- your %s primary partition resides on a " .. + "- your %s install partition resides on a " .. "cylinder of the disk beyond cylinder 1024; or\n" .. "- you just can't get it to boot without it.", App.conf.product.name @@ -69,7 +69,8 @@ { id = "boot0cfg", name = _("Install Bootblock?"), - short_desc = _("Install a bootblock on this disk"), + short_desc = _("Install a bootblock on %s", + App.state.sel_disk:get_name()), control = "checkbox" }, { ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/300_select_part.lua#3 (text+ko) ==== @@ -14,7 +14,7 @@ local pd = StorageUI.select_part{ dd = App.state.sel_disk, short_desc = _( - "Select the primary partition of %s (also " .. + "Select the install partition of %s (also " .. "known as a `slice' in the BSD tradition) on " .. "which to install %s.", App.state.sel_disk:get_name(), @@ -26,7 +26,7 @@ if pd:is_mounted() then App.ui:inform(_( "One or more subpartitions on the selected " .. - "primary partition already in use (they are " .. + "install partition already in use (they are " .. "currently mounted in the filesystem.) " .. "You should either unmount them before " .. "proceeding, or select a different partition " .. @@ -40,12 +40,12 @@ local response = App.ui:present{ name = _("Cannot swapoff; reboot?"), short_desc = _( - "Some subpartitions on the selected primary " .. + "Some subpartitions on the selected insall " .. "partition are already activated as swap. " .. "Since there is no way to deactivate swap in " .. "%s once it is activated, in order " .. "to edit the subpartition layout of this " .. - "primary partition, you must first reboot.", + "install partition, you must first reboot.", App.conf.product.name ), actions = { @@ -72,7 +72,7 @@ ) if part_min_capacity:exceeds(pd:get_capacity()) then App.ui:inform(_( - "WARNING: primary partition #%d appears to have " .. + "WARNING: install partition #%d appears to have " .. "a capacity of %s, which is less than the minimum " .. "recommended capacity, %s. You may encounter " .. "problems while trying to install %s onto it.", @@ -85,7 +85,7 @@ if App.state.sel_disk:has_been_touched() or App.ui:confirm(_( - "WARNING! ALL data in primary partition #%d,\n\n%s\n\non the " .. + "WARNING! ALL data in install partition #%d,\n\n%s\n\non the " .. "disk\n\n%s\n\n will be IRREVOCABLY ERASED!\n\nAre you " .. "ABSOLUTELY SURE you wish to take this action? This is " .. "your LAST CHANCE to cancel!", @@ -98,14 +98,14 @@ if cmds:execute() then App.ui:inform(_( - "Primary partition #%d was formatted.", + "Install partition #%d was created.", pd:get_number()) ) return step:next() else App.ui:inform(_( - "Primary partition #%d was " .. - "not correctly formatted, and may " .. + "Install partition #%d was " .. + "not correctly created, and may " .. "now be in an inconsistent state. " .. "We recommend re-formatting it " .. "before proceeding.", @@ -116,7 +116,7 @@ else App.ui:inform(_( "Action cancelled - " .. - "no primary partitions were formatted.")) + "no install partitions were created.")) return step:prev() end else ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/400_select_subparts.lua#3 (text+ko) ==== @@ -354,15 +354,15 @@ name = _("Select Subpartitions"), short_desc = _("Set up the subpartitions (also known " .. "as just `partitions' in BSD tradition) you want to " .. - "have on this primary partition.\n\n" .. + "have on this install partition.\n\n" .. "For Capacity, use 'M' to indicate megabytes, 'G' to " .. "indicate gigabytes, or a single '*' to indicate " .. - "'use the remaining space on the primary partition'."), - long_desc = _("Subpartitions further divide a primary partition for " .. + "'use the remaining space on the install partition'."), + long_desc = _("Subpartitions further divide a install partition for " .. "use with %s. Some reasons you may want " .. "a set of subpartitions are:\n\n" .. "- you want to restrict how much data can be written " .. - "to certain parts of the primary partition, to quell " .. + "to certain parts of the install partition, to quell " .. "denial-of-service attacks; and\n" .. "- you want to speed up access to data on the disk.", App.conf.product.name), ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/407_create_subparts.lua#2 (text+ko) ==== @@ -16,7 +16,7 @@ App.ui:inform(_( "The subpartitions you have chosen were " .. "not correctly created, and the " .. - "primary partition may now be in an " .. + "install partition may now be in an " .. "inconsistent state. We recommend " .. "re-formatting it before proceeding." ))