Date: Sat, 10 Jun 2006 05:23:07 GMT From: soc-andrew <soc-andrew@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 98894 for review Message-ID: <200606100523.k5A5N7OU072968@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=98894 Change 98894 by soc-andrew@soc-andrew_serv on 2006/06/10 05:22:13 Partial revert of Change 97849 Do the "formatted" -> "created" and "primary partition" to "install partition" change with gettext This is to reduce the upstream diff Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/200_select_disk.lua#4 edit .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/250_partition_disk.lua#6 edit .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/270_install_bootblocks.lua#4 edit .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/300_select_part.lua#4 edit .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/400_select_subparts.lua#4 edit .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/407_create_subparts.lua#3 edit .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/po/en.po#2 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/200_select_disk.lua#4 (text+ko) ==== @@ -20,7 +20,7 @@ "computer. If you wish to install %s" .. " on an unorthodox storage device, you will have to " .. "exit to a %s command prompt and install it " .. - "manually.", + "manually, using the file /README as a guide.", App.conf.product.name, App.conf.media_name) ) return nil ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/250_partition_disk.lua#6 (text+ko) ==== @@ -760,7 +760,7 @@ name = _("Partition Disk?"), short_desc = _( "One or more subpartitions of one or more " .. - "install partitions of the selected disk " .. + "primary partitions of the selected disk " .. "are already in use (they are currently " .. "mounted on mountpoints in the filesystem.) " .. "You cannot repartition the disk under " .. ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/270_install_bootblocks.lua#4 (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 install partition resides on a " .. + "- your %s primary 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 ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/300_select_part.lua#4 (text+ko) ==== @@ -14,7 +14,7 @@ local pd = StorageUI.select_part{ dd = App.state.sel_disk, short_desc = _( - "Select the install partition of %s (also " .. + "Select the primary 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 " .. - "install partition already in use (they are " .. + "primary 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 insall " .. + "Some subpartitions on the selected primary " .. "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 " .. - "install partition, you must first reboot.", + "primary 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: install partition #%d appears to have " .. + "WARNING: primary 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 install partition #%d,\n\n%s\n\non the " .. + "WARNING! ALL data in primary 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(_( - "Install partition #%d was created.", + "Primary partition #%d was formatted.", pd:get_number()) ) return step:next() else App.ui:inform(_( - "Install partition #%d was " .. - "not correctly created, and may " .. + "Primary partition #%d was " .. + "not correctly formatted, 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 install partitions were created.")) + "no primary partitions were formatted.")) return step:prev() end else ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/400_select_subparts.lua#4 (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 install partition.\n\n" .. + "have on this primary 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 install partition'."), - long_desc = _("Subpartitions further divide a install partition for " .. + "'use the remaining space on the primary partition'."), + long_desc = _("Subpartitions further divide a primary 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 install partition, to quell " .. + "to certain parts of the primary 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#3 (text+ko) ==== @@ -16,7 +16,7 @@ App.ui:inform(_( "The subpartitions you have chosen were " .. "not correctly created, and the " .. - "install partition may now be in an " .. + "primary partition may now be in an " .. "inconsistent state. We recommend " .. "re-formatting it before proceeding." )) ==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/po/en.po#2 (text+ko) ==== @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-29 17:45+1200\n" -"PO-Revision-Date: 2006-05-29 17:45+1200\n" +"POT-Creation-Date: 2006-06-06 17:16+1200\n" +"PO-Revision-Date: 2006-06-06 17:16+1200\n" "Last-Translator: Andrew Turner <soc-andrew@freebsd.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -44,8 +44,9 @@ msgid "" "'%s' is not a recognized partition type. Please use a numeric identifier if " "you wish to use an unlisted partition type." -msgstr "'%s' is not a recognized slice type. Please use a numeric identifier if " -"you wish to use an unlisted slice type." +msgstr "" +"'%s' is not a recognized slice type. Please use a numeric identifier if you " +"wish to use an unlisted slice type." #, c-format msgid "" @@ -64,15 +65,16 @@ "the disk. It is generally not required unless:\n" "\n" "- your BIOS does not support legacy mode; or\n" -"- your %s install partition resides on a cylinder of the disk beyond " +"- your %s primary partition resides on a cylinder of the disk beyond " "cylinder 1024; or\n" "- you just can't get it to boot without it." -msgstr "'Packet Mode' refers to using newer BIOS calls to boot from a slice of " -"the disk. It is generally not required unless:\n" +msgstr "" +"'Packet Mode' refers to using newer BIOS calls to boot from a slice of the " +"disk. It is generally not required unless:\n" "\n" "- your BIOS does not support legacy mode; or\n" -"- your %s install slice resides on a cylinder of the disk beyond " -"cylinder 1024; or\n" +"- your %s install slice resides on a cylinder of the disk beyond cylinder " +"1024; or\n" "- you just can't get it to boot without it." msgid "ABOUT TO FORMAT! Proceed?" @@ -109,7 +111,7 @@ msgid "Access" msgstr "" -msgid "Action cancelled - no install partitions were created." +msgid "Action cancelled - no primary partitions were formatted." msgstr "Action cancelled - no install slices were created." msgid "Action cancelled. No disks were formatted." @@ -419,7 +421,8 @@ "\n" "Note that this process can take quite a while to finish. You may wish to " "take a break now and come back to the computer in a short while." -msgstr "Everything is now ready to install the actual files which constitute %s on " +msgstr "" +"Everything is now ready to install the actual files which constitute %s on " "slice #%d of the disk %s.\n" "\n" "Note that this process can take quite a while to finish. You may wish to " @@ -533,17 +536,6 @@ msgid "Install a bootblock on %s" msgstr "" -#, c-format -msgid "Install partition #%d was created." -msgstr "Install slice #%d was created." - -#, c-format -msgid "" -"Install partition #%d was not correctly created, and may now be in an " -"inconsistent state. We recommend re-formatting it before proceeding." -msgstr "Install slice #%d was not correctly created, and may now be in an " -"inconsistent state. We recommend re-formatting it before proceeding." - msgid "Install the Ports collection?" msgstr "" @@ -638,7 +630,8 @@ "No changes appear to have been made to the partition table layout.\n" "\n" "Do you want to execute the commands to partition the disk anyway?" -msgstr "No changes appear to have been made to the partition table layout.\n" +msgstr "" +"No changes appear to have been made to the partition table layout.\n" "\n" "Do you want to execute the commands to slice the disk anyway?" @@ -652,11 +645,12 @@ "\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." -msgstr "No valid slices were found on %s. You will have to create at least one " -"in which to install %s.\n" +msgstr "" +"No valid slices were found on %s. You will have to create at least one in " +"which to install %s.\n" "\n" -"A single slice covering the entire disk will be selected for you by " -"default, but if you wish, you may create multiple slices instead." +"A single slice covering the entire disk will be selected for you by default, " +"but if you wish, you may create multiple slices instead." msgid "No, Return to Edit Partitions" msgstr "No, Return to Edit Slices" @@ -672,8 +666,9 @@ "of your swap subpartitions.\n" "\n" "Proceed anyway?" -msgstr "Note: none of the swap partitions that you have selected are large enough " -"to hold the contents of memory, and thus cannot be used to hold a crash dump " +msgstr "" +"Note: none of the swap partitions that you have selected are large enough to " +"hold the contents of memory, and thus cannot be used to hold a crash dump " "(an image of the computers' memory at the time of failure.) Because this " "complicates troubleshooting, we recommend that you increase the size of one " "of your swap partitions.\n" @@ -689,9 +684,10 @@ "You may wish to expand one or more subpartitions before proceeding.\n" "\n" "Proceed anyway?" -msgstr "Note: the total capacity required for the requested partitions (%s) does " -"not make full use of the capacity available in the slice (%s.) %d " -"sectors (%s) of space will go unused.\n" +msgstr "" +"Note: the total capacity required for the requested partitions (%s) does not " +"make full use of the capacity available in the slice (%s.) %d sectors (%s) " +"of space will go unused.\n" "\n" "You may wish to expand one or more partitions before proceeding.\n" "\n" @@ -710,33 +706,36 @@ msgstr "Omit Partitions?" msgid "" -"One or more subpartitions of one or more install partitions of the selected " +"One or more subpartitions of one or more primary partitions of the selected " "disk are already in use (they are currently mounted on mountpoints in the " "filesystem.) You cannot repartition the disk under these circumstances. If " "you wish to do so, you must unmount the subpartitions before proceeding." -msgstr "One or more partitions of one or more install slices of the selected " -"disk are already in use (they are currently mounted on mountpoints in the " +msgstr "" +"One or more partitions of one or more install slices of the selected disk " +"are already in use (they are currently mounted on mountpoints in the " "filesystem.) You cannot repartition the disk under these circumstances. If " "you wish to do so, you must unmount the partitions before proceeding." #, c-format msgid "" -"One or more subpartitions on the selected install partition already in use " +"One or more subpartitions on the selected primary partition already in use " "(they are currently mounted in the filesystem.) You should either unmount " "them before proceeding, or select a different partition or disk on which to " "install %s." -msgstr "One or more partitions on the selected install slice already in use " -"(they are currently mounted in the filesystem.) You should either unmount " -"them before proceeding, or select a different slice or disk on which to " -"install %s." +msgstr "" +"One or more partitions on the selected install slice already in use (they " +"are currently mounted in the filesystem.) You should either unmount them " +"before proceeding, or select a different slice or disk on which to install %" +"s." msgid "" "One or more subpartitions on the selected primary partition already in use " "(they are currently mounted in the filesystem.) You should unmount them " "before proceeding." -msgstr "One or more partitions on the selected install slice already in use " -"(they are currently mounted in the filesystem.) You should unmount them " -"before proceeding." +msgstr "" +"One or more partitions on the selected install slice already in use (they " +"are currently mounted in the filesystem.) You should unmount them before " +"proceeding." msgid "One partition must be marked 'active'." msgstr "One slice must be marked 'active'." @@ -767,25 +766,28 @@ "\n" "Would you like to adjust it? NOTE that this may result in subsequent " "partitions being moved!" -msgstr "Slice #%d does not begin and end on a cylinder boundary (i.e. its size, %" -"d, is not a multiple of %d.)\n" +msgstr "" +"Slice #%d does not begin and end on a cylinder boundary (i.e. its size, %d, " +"is not a multiple of %d.)\n" "\n" -"Would you like to adjust it? NOTE that this may result in subsequent " -"slices being moved!" +"Would you like to adjust it? NOTE that this may result in subsequent slices " +"being moved!" #, c-format msgid "" "Partition #%d extends past the end of the disk by %d sectors (%s). Would " "you like to shrink it so that it fits?" -msgstr "Slice #%d extends past the end of the disk by %d sectors (%s). Would " -"you like to shrink it so that it fits?" +msgstr "" +"Slice #%d extends past the end of the disk by %d sectors (%s). Would you " +"like to shrink it so that it fits?" #, c-format msgid "" "Partition #%d falls short of the end of the disk by %d sectors (%s). Would " "you like to expand it so that it takes up the entire rest of the disk?" -msgstr "Slice #%d falls short of the end of the disk by %d sectors (%s). Would " -"you like to expand it so that it takes up the entire rest of the disk?" +msgstr "" +"Slice #%d falls short of the end of the disk by %d sectors (%s). Would you " +"like to expand it so that it takes up the entire rest of the disk?" #, c-format msgid "Partition %s" @@ -835,6 +837,18 @@ msgid "Primary DNS Server" msgstr "" +#, c-format +msgid "Primary partition #%d was formatted." +msgstr "Install slice #%d was created." + +#, c-format +msgid "" +"Primary partition #%d was not correctly formatted, and may now be in an " +"inconsistent state. We recommend re-formatting it before proceeding." +msgstr "" +"Install slice #%d was not correctly created, and may now be in an " +"inconsistent state. We recommend re-formatting it before proceeding." + msgid "Proceed" msgstr "" @@ -1009,12 +1023,6 @@ msgstr "" #, c-format -msgid "" -"Select the install partition of %s (also known as a `slice' in the BSD " -"tradition) on which to install %s." -msgstr "Select the install slice of %s on which to install %s." - -#, c-format msgid "Select the packages you wish to install from the %s onto the HDD." msgstr "" @@ -1031,13 +1039,20 @@ "\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'." -msgstr "Select the slicess you want to have on %s.\n" +msgstr "" +"Select the slicess you want to 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'." #, c-format msgid "" +"Select the primary partition of %s (also known as a `slice' in the BSD " +"tradition) on which to install %s." +msgstr "Select the install slice of %s on which to install %s." + +#, c-format +msgid "" "Select the primary partition of %s on which the installation of %s resides." msgstr "Select the slice of %s on which the installation of %s resides." @@ -1058,11 +1073,12 @@ msgid "" "Set up the subpartitions (also known as just `partitions' in BSD tradition) " -"you want to have on this install partition.\n" +"you want to have on this primary 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 install partition'." -msgstr "Set up the partitions you want to have on this install slice.\n" +"single '*' to indicate 'use the remaining space on the primary partition'." +msgstr "" +"Set up the partitions you want to have on this install slice.\n" "\n" "For Capacity, use 'M' to indicate megabytes, 'G' to indicate gigabytes, or a " "single '*' to indicate 'use the remaining space on the install slice'" @@ -1100,7 +1116,8 @@ "- you want to install %s onto a logical/extended partition;\n" "- you want to install %s onto a ``dangerously dedicated'' disk; or\n" "- you want full and utter control over the install process." -msgstr "Some situations in which you might not wish to use this installer are:\n" +msgstr "" +"Some situations in which you might not wish to use this installer are:\n" "\n" "- you want to install %s onto a logical/extended partition;\n" "- you want to install %s onto a ``dangerously dedicated'' disk; or\n" @@ -1108,25 +1125,27 @@ #, c-format msgid "" -"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 install partition, you must " -"first reboot." -msgstr "Some partitions on the selected insall slice are already activated as " -"swap. Since there is no way to deactivate swap in %s once it is activated, " -"in order to edit the partition layout of this install slice, you must " -"first reboot." +"Some subpartitions on the selected primary 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." +msgstr "" +"Some partitions on the selected install slice are already activated as swap. " +"Since there is no way to deactivate swap in %s once it is activated, in " +"order to edit the partition layout of this install slice, you must first " +"reboot." #, c-format msgid "" -"Subpartitions further divide a install partition for use with %s. Some " +"Subpartitions further divide a primary 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 " -"install partition, to quell denial-of-service attacks; and\n" +"primary partition, to quell denial-of-service attacks; and\n" "- you want to speed up access to data on the disk." -msgstr "Partitions further divide a install slice for use with %s. Some " -"reasons you may want a set of partitions are:\n" +msgstr "" +"Partitions further divide a install slice for use with %s. Some reasons you " +"may want a set of partitions are:\n" "\n" "- you want to restrict how much data can be written to certain parts of the " "install slice, to quell denial-of-service attacks; and\n" @@ -1163,7 +1182,8 @@ "\n" "was not correctly partitioned, and may now be in an inconsistent state. We " "recommend partitioning it againbefore attempting to install %s on it." -msgstr "The disk\n" +msgstr "" +"The disk\n" "\n" "%s\n" "\n" @@ -1177,7 +1197,8 @@ "%s\n" "\n" "was successfully partitioned." -msgstr "The disk\n" +msgstr "" +"The disk\n" "\n" "%s\n" "\n" @@ -1209,8 +1230,12 @@ "The installer could not find any disks suitable for installation (IDE or " "SCSI) attached to this computer. If you wish to install %s on an unorthodox " "storage device, you will have to exit to a %s command prompt and install it " +"manually, using the file /README as a guide." +msgstr "" +"The installer could not find any disks suitable for installation (IDE or " +"SCSI) attached to this computer. If you wish to install %s on an unorthodox " +"storage device, you will have to exit to a %s command prompt and install it " "manually." -msgstr "" #, c-format msgid "" @@ -1241,11 +1266,12 @@ msgid "" "The subpartitions you have chosen were not correctly created, and the " -"install partition may now be in an inconsistent state. We recommend re-" +"primary partition may now be in an inconsistent state. We recommend re-" "formatting it before proceeding." -msgstr "The partitions you have chosen were not correctly created, and the " -"install slice may now be in an inconsistent state. We recommend re-" -"formatting it before proceeding." +msgstr "" +"The partitions you have chosen were not correctly created, and the install " +"slice may now be in an inconsistent state. We recommend re-formatting it " +"before proceeding." #, c-format msgid "" @@ -1381,7 +1407,8 @@ "\n" "Are you ABSOLUTELY SURE you wish to take this action? This is your LAST " "CHANCE to cancel!" -msgstr "WARNING! ALL data in ALL slices on the disk\n" +msgstr "" +"WARNING! ALL data in ALL slices on the disk\n" "\n" "%s\n" "\n" @@ -1392,7 +1419,7 @@ #, c-format msgid "" -"WARNING! ALL data in install partition #%d,\n" +"WARNING! ALL data in primary partition #%d,\n" "\n" "%s\n" "\n" @@ -1404,7 +1431,8 @@ "\n" "Are you ABSOLUTELY SURE you wish to take this action? This is your LAST " "CHANCE to cancel!" -msgstr "WARNING! ALL data in install slice #%d,\n" +msgstr "" +"WARNING! ALL data in install slice #%d,\n" "\n" "%s\n" "\n" @@ -1431,8 +1459,9 @@ "%s\n" "Are you ABSOLUTELY SURE you wish to take this action? This is your LAST " "CHANCE to cancel!" -msgstr "WARNING! The parameters of the following slices have been MODIFIED for " -"the disk\n" +msgstr "" +"WARNING! The parameters of the following slices have been MODIFIED for the " +"disk\n" "\n" "%s\n" "\n" @@ -1455,15 +1484,16 @@ "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." -msgstr "WARNING: The slice layout currently on %s is non-standard. It may have " -"gaps in between slices, or the slices may be listed in something " -"other than strictly increading order. \n" +msgstr "" +"WARNING: The slice layout currently on %s is non-standard. It may have gaps " +"in between slices, or the slices may be listed in something other than " +"strictly increading order. \n" "\n" -"While %s can handle this situation, this installer's slice editor cannot " -"at present. You will be given the option to completely reslice %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 " -"slice on it before continuing." +"While %s can handle this situation, this installer's slice editor cannot at " +"present. You will be given the option to completely reslice %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 slice on it " +"before continuing." #, c-format msgid "" @@ -1475,9 +1505,10 @@ "more subpartitions before proceeding.\n" "\n" "Proceed anyway?" -msgstr "WARNING: The total number of sectors needed for the requested partitions " -"(%d) exceeds the number of sectors available in the slice (%d) by %d " -"sectors (%s.)\n" +msgstr "" +"WARNING: The total number of sectors needed for the requested partitions (%" +"d) exceeds the number of sectors available in the slice (%d) by %d sectors (%" +"s.)\n" "\n" "This is an invalid configuration; we recommend shrinking the size of one or " "more partitions before proceeding.\n" @@ -1486,12 +1517,13 @@ #, c-format msgid "" -"WARNING: install partition #%d appears to have a capacity of %s, which is " +"WARNING: primary 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." -msgstr "WARNING: install slice #%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" +msgstr "" +"WARNING: install slice #%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" #, c-format msgid "" @@ -1499,7 +1531,8 @@ "running out of space during the installation.\n" "\n" "Proceed anyway?" -msgstr "WARNING: the %s partition should be at least %s in size or you will risk " +msgstr "" +"WARNING: the %s partition should be at least %s in size or you will risk " "running out of space during the installation.\n" "\n" "Proceed anyway?" @@ -1533,9 +1566,10 @@ "Warning! Action was completed, but the storage parameters of the system " "have changed, and the previously selected partition, partition #%d of disk %" "s, could no longer be found!" -msgstr "Warning! Action was completed, but the storage parameters of the system " -"have changed, and the previously selected slice, slice #%d of disk %" -"s, could no longer be found!" +msgstr "" +"Warning! Action was completed, but the storage parameters of the system " +"have changed, and the previously selected slice, slice #%d of disk %s, could " +"no longer be found!" msgid "" "Warning: already-mounted target system could not be correctly unmounted " @@ -1619,15 +1653,15 @@ "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." -msgstr "You may now slice %s if you desire.\n" +msgstr "" +"You may now slice %s if you desire.\n" "\n" "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 slices, one for each operating system.\n" "\n" "If %s already has operating systems on it that you wish to keep, you should " -"be careful not to change the slices that they are on, if you choose to " -"slice." +"be careful not to change the slices that they are on, if you choose to slice." #, c-format msgid ""
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200606100523.k5A5N7OU072968>