Mageia Bugzilla – Attachment 571 Details for
Bug 1793
System tool text needs proofreading
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
Revised Drakx patch
drakxproofread2.patch (text/plain), 17.28 KB, created by
Shawn Thompson
on 2011-06-15 02:41:03 CEST
(
hide
)
Description:
Revised Drakx patch
Filename:
MIME Type:
Creator:
Shawn Thompson
Created:
2011-06-15 02:41:03 CEST
Size:
17.28 KB
patch
obsolete
>Index: libDrakX.pot >=================================================================== >--- libDrakX.pot (revision 1671) >+++ libDrakX.pot (working copy) >@@ -15,12 +15,12 @@ > > #: any.pm:258 any.pm:955 diskdrake/interactive.pm:648 diskdrake/interactive.pm:871 diskdrake/interactive.pm:931 diskdrake/interactive.pm:1033 diskdrake/interactive.pm:1263 diskdrake/interactive.pm:1315 do_pkgs.pm:241 do_pkgs.pm:287 harddrake/sound.pm:303 interactive.pm:587 pkgs.pm:285 > #, c-format >-msgid "Please wait" >+msgid "Please wait..." > msgstr "" > > #: any.pm:258 > #, c-format >-msgid "Bootloader installation in progress" >+msgid "Installing the bootloader..." > msgstr "" > > #: any.pm:269 >@@ -60,7 +60,7 @@ > > #: any.pm:337 > #, c-format >-msgid "Bootloader Installation" >+msgid "Bootloader installation" > msgstr "" > > #: any.pm:341 >@@ -125,7 +125,7 @@ > > #: any.pm:430 > #, c-format >-msgid "Delay before booting default image" >+msgid "Bootloader timeout (seconds)" > msgstr "" > > #: any.pm:431 >@@ -300,7 +300,7 @@ > > #: any.pm:597 > #, c-format >-msgid "Other OS (SunOS...)" >+msgid "Other OS (Solaris, OpenIndiana...)" > msgstr "" > > #: any.pm:598 >@@ -442,17 +442,17 @@ > > #: any.pm:955 > #, c-format >-msgid "Please wait, adding media..." >+msgid "Please wait, adding source..." > msgstr "" > > #: any.pm:985 security/l10n.pm:14 > #, c-format >-msgid "Autologin" >+msgid "Auto login" > msgstr "" > > #: any.pm:986 > #, c-format >-msgid "I can set up your computer to automatically log on one user." >+msgid "A selected user can be automatically logged in on startup." > msgstr "" > > #: any.pm:987 >@@ -482,7 +482,7 @@ > > #: any.pm:1074 > #, c-format >-msgid "License agreement" >+msgid "License notice" > msgstr "" > > #: any.pm:1076 diskdrake/dav.pm:26 >@@ -507,7 +507,7 @@ > > #: any.pm:1110 any.pm:1172 > #, c-format >-msgid "Please choose a language to use" >+msgid "Select your installation language" > msgstr "" > > #: any.pm:1138 >@@ -555,7 +555,7 @@ > > #: any.pm:1230 > #, c-format >-msgid "Here is the full list of available countries" >+msgid "List of countries" > msgstr "" > > #: any.pm:1231 >@@ -596,7 +596,7 @@ > #: any.pm:1325 > #, c-format > msgid "" >-"Would you like to allow users to share some of their directories?\n" >+"Would you like to allow users to share folders?\n" > "Allowing this will permit users to simply click on \"Share\" in konqueror and nautilus.\n" > "\n" > "\"Custom\" permit a per-user granularity.\n" >@@ -605,12 +605,12 @@ > > #: any.pm:1337 > #, c-format >-msgid "NFS: the traditional Unix file sharing system, with less support on Mac and Windows." >+msgid "NFS: the traditional Unix file sharing system." > msgstr "" > > #: any.pm:1340 > #, c-format >-msgid "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux systems." >+msgid "SMB: a file sharing system used by Windows and other modern operating systems." > msgstr "" > > #: any.pm:1348 >@@ -626,7 +626,7 @@ > #: any.pm:1378 > #, c-format > msgid "" >-"The per-user sharing uses the group \"fileshare\". \n" >+"Per-user sharing uses the group \"fileshare\". \n" > "You can use userdrake to add a user to this group." > msgstr "" > >@@ -647,7 +647,7 @@ > > #: any.pm:1524 > #, c-format >-msgid "Which is your timezone?" >+msgid "Select your time zone" > msgstr "" > > #: any.pm:1547 any.pm:1549 >@@ -657,7 +657,7 @@ > > #: any.pm:1550 > #, c-format >-msgid "What is the best time?" >+msgid "What time is your system set to?" > msgstr "" > > #: any.pm:1554 >@@ -727,7 +727,7 @@ > > #: authentication.pm:66 > #, c-format >-msgid "Tells your computer to use LDAP for some or all authentication. LDAP consolidates certain types of information within your organization." >+msgid "Use LDAP for some or all authentication. LDAP consolidates certain types of information into a simple profile." > msgstr "" > > #: authentication.pm:67 >@@ -1181,7 +1181,7 @@ > > #: diskdrake/hd_gtk.pm:73 > #, c-format >-msgid "Click on a partition, choose a filesystem type then choose an action" >+msgid "Select a partition, file system type, and action" > msgstr "" > > #: diskdrake/hd_gtk.pm:110 diskdrake/interactive.pm:1181 diskdrake/interactive.pm:1191 diskdrake/interactive.pm:1244 >@@ -1212,14 +1212,14 @@ > #: diskdrake/hd_gtk.pm:228 > #, c-format > msgid "" >-"You have one big Microsoft Windows partition.\n" >-"I suggest you first resize that partition\n" >+"Your computer has a large Windows partition.\n" >+"It is suggested that you resize the partition\n" > "(click on it, then click on \"Resize\")" > msgstr "" > > #: diskdrake/hd_gtk.pm:230 > #, c-format >-msgid "Please click on a partition" >+msgid "Select a partition" > msgstr "" > > #: diskdrake/hd_gtk.pm:244 diskdrake/smbnfs_gtk.pm:63 >@@ -1344,7 +1344,7 @@ > > #: diskdrake/interactive.pm:301 fs/partitioning_wizard.pm:283 > #, c-format >-msgid "You need to reboot for the partition table modifications to take effect" >+msgid "You must reboot for the partition table changes to take effect." > msgstr "" > > #: diskdrake/interactive.pm:306 >@@ -1387,7 +1387,7 @@ > > #: diskdrake/interactive.pm:372 > #, c-format >-msgid "I cannot add any more partitions" >+msgid "You cannot add any more partitions" > msgstr "" > > #: diskdrake/interactive.pm:373 >@@ -1533,9 +1533,9 @@ > #: diskdrake/interactive.pm:542 > #, c-format > msgid "" >-"You cannot create a new partition\n" >-"(since you reached the maximal number of primary partitions).\n" >-"First remove a primary partition and create an extended partition." >+"You cannot create a new partition, \n" >+"since you reached the maximal number of primary partitions.\n" >+"Remove a primary partition and create an extended partition." > msgstr "" > > #: diskdrake/interactive.pm:569 diskdrake/interactive.pm:1285 fs/partitioning.pm:48 >@@ -1550,7 +1550,7 @@ > > #: diskdrake/interactive.pm:623 > #, c-format >-msgid "After changing type of partition %s, all data on this partition will be lost" >+msgid "Changing the partition type will erase all data on %s" > msgstr "" > > #: diskdrake/interactive.pm:639 >@@ -1560,7 +1560,7 @@ > > #: diskdrake/interactive.pm:641 diskdrake/removable.pm:47 > #, c-format >-msgid "Which filesystem do you want?" >+msgid "Select a file system" > msgstr "" > > #: diskdrake/interactive.pm:648 >@@ -1575,12 +1575,12 @@ > > #: diskdrake/interactive.pm:685 > #, c-format >-msgid "Beware, this will be written to disk as soon as you validate!" >+msgid "This will be written to disk as soon as you validate!" > msgstr "" > > #: diskdrake/interactive.pm:686 > #, c-format >-msgid "Beware, this will be written to disk only after formatting!" >+msgid "This will be written to disk after formatting!" > msgstr "" > > #: diskdrake/interactive.pm:688 >@@ -1637,7 +1637,7 @@ > > #: diskdrake/interactive.pm:825 > #, c-format >-msgid "After resizing partition %s, all data on this partition will be lost" >+msgid "Resizing will remove all data on %s" > msgstr "" > > #: diskdrake/interactive.pm:832 >@@ -1664,7 +1664,7 @@ > #, c-format > msgid "" > "To ensure data integrity after resizing the partition(s),\n" >-"filesystem checks will be run on your next boot into Microsoft Windows®" >+"Windows may automatically perform a disk check upon its next startup" > msgstr "" > > #: diskdrake/interactive.pm:946 diskdrake/interactive.pm:1485 >@@ -1806,7 +1806,7 @@ > > #: diskdrake/interactive.pm:1244 > #, c-format >-msgid "Partition table of drive %s is going to be written to disk" >+msgid "The new partition table for %s will be written to disk" > msgstr "" > > #: diskdrake/interactive.pm:1263 fs/format.pm:102 fs/format.pm:109 >@@ -1816,7 +1816,7 @@ > > #: diskdrake/interactive.pm:1276 > #, c-format >-msgid "After formatting partition %s, all data on this partition will be lost" >+msgid "Formatting will erase all data on %s" > msgstr "" > > #: diskdrake/interactive.pm:1299 >@@ -2190,7 +2190,7 @@ > > #: fs/any.pm:17 > #, c-format >-msgid "An error occurred - no valid devices were found on which to create new filesystems. Please check your hardware for the cause of this problem" >+msgid "No valid devices to create filesystems on were found." > msgstr "" > > #: fs/any.pm:75 fs/partitioning_wizard.pm:62 >@@ -2205,7 +2205,7 @@ > > #: fs/format.pm:125 > #, c-format >-msgid "I do not know how to set label on %s with type %s" >+msgid "Setup cannot set the label on %s with type %s" > msgstr "" > > #: fs/format.pm:134 >@@ -2215,7 +2215,7 @@ > > #: fs/format.pm:175 > #, c-format >-msgid "I do not know how to format %s in type %s" >+msgid "Setup cannot format %s in type %s" > msgstr "" > > #: fs/format.pm:180 fs/format.pm:182 >@@ -2425,12 +2425,12 @@ > > #: fs/partitioning_wizard.pm:129 > #, c-format >-msgid "Computing the size of the Microsoft Windows® partition" >+msgid "Computing the size of the Windows partition" > msgstr "" > > #: fs/partitioning_wizard.pm:165 > #, c-format >-msgid "Use the free space on a Microsoft Windows® partition" >+msgid "Use the free space on a Windows partition" > msgstr "" > > #: fs/partitioning_wizard.pm:169 >@@ -2440,22 +2440,20 @@ > > #: fs/partitioning_wizard.pm:172 > #, c-format >-msgid "Your Microsoft Windows® partition is too fragmented. Please reboot your computer under Microsoft Windows®, run the ``defrag'' utility, then restart the %s installation." >+msgid "Your Windows partition is too fragmented. Please boot into Windows and run Disk Defragmenter before running %s Setup." > msgstr "" > > #: fs/partitioning_wizard.pm:180 > #, c-format > msgid "" >-"WARNING!\n" >+ >+"You have chosen to resize a Windows partition\n" > "\n" > "\n" >-"Your Microsoft Windows® partition will be now resized.\n" >+"This operation may be dangerous. Be sure to run \"chkdsk\" at a command prompt to check the disk for errors,.\n" >+"then make sure you have a backup of any personal data that may be lost in the process.\n" > "\n" >-"\n" >-"Be careful: this operation is dangerous. If you have not already done so, you first need to exit the installation, run \"chkdsk c:\" from a Command Prompt under Microsoft Windows® (beware, running graphical program \"scandisk\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), optionally run defrag, then restart the installation. You should also backup your data.\n" >-"\n" >-"\n" >-"When sure, press %s." >+"To continue, press %s." > msgstr "" > > #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX >@@ -2471,7 +2469,7 @@ > > #: fs/partitioning_wizard.pm:195 > #, c-format >-msgid "Which size do you want to keep for Microsoft Windows® on partition %s?" >+msgid "How large would you like the Windows partition %s to be?" > msgstr "" > > #: fs/partitioning_wizard.pm:196 >@@ -2481,7 +2479,7 @@ > > #: fs/partitioning_wizard.pm:205 > #, c-format >-msgid "Resizing Microsoft Windows® partition" >+msgid "Resizing partition..." > msgstr "" > > #: fs/partitioning_wizard.pm:210 >@@ -2496,7 +2494,7 @@ > > #: fs/partitioning_wizard.pm:231 > #, c-format >-msgid "Remove Microsoft Windows®" >+msgid "Remove Windows installation" > msgstr "" > > #: fs/partitioning_wizard.pm:231 >@@ -2538,17 +2536,17 @@ > > #: fs/partitioning_wizard.pm:431 fs/partitioning_wizard.pm:577 > #, c-format >-msgid "I cannot find any room for installing" >+msgid "Setup cannot find room to install" > msgstr "" > > #: fs/partitioning_wizard.pm:440 fs/partitioning_wizard.pm:584 > #, c-format >-msgid "The DrakX Partitioning wizard found the following solutions:" >+msgid "Select an automatic partitioning method:" > msgstr "" > > #: fs/partitioning_wizard.pm:510 > #, c-format >-msgid "Here is the content of your disk drive " >+msgid "Select a disk drive " > msgstr "" > > #: fs/partitioning_wizard.pm:594 >@@ -2589,12 +2587,13 @@ > #: fsedit.pm:247 > #, c-format > msgid "" >-"I cannot read the partition table of device %s, it's too corrupted for me :(\n" >-"I can try to go on, erasing over bad partitions (ALL DATA will be lost!).\n" >-"The other solution is to not allow DrakX to modify the partition table.\n" >-"(the error is %s)\n" >+"The partition table on the device %s could not be read.(\n" >+"The partition table may be corrupted, or in an unknown format.\n" >+"The affected device can be ignored by Setup entirely, or have its\n" >+"partition table reinitalized, erasing all data on it.\n" >+"(%s)\n" > "\n" >-"Do you agree to lose all the partitions?\n" >+"Would you like to reinitalize the device?\n" > "" > msgstr "" > >@@ -2619,8 +2618,7 @@ > #, c-format > msgid "" > "You've selected a software RAID partition as root (/).\n" >-"No bootloader is able to handle this without a /boot partition.\n" >-"Please be sure to add a separate /boot partition" >+"A separate /boot partition will be required." > msgstr "" > > #: fsedit.pm:440 >@@ -2644,8 +2642,7 @@ > #, c-format > msgid "" > "You've selected an encrypted partition as root (/).\n" >-"No bootloader is able to handle this without a /boot partition.\n" >-"Please be sure to add a separate /boot partition" >+"A separate /boot partition will be required." > msgstr "" > > #: fsedit.pm:465 fsedit.pm:483 >@@ -2663,7 +2660,7 @@ > msgid "" > "You've selected the LVM Logical Volume as root (/).\n" > "The bootloader is not able to handle this when the volume spans physical volumes.\n" >-"You should create a separate /boot partition first" >+"A separate /boot partition will be required." > msgstr "" > > #: fsedit.pm:475 fsedit.pm:477 >@@ -2674,7 +2671,7 @@ > #: fsedit.pm:479 fsedit.pm:481 > #, c-format > msgid "" >-"You need a true filesystem (ext2/3/4, reiserfs, xfs, or jfs) for this mount point\n" >+"This mount point requires a Linux file system (ext2/3/4, reiserfs, xfs, or jfs)\n" > "" > msgstr "" > >@@ -2790,7 +2787,7 @@ > > #: harddrake/data.pm:262 > #, c-format >-msgid "Videocard" >+msgid "Video card" > msgstr "" > > #: harddrake/data.pm:271 >@@ -2800,17 +2797,17 @@ > > #: harddrake/data.pm:279 > #, c-format >-msgid "Tvcard" >+msgid "TV card" > msgstr "" > > #: harddrake/data.pm:289 > #, c-format >-msgid "Other MultiMedia devices" >+msgid "Other multimedia devices" > msgstr "" > > #: harddrake/data.pm:298 > #, c-format >-msgid "Soundcard" >+msgid "Sound card" > msgstr "" > > #: harddrake/data.pm:312 >@@ -2855,7 +2852,7 @@ > > #: harddrake/data.pm:393 > #, c-format >-msgid "Ethernetcard" >+msgid "Ethernet card" > msgstr "" > > #: harddrake/data.pm:410 >@@ -2896,7 +2893,7 @@ > > #: harddrake/data.pm:488 > #, c-format >-msgid "Tablet and touchscreen" >+msgid "Tablet and touch screen" > msgstr "" > > #: harddrake/data.pm:497 >@@ -2931,7 +2928,7 @@ > > #: harddrake/sound.pm:303 > #, c-format >-msgid "Please Wait... Applying the configuration" >+msgid "Please wait, applying configuration" > msgstr "" > > #: harddrake/sound.pm:366 >@@ -2998,7 +2995,7 @@ > #: harddrake/sound.pm:414 > #, c-format > msgid "" >-"OSS (Open Sound System) was the first sound API. It's an OS independent sound API (it's available on most UNIX(tm) systems) but it's a very basic and limited API.\n" >+"OSS (Open Sound System) was the first sound API. It's an OS independent sound API (it's available on most UNIX-like systems) but it's a very basic and limited API.\n" > "What's more, OSS drivers all reinvent the wheel.\n" > "\n" > "ALSA (Advanced Linux Sound Architecture) is a modularized architecture which\n" >@@ -3121,7 +3118,7 @@ > #: harddrake/v4l.pm:475 > #, c-format > msgid "" >-"For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-detect the rights parameters.\n" >+"For most modern TV cards, the bttv module should configure it automatically.\n" > "If your card is misdetected, you can force the right tuner and card types here. Just select your TV card parameters if needed." > msgstr "" > >@@ -4595,8 +4592,8 @@ > #: messages.pm:102 > #, c-format > msgid "" >-"Congratulations, installation is complete.\n" >-"Remove the boot media and press Enter to reboot.\n" >+"Congratulations, installation is complete!\n" >+"Remove any installation media and click the Reboot button to continue.\n" > "\n" > "\n" > "For information on fixes which are available for this release of Mageia,\n" >@@ -4606,8 +4603,7 @@ > "%s\n" > "\n" > "\n" >-"Information on configuring your system is available in the post\n" >-"install chapter of the Official Mageia User's Guide." >+"For documentation and information on contributing, visit http://mageia.org." > msgstr "" > > #: modules/interactive.pm:19 >@@ -4732,17 +4728,17 @@ > > #: mygtk2.pm:1541 mygtk2.pm:1542 > #, c-format >-msgid "Password is trivial to guess" >+msgid "Your password may be too simple" > msgstr "" > > #: mygtk2.pm:1543 > #, c-format >-msgid "Password should be resistant to basic attacks" >+msgid "Your password is marginally secure" > msgstr "" > > #: mygtk2.pm:1544 mygtk2.pm:1545 > #, c-format >-msgid "Password seems secure" >+msgid "Your password is secure" > msgstr "" > > #: partition_table.pm:415 >@@ -4758,16 +4754,15 @@ > #: partition_table.pm:545 > #, c-format > msgid "" >-"You have a hole in your partition table but I cannot use it.\n" >+"You have a hole in your partition table.\n" > "The only solution is to move your primary partitions to have the hole next to the extended partitions." > msgstr "" > > #: partition_table/raw.pm:299 > #, c-format > msgid "" >-"Something bad is happening on your hard disk drive. \n" >-"A test to check the integrity of data has failed. \n" >-"It means writing anything on the disk will end up with random, corrupted data." >+"Data integirty checks have failed. \n" >+"Your hard drive may be corrupt or malfunctioning." > msgstr "" > > #: pkgs.pm:252 pkgs.pm:255 pkgs.pm:268 >@@ -4787,12 +4782,12 @@ > > #: pkgs.pm:269 > #, c-format >-msgid "We have detected that some packages are not needed for your system configuration." >+msgid "Based off your system configuration, Setup has determined that some packages may be safely removed." > msgstr "" > > #: pkgs.pm:270 > #, c-format >-msgid "We will remove the following packages, unless you choose otherwise:" >+msgid "Unless you choose otherwise, the following packages will be removed:" > msgstr "" > > #: pkgs.pm:273 pkgs.pm:274 >@@ -6216,6 +6211,6 @@ > > #: wizards.pm:99 > #, c-format >-msgid "Installation failed" >+msgid "Installation failed... :(" > msgstr "" >
Index: libDrakX.pot =================================================================== --- libDrakX.pot (revision 1671) +++ libDrakX.pot (working copy) @@ -15,12 +15,12 @@ #: any.pm:258 any.pm:955 diskdrake/interactive.pm:648 diskdrake/interactive.pm:871 diskdrake/interactive.pm:931 diskdrake/interactive.pm:1033 diskdrake/interactive.pm:1263 diskdrake/interactive.pm:1315 do_pkgs.pm:241 do_pkgs.pm:287 harddrake/sound.pm:303 interactive.pm:587 pkgs.pm:285 #, c-format -msgid "Please wait" +msgid "Please wait..." msgstr "" #: any.pm:258 #, c-format -msgid "Bootloader installation in progress" +msgid "Installing the bootloader..." msgstr "" #: any.pm:269 @@ -60,7 +60,7 @@ #: any.pm:337 #, c-format -msgid "Bootloader Installation" +msgid "Bootloader installation" msgstr "" #: any.pm:341 @@ -125,7 +125,7 @@ #: any.pm:430 #, c-format -msgid "Delay before booting default image" +msgid "Bootloader timeout (seconds)" msgstr "" #: any.pm:431 @@ -300,7 +300,7 @@ #: any.pm:597 #, c-format -msgid "Other OS (SunOS...)" +msgid "Other OS (Solaris, OpenIndiana...)" msgstr "" #: any.pm:598 @@ -442,17 +442,17 @@ #: any.pm:955 #, c-format -msgid "Please wait, adding media..." +msgid "Please wait, adding source..." msgstr "" #: any.pm:985 security/l10n.pm:14 #, c-format -msgid "Autologin" +msgid "Auto login" msgstr "" #: any.pm:986 #, c-format -msgid "I can set up your computer to automatically log on one user." +msgid "A selected user can be automatically logged in on startup." msgstr "" #: any.pm:987 @@ -482,7 +482,7 @@ #: any.pm:1074 #, c-format -msgid "License agreement" +msgid "License notice" msgstr "" #: any.pm:1076 diskdrake/dav.pm:26 @@ -507,7 +507,7 @@ #: any.pm:1110 any.pm:1172 #, c-format -msgid "Please choose a language to use" +msgid "Select your installation language" msgstr "" #: any.pm:1138 @@ -555,7 +555,7 @@ #: any.pm:1230 #, c-format -msgid "Here is the full list of available countries" +msgid "List of countries" msgstr "" #: any.pm:1231 @@ -596,7 +596,7 @@ #: any.pm:1325 #, c-format msgid "" -"Would you like to allow users to share some of their directories?\n" +"Would you like to allow users to share folders?\n" "Allowing this will permit users to simply click on \"Share\" in konqueror and nautilus.\n" "\n" "\"Custom\" permit a per-user granularity.\n" @@ -605,12 +605,12 @@ #: any.pm:1337 #, c-format -msgid "NFS: the traditional Unix file sharing system, with less support on Mac and Windows." +msgid "NFS: the traditional Unix file sharing system." msgstr "" #: any.pm:1340 #, c-format -msgid "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux systems." +msgid "SMB: a file sharing system used by Windows and other modern operating systems." msgstr "" #: any.pm:1348 @@ -626,7 +626,7 @@ #: any.pm:1378 #, c-format msgid "" -"The per-user sharing uses the group \"fileshare\". \n" +"Per-user sharing uses the group \"fileshare\". \n" "You can use userdrake to add a user to this group." msgstr "" @@ -647,7 +647,7 @@ #: any.pm:1524 #, c-format -msgid "Which is your timezone?" +msgid "Select your time zone" msgstr "" #: any.pm:1547 any.pm:1549 @@ -657,7 +657,7 @@ #: any.pm:1550 #, c-format -msgid "What is the best time?" +msgid "What time is your system set to?" msgstr "" #: any.pm:1554 @@ -727,7 +727,7 @@ #: authentication.pm:66 #, c-format -msgid "Tells your computer to use LDAP for some or all authentication. LDAP consolidates certain types of information within your organization." +msgid "Use LDAP for some or all authentication. LDAP consolidates certain types of information into a simple profile." msgstr "" #: authentication.pm:67 @@ -1181,7 +1181,7 @@ #: diskdrake/hd_gtk.pm:73 #, c-format -msgid "Click on a partition, choose a filesystem type then choose an action" +msgid "Select a partition, file system type, and action" msgstr "" #: diskdrake/hd_gtk.pm:110 diskdrake/interactive.pm:1181 diskdrake/interactive.pm:1191 diskdrake/interactive.pm:1244 @@ -1212,14 +1212,14 @@ #: diskdrake/hd_gtk.pm:228 #, c-format msgid "" -"You have one big Microsoft Windows partition.\n" -"I suggest you first resize that partition\n" +"Your computer has a large Windows partition.\n" +"It is suggested that you resize the partition\n" "(click on it, then click on \"Resize\")" msgstr "" #: diskdrake/hd_gtk.pm:230 #, c-format -msgid "Please click on a partition" +msgid "Select a partition" msgstr "" #: diskdrake/hd_gtk.pm:244 diskdrake/smbnfs_gtk.pm:63 @@ -1344,7 +1344,7 @@ #: diskdrake/interactive.pm:301 fs/partitioning_wizard.pm:283 #, c-format -msgid "You need to reboot for the partition table modifications to take effect" +msgid "You must reboot for the partition table changes to take effect." msgstr "" #: diskdrake/interactive.pm:306 @@ -1387,7 +1387,7 @@ #: diskdrake/interactive.pm:372 #, c-format -msgid "I cannot add any more partitions" +msgid "You cannot add any more partitions" msgstr "" #: diskdrake/interactive.pm:373 @@ -1533,9 +1533,9 @@ #: diskdrake/interactive.pm:542 #, c-format msgid "" -"You cannot create a new partition\n" -"(since you reached the maximal number of primary partitions).\n" -"First remove a primary partition and create an extended partition." +"You cannot create a new partition, \n" +"since you reached the maximal number of primary partitions.\n" +"Remove a primary partition and create an extended partition." msgstr "" #: diskdrake/interactive.pm:569 diskdrake/interactive.pm:1285 fs/partitioning.pm:48 @@ -1550,7 +1550,7 @@ #: diskdrake/interactive.pm:623 #, c-format -msgid "After changing type of partition %s, all data on this partition will be lost" +msgid "Changing the partition type will erase all data on %s" msgstr "" #: diskdrake/interactive.pm:639 @@ -1560,7 +1560,7 @@ #: diskdrake/interactive.pm:641 diskdrake/removable.pm:47 #, c-format -msgid "Which filesystem do you want?" +msgid "Select a file system" msgstr "" #: diskdrake/interactive.pm:648 @@ -1575,12 +1575,12 @@ #: diskdrake/interactive.pm:685 #, c-format -msgid "Beware, this will be written to disk as soon as you validate!" +msgid "This will be written to disk as soon as you validate!" msgstr "" #: diskdrake/interactive.pm:686 #, c-format -msgid "Beware, this will be written to disk only after formatting!" +msgid "This will be written to disk after formatting!" msgstr "" #: diskdrake/interactive.pm:688 @@ -1637,7 +1637,7 @@ #: diskdrake/interactive.pm:825 #, c-format -msgid "After resizing partition %s, all data on this partition will be lost" +msgid "Resizing will remove all data on %s" msgstr "" #: diskdrake/interactive.pm:832 @@ -1664,7 +1664,7 @@ #, c-format msgid "" "To ensure data integrity after resizing the partition(s),\n" -"filesystem checks will be run on your next boot into Microsoft Windows®" +"Windows may automatically perform a disk check upon its next startup" msgstr "" #: diskdrake/interactive.pm:946 diskdrake/interactive.pm:1485 @@ -1806,7 +1806,7 @@ #: diskdrake/interactive.pm:1244 #, c-format -msgid "Partition table of drive %s is going to be written to disk" +msgid "The new partition table for %s will be written to disk" msgstr "" #: diskdrake/interactive.pm:1263 fs/format.pm:102 fs/format.pm:109 @@ -1816,7 +1816,7 @@ #: diskdrake/interactive.pm:1276 #, c-format -msgid "After formatting partition %s, all data on this partition will be lost" +msgid "Formatting will erase all data on %s" msgstr "" #: diskdrake/interactive.pm:1299 @@ -2190,7 +2190,7 @@ #: fs/any.pm:17 #, c-format -msgid "An error occurred - no valid devices were found on which to create new filesystems. Please check your hardware for the cause of this problem" +msgid "No valid devices to create filesystems on were found." msgstr "" #: fs/any.pm:75 fs/partitioning_wizard.pm:62 @@ -2205,7 +2205,7 @@ #: fs/format.pm:125 #, c-format -msgid "I do not know how to set label on %s with type %s" +msgid "Setup cannot set the label on %s with type %s" msgstr "" #: fs/format.pm:134 @@ -2215,7 +2215,7 @@ #: fs/format.pm:175 #, c-format -msgid "I do not know how to format %s in type %s" +msgid "Setup cannot format %s in type %s" msgstr "" #: fs/format.pm:180 fs/format.pm:182 @@ -2425,12 +2425,12 @@ #: fs/partitioning_wizard.pm:129 #, c-format -msgid "Computing the size of the Microsoft Windows® partition" +msgid "Computing the size of the Windows partition" msgstr "" #: fs/partitioning_wizard.pm:165 #, c-format -msgid "Use the free space on a Microsoft Windows® partition" +msgid "Use the free space on a Windows partition" msgstr "" #: fs/partitioning_wizard.pm:169 @@ -2440,22 +2440,20 @@ #: fs/partitioning_wizard.pm:172 #, c-format -msgid "Your Microsoft Windows® partition is too fragmented. Please reboot your computer under Microsoft Windows®, run the ``defrag'' utility, then restart the %s installation." +msgid "Your Windows partition is too fragmented. Please boot into Windows and run Disk Defragmenter before running %s Setup." msgstr "" #: fs/partitioning_wizard.pm:180 #, c-format msgid "" -"WARNING!\n" + +"You have chosen to resize a Windows partition\n" "\n" "\n" -"Your Microsoft Windows® partition will be now resized.\n" +"This operation may be dangerous. Be sure to run \"chkdsk\" at a command prompt to check the disk for errors,.\n" +"then make sure you have a backup of any personal data that may be lost in the process.\n" "\n" -"\n" -"Be careful: this operation is dangerous. If you have not already done so, you first need to exit the installation, run \"chkdsk c:\" from a Command Prompt under Microsoft Windows® (beware, running graphical program \"scandisk\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), optionally run defrag, then restart the installation. You should also backup your data.\n" -"\n" -"\n" -"When sure, press %s." +"To continue, press %s." msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX @@ -2471,7 +2469,7 @@ #: fs/partitioning_wizard.pm:195 #, c-format -msgid "Which size do you want to keep for Microsoft Windows® on partition %s?" +msgid "How large would you like the Windows partition %s to be?" msgstr "" #: fs/partitioning_wizard.pm:196 @@ -2481,7 +2479,7 @@ #: fs/partitioning_wizard.pm:205 #, c-format -msgid "Resizing Microsoft Windows® partition" +msgid "Resizing partition..." msgstr "" #: fs/partitioning_wizard.pm:210 @@ -2496,7 +2494,7 @@ #: fs/partitioning_wizard.pm:231 #, c-format -msgid "Remove Microsoft Windows®" +msgid "Remove Windows installation" msgstr "" #: fs/partitioning_wizard.pm:231 @@ -2538,17 +2536,17 @@ #: fs/partitioning_wizard.pm:431 fs/partitioning_wizard.pm:577 #, c-format -msgid "I cannot find any room for installing" +msgid "Setup cannot find room to install" msgstr "" #: fs/partitioning_wizard.pm:440 fs/partitioning_wizard.pm:584 #, c-format -msgid "The DrakX Partitioning wizard found the following solutions:" +msgid "Select an automatic partitioning method:" msgstr "" #: fs/partitioning_wizard.pm:510 #, c-format -msgid "Here is the content of your disk drive " +msgid "Select a disk drive " msgstr "" #: fs/partitioning_wizard.pm:594 @@ -2589,12 +2587,13 @@ #: fsedit.pm:247 #, c-format msgid "" -"I cannot read the partition table of device %s, it's too corrupted for me :(\n" -"I can try to go on, erasing over bad partitions (ALL DATA will be lost!).\n" -"The other solution is to not allow DrakX to modify the partition table.\n" -"(the error is %s)\n" +"The partition table on the device %s could not be read.(\n" +"The partition table may be corrupted, or in an unknown format.\n" +"The affected device can be ignored by Setup entirely, or have its\n" +"partition table reinitalized, erasing all data on it.\n" +"(%s)\n" "\n" -"Do you agree to lose all the partitions?\n" +"Would you like to reinitalize the device?\n" "" msgstr "" @@ -2619,8 +2618,7 @@ #, c-format msgid "" "You've selected a software RAID partition as root (/).\n" -"No bootloader is able to handle this without a /boot partition.\n" -"Please be sure to add a separate /boot partition" +"A separate /boot partition will be required." msgstr "" #: fsedit.pm:440 @@ -2644,8 +2642,7 @@ #, c-format msgid "" "You've selected an encrypted partition as root (/).\n" -"No bootloader is able to handle this without a /boot partition.\n" -"Please be sure to add a separate /boot partition" +"A separate /boot partition will be required." msgstr "" #: fsedit.pm:465 fsedit.pm:483 @@ -2663,7 +2660,7 @@ msgid "" "You've selected the LVM Logical Volume as root (/).\n" "The bootloader is not able to handle this when the volume spans physical volumes.\n" -"You should create a separate /boot partition first" +"A separate /boot partition will be required." msgstr "" #: fsedit.pm:475 fsedit.pm:477 @@ -2674,7 +2671,7 @@ #: fsedit.pm:479 fsedit.pm:481 #, c-format msgid "" -"You need a true filesystem (ext2/3/4, reiserfs, xfs, or jfs) for this mount point\n" +"This mount point requires a Linux file system (ext2/3/4, reiserfs, xfs, or jfs)\n" "" msgstr "" @@ -2790,7 +2787,7 @@ #: harddrake/data.pm:262 #, c-format -msgid "Videocard" +msgid "Video card" msgstr "" #: harddrake/data.pm:271 @@ -2800,17 +2797,17 @@ #: harddrake/data.pm:279 #, c-format -msgid "Tvcard" +msgid "TV card" msgstr "" #: harddrake/data.pm:289 #, c-format -msgid "Other MultiMedia devices" +msgid "Other multimedia devices" msgstr "" #: harddrake/data.pm:298 #, c-format -msgid "Soundcard" +msgid "Sound card" msgstr "" #: harddrake/data.pm:312 @@ -2855,7 +2852,7 @@ #: harddrake/data.pm:393 #, c-format -msgid "Ethernetcard" +msgid "Ethernet card" msgstr "" #: harddrake/data.pm:410 @@ -2896,7 +2893,7 @@ #: harddrake/data.pm:488 #, c-format -msgid "Tablet and touchscreen" +msgid "Tablet and touch screen" msgstr "" #: harddrake/data.pm:497 @@ -2931,7 +2928,7 @@ #: harddrake/sound.pm:303 #, c-format -msgid "Please Wait... Applying the configuration" +msgid "Please wait, applying configuration" msgstr "" #: harddrake/sound.pm:366 @@ -2998,7 +2995,7 @@ #: harddrake/sound.pm:414 #, c-format msgid "" -"OSS (Open Sound System) was the first sound API. It's an OS independent sound API (it's available on most UNIX(tm) systems) but it's a very basic and limited API.\n" +"OSS (Open Sound System) was the first sound API. It's an OS independent sound API (it's available on most UNIX-like systems) but it's a very basic and limited API.\n" "What's more, OSS drivers all reinvent the wheel.\n" "\n" "ALSA (Advanced Linux Sound Architecture) is a modularized architecture which\n" @@ -3121,7 +3118,7 @@ #: harddrake/v4l.pm:475 #, c-format msgid "" -"For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-detect the rights parameters.\n" +"For most modern TV cards, the bttv module should configure it automatically.\n" "If your card is misdetected, you can force the right tuner and card types here. Just select your TV card parameters if needed." msgstr "" @@ -4595,8 +4592,8 @@ #: messages.pm:102 #, c-format msgid "" -"Congratulations, installation is complete.\n" -"Remove the boot media and press Enter to reboot.\n" +"Congratulations, installation is complete!\n" +"Remove any installation media and click the Reboot button to continue.\n" "\n" "\n" "For information on fixes which are available for this release of Mageia,\n" @@ -4606,8 +4603,7 @@ "%s\n" "\n" "\n" -"Information on configuring your system is available in the post\n" -"install chapter of the Official Mageia User's Guide." +"For documentation and information on contributing, visit http://mageia.org." msgstr "" #: modules/interactive.pm:19 @@ -4732,17 +4728,17 @@ #: mygtk2.pm:1541 mygtk2.pm:1542 #, c-format -msgid "Password is trivial to guess" +msgid "Your password may be too simple" msgstr "" #: mygtk2.pm:1543 #, c-format -msgid "Password should be resistant to basic attacks" +msgid "Your password is marginally secure" msgstr "" #: mygtk2.pm:1544 mygtk2.pm:1545 #, c-format -msgid "Password seems secure" +msgid "Your password is secure" msgstr "" #: partition_table.pm:415 @@ -4758,16 +4754,15 @@ #: partition_table.pm:545 #, c-format msgid "" -"You have a hole in your partition table but I cannot use it.\n" +"You have a hole in your partition table.\n" "The only solution is to move your primary partitions to have the hole next to the extended partitions." msgstr "" #: partition_table/raw.pm:299 #, c-format msgid "" -"Something bad is happening on your hard disk drive. \n" -"A test to check the integrity of data has failed. \n" -"It means writing anything on the disk will end up with random, corrupted data." +"Data integirty checks have failed. \n" +"Your hard drive may be corrupt or malfunctioning." msgstr "" #: pkgs.pm:252 pkgs.pm:255 pkgs.pm:268 @@ -4787,12 +4782,12 @@ #: pkgs.pm:269 #, c-format -msgid "We have detected that some packages are not needed for your system configuration." +msgid "Based off your system configuration, Setup has determined that some packages may be safely removed." msgstr "" #: pkgs.pm:270 #, c-format -msgid "We will remove the following packages, unless you choose otherwise:" +msgid "Unless you choose otherwise, the following packages will be removed:" msgstr "" #: pkgs.pm:273 pkgs.pm:274 @@ -6216,6 +6211,6 @@ #: wizards.pm:99 #, c-format -msgid "Installation failed" +msgid "Installation failed... :(" msgstr ""
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 1793
:
562
|
563
|
570
| 571