2 files changed, 300 insertions, 310 deletions

diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index ef8f44c86..f5c5a3fbf 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -2833,30 +2833,37 @@ msgstr ""
 msgid ""
 "GNU/Linux is a multiuser system, and this means that each user can have his\n"
 "own preferences, his own files and so on. You can read the ``User Guide''\n"
-"to learn more. But unlike \"root\", which is the administrator, the users\n"
-"you add here will not be entitled to change anything except their own files\n"
-"and their own configuration. You will have to create at least one regular\n"
-"user for yourself. That account is where you should log in for routine use.\n"
-"Although it is very practical to log in as \"root\" everyday, it may also\n"
-"be very dangerous! The slightest mistake could mean that your system would\n"
-"not work any more. If you make a serious mistake as a regular user, you may\n"
-"only lose some information, but not the entire system.\n"
-"\n"
-"First, you have to enter your real name. This is not mandatory, of course -\n"
-"as you can actually enter whatever you want. DrakX will then take the first\n"
-"word you have entered in the box and will bring it over to the \"User\n"
+"to learn more this concept. But unlike \"root\", which is the\n"
+"administrator, the users you add here will not be entitled to change\n"
+"anything except their own files and their own configurations. You will have\n"
+"to create at least one regular user for yourself. That account is where you\n"
+"should log in for routine use. Although it is very practical to log in as\n"
+"\"root\" everyday, it may also be very dangerous! The slightest mistake\n"
+"could mean that your system would not work any more. If you make a serious\n"
+"mistake as a regular user, you may only lose some information, but not the\n"
+"entire system.\n"
+"\n"
+"First, you have to enter your real name. This is not mandatory, of course\n"
+"-- as you can actually enter whatever you want. DrakX will then take the\n"
+"first word you have entered in the box and will bring it over to the \"User\n"
 "name\". This is the name this particular user will use to log onto the\n"
 "system. You can change it. You then have to enter a password here. A\n"
-"non-privileged (regular) user's password is not as crucial as the \"root\"'\n"
+"non-privileged (regular) user's password is not as crucial as the \"root\"\n"
 "one from a security point of view, but that is no reason to neglect it:\n"
 "after all, your files are at risk.\n"
 "\n"
 "If you click on \"Accept user\", you can then add as many as you want. Add\n"
-"a user for each one of your friends: your father or your sister, for\n"
-"example. When you finish adding all the users you want, select \"Done\".\n"
+"a user for each one of the people meant to use that computer. When you are\n"
+"finish adding all the users you want, select \"Done\".\n"
 "\n"
 "Clicking the \"Advanced\" button allows you to change the default \"shell\"\n"
-"for that user (bash by default)."
+"for that user (bash by default).\n"
+"\n"
+"When you are finished adding all users, you will be proposed to choose a\n"
+"user which can automatically log into the system when the computer boots\n"
+"up. If you are interested in that feature (and do not care much about local\n"
+"security), choose the desired user and window manager, then click \"Yes\".\n"
+"If you are not interested in this feature, click \"No\"."
 msgstr ""
 "GNU/Linux er ett multibrukersystem, og dette betyr at hver bruker kan ha "
 "sine\n"
@@ -2904,7 +2911,7 @@ msgid ""
 "installations. If you make any changes, you must at least define a root\n"
 "partition (\"/\"). Do not choose too small a partition or you will not be\n"
 "able to install enough software. If you want to store your data on a\n"
-"separate partition, you will also need to create a partition for \"/home\"\n"
+"separate partition, you will also need to create a \"/home\" partition\n"
 "(only possible if you have more than one Linux partition available).\n"
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
@@ -3011,7 +3018,7 @@ msgid ""
 "installation (by opposition to an upgrade), a dialog will pop up proposing\n"
 "different options for a minimal installation:\n"
 "\n"
-" * \"With X\": install the fewer packages possible to have a working\n"
+" * \"With X\": install the fewest packages possible to have a working\n"
 "graphical desktop;\n"
 "\n"
 " * \"With basic documentation\": installs the base system plus basic\n"
@@ -3027,8 +3034,8 @@ msgid ""
 "total control over what will be installed.\n"
 "\n"
 "If you started the installation in \"Upgrade\" mode, you can unselect all\n"
-"groups to avoid installing any new package. This is useful for repairing or\n"
-"updating an existing system."
+"groups to avoid installing any new package. This is useful to repair or\n"
+"update an existing system."
 msgstr ""
 "Det er nх pх tide х spesifisere hvilke programmer du јnsker х installere pх\n"
 "systemet ditt. Det er tusenvis av pakker tilgjengelig for Mandrake Linux, og "
@@ -3094,9 +3101,9 @@ msgid ""
 "right. When your selection is finished, click the \"Install\" button which\n"
 "will then launch the installation process. Depending on the speed of your\n"
 "hardware and the number of packages that need to be installed, it may take\n"
-"a while to complete the process. An estimate of the time it will take to\n"
-"install everything is displayed on the screen, to help you gauge if there\n"
-"is sufficient time to enjoy a cup of coffee.\n"
+"a while to complete the process. An installation time estimate is displayed\n"
+"on the screen, to help you gauge if there is sufficient time to enjoy a cup\n"
+"of coffee.\n"
 "\n"
 "!! If a server package has been selected, either intentionally or because\n"
 "it was part of a whole group, you will be asked to confirm that you really\n"
@@ -3117,8 +3124,8 @@ msgid ""
 "The tiny floppy disk icon at the bottom of the list allows to load the\n"
 "package list chosen during a previous installation. Clicking on this icon\n"
 "will ask you to insert a floppy disk previously created at the end of\n"
-"another installation. See the second tip of last step on how to create such\n"
-"a floppy."
+"another installation. See the second tip of the previous step on how to\n"
+"create such a floppy disk."
 msgstr ""
 "Til slutt, avhengig av ditt valg av om du vil velge enkeltpakker eller\n"
 "ikke, sх vil du fх se ett tre som inneholder alle pakkene sortert pх "
@@ -3168,7 +3175,7 @@ msgid ""
 "You are now able to set up your Internet/network connection. If you wish to\n"
 "connect your computer to the Internet or to a local network, click \"OK\".\n"
 "The autodetection of network devices and modem will be launched. If this\n"
-"detection fails, uncheck the \"Use auto detection\" box next time. You may\n"
+"detection fails, uncheck the \"Use auto-detection\" box next time. You may\n"
 "also choose not to configure the network, or do it later; in that case,\n"
 "simply click the \"Cancel\" button.\n"
 "\n"
@@ -3179,8 +3186,8 @@ msgid ""
 "all the parameters from your Internet Service Provider or system\n"
 "administrator.\n"
 "\n"
-"You can consult the ``User Guide'' chapter about Internet connections for\n"
-"details about the configuration, or simply wait until your system is\n"
+"You can consult the ``Starter Guide'' chapter about Internet connections\n"
+"for details about the configuration, or simply wait until your system is\n"
 "installed and use the program described there to configure your connection.\n"
 "\n"
 "If you wish to configure the network later after installation, or if you\n"
@@ -3191,9 +3198,9 @@ msgstr ""
 msgid ""
 "You may now choose which services you wish to start at boot time.\n"
 "\n"
-"Here are presented all the services available with the current\n"
-"installation. Review them carefully and uncheck those which are not always\n"
-"needed at boot time.\n"
+"Here are listed all the services available with the current installation.\n"
+"Review them carefully and uncheck those which are not always needed at boot\n"
+"time.\n"
 "\n"
 "You can get a short explanatory text about a service by selecting a\n"
 "specific service. However, if you are not sure whether a service is useful\n"
@@ -3226,12 +3233,12 @@ msgstr ""
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrake Linux rely. In this section, DrakX\n"
-"will try to configure X automatically.\n"
+"WindowMaker, etc.) bundled with Mandrake Linux rely.\n"
 "\n"
-"It is extremely rare for it to fail, unless the hardware is very old (or\n"
-"very new). If it succeeds, it will start X automatically with the best\n"
-"resolution possible, depending on the size of the monitor. A window will\n"
+"You will be presented the list of available resolutions and color depth\n"
+"available for your hardware. Choose the one that best suit your needs (you\n"
+"will be able to change that after installation though). When you are\n"
+"satisfied with the sample shown in the monitor, click \"OK\". A window will\n"
 "then appear and ask you if you can see it.\n"
 "\n"
 "If you are doing an \"Expert\" installation, you will enter the X\n"
@@ -3241,7 +3248,7 @@ msgid ""
 "If you can see the message during the test, and answer \"Yes\", then DrakX\n"
 "will proceed to the next step. If you cannot see the message, it simply\n"
 "means that the configuration was wrong and the test will automatically end\n"
-"after 10 seconds, restoring the screen. Refer then to the Video\n"
+"after 10 seconds, restoring the screen. Refer then to the video\n"
 "configuration section of the user guide for more information on how to\n"
 "configure your display."
 msgstr ""
@@ -3262,12 +3269,12 @@ msgid ""
 "at the prompt. But in case your computer cannot boot from the CD-ROM, you\n"
 "should come back to this step for help in at least two situations:\n"
 "\n"
-" * when installing the bootloader, DrakX will rewrite the boot sector (MBR)\n"
-"of your main disk (unless you are using another boot manager), to allow you\n"
-"to start up with either Windows or GNU/Linux (assuming you have Windows in\n"
-"your system). If you need to reinstall Windows, the Microsoft install\n"
-"process will rewrite the boot sector, and then you will not be able to\n"
-"start GNU/Linux!\n"
+" * when installing the bootloader, DrakX will rewrite the boot sector (\n"
+"MBR) of your main disk (unless you are using another boot manager), to\n"
+"allow you to start up with either Windows or GNU/Linux (assuming you have\n"
+"Windows in your system). If you need to reinstall Windows, the Microsoft\n"
+"install process will rewrite the boot sector, and then you will not be able\n"
+"to start GNU/Linux!\n"
 "\n"
 " * if a problem arises and you cannot start up GNU/Linux from the hard\n"
 "disk, this floppy disk will be the only means of starting up GNU/Linux. It\n"
@@ -3283,12 +3290,11 @@ msgstr ""
 
 #: ../../help.pm_.c:270
 msgid ""
-"At this point, you need to choose where you want to install the Mandrake\n"
-"Linux operating system on your hard drive. If your hard drive is empty or\n"
-"if an existing operating system is using all the available space, you will\n"
-"need to partition it. Basically, partitioning a hard drive consists of\n"
-"logically dividing it to create space to install your new Mandrake Linux\n"
-"system.\n"
+"You now need to choose where you want to install the Mandrake Linux\n"
+"operating system on your hard drive. If your hard drive is empty or if an\n"
+"existing operating system is using all the available space, you will need\n"
+"to partition it. Basically, partitioning a hard drive consists of logically\n"
+"dividing it to create space to install your new Mandrake Linux system.\n"
 "\n"
 "Because the partitioning process' effects are usually irreversible,\n"
 "partitioning can be intimidating and stressful if you are an inexperienced\n"
@@ -3297,9 +3303,9 @@ msgid ""
 "\n"
 "If you are running the installation in Expert mode, you will enter\n"
 "DiskDrake, the Mandrake Linux partitioning tool, which allows you to\n"
-"fine-tune your partitions. See the DiskDrake section in the ``User Guide''.\n"
-"From the installation interface, you can use the wizards as described here\n"
-"by clicking the dialog's \"Wizard\" button.\n"
+"fine-tune your partitions. See the DiskDrake section in the ``Starter\n"
+"Guide''. From the installation interface, you can use the wizards as\n"
+"described here by clicking the dialog's \"Wizard\" button.\n"
 "\n"
 "If partitions have already been defined, either from a previous\n"
 "installation or from another partitioning tool, simply select those to\n"
@@ -3307,7 +3313,7 @@ msgid ""
 "\n"
 "If partitions are not defined, you will need to create them using the\n"
 "wizard. Depending on your hard drive configuration, several options are\n"
-"available:\n"
+"available.\n"
 "\n"
 " * \"Use free space\": this option will simply lead to an automatic\n"
 "partitioning of your blank drive(s). You will not be prompted further;\n"
@@ -3318,9 +3324,9 @@ msgid ""
 "each of the partitions. The legacy mount points are selected by default,\n"
 "and you should generally keep them.\n"
 "\n"
-" * \"Use the free space on the Windows; partition\": if Microsoft Windows\n"
-"is installed on your hard drive and takes all the space available on it,\n"
-"you have to create free space for Linux data. To do so, you can delete your\n"
+" * \"Use the free space on the Windows partition\": if Microsoft Windows is\n"
+"installed on your hard drive and takes all the space available on it, you\n"
+"have to create free space for Linux data. To do so, you can delete your\n"
 "Microsoft Windows partition and data (see ``Erase entire disk'' or ``Expert\n"
 "mode'' solutions) or resize your Microsoft Windows partition. Resizing can\n"
 "be performed without the loss of any data, provided you previously\n"
@@ -3347,16 +3353,16 @@ msgid ""
 "   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
 " * \"Expert mode\": choose this option if you want to manually partition\n"
-"your hard drive. Be careful - it is a powerful but dangerous choice. You\n"
+"your hard drive. Be careful -- it is a powerful but dangerous option. You\n"
 "can very easily lose all your data. Hence, do not choose this unless you\n"
-"know what you are doing. To know how do use the DiskDrake utility used\n"
-"here, refer to the section ``Managing Your Partitions'' of the ````User\n"
+"know what you are doing. To know how to use the DiskDrake utility used\n"
+"here, refer to the section ``Managing Your Partitions'' of the ````Starter\n"
 "Guide''''"
 msgstr ""
 
 #: ../../help.pm_.c:341
 msgid ""
-"There you are. Installation is now complete and your GNU/Linux system is\n"
+"There you are. Installation is now completed and your GNU/Linux system is\n"
 "ready to use. Just click \"OK\" to reboot the system. You can start\n"
 "GNU/Linux or Windows, whichever you prefer (if you are dual-booting), as\n"
 "soon as the computer has booted up again.\n"
@@ -3390,7 +3396,7 @@ msgstr ""
 #: ../../help.pm_.c:372
 msgid ""
 "Any partitions that have been newly defined must be formatted for use\n"
-"(formatting means creating a filesystem).\n"
+"(formatting means creating a filesystem on it).\n"
 "\n"
 "At this time, you may wish to reformat some already existing partitions to\n"
 "erase any data they contain. If you wish to do that, please select those\n"
@@ -3404,7 +3410,7 @@ msgid ""
 "\n"
 "Please be careful when selecting partitions. After formatting, all data on\n"
 "the selected partitions will be deleted and you will not be able to recover\n"
-"any of it.\n"
+"it.\n"
 "\n"
 "Click on \"OK\" when you are ready to format partitions.\n"
 "\n"
@@ -3444,9 +3450,9 @@ msgstr ""
 msgid ""
 "Before continuing, you should read carefully the terms of the license. It\n"
 "covers the whole Mandrake Linux distribution, and if you do not agree with\n"
-"all the terms in it, click on the \"Refuse\" button which will immediately\n"
-"terminate the installation. To continue with the installation, click on the\n"
-"\"Accept\" button."
+"all the terms included in it, click on the \"Refuse\" button which will\n"
+"immediately terminate the installation. To continue with the installation,\n"
+"click on the \"Accept\" button."
 msgstr ""
 "Fјr du gхr videre bјr du lese lisensen nјye.\n"
 "Den dekker hele Mandrake Linux distribusjonen og hvis du ikke er enig\n"
@@ -3494,16 +3500,16 @@ msgid ""
 "drive;\n"
 "\n"
 " * \"Auto allocate\": this option enables to automatically create ext3 and\n"
-"swap partitions in free space of your hard drive;\n"
+"swap partitions on your hard drive's free space;\n"
 "\n"
 "\"More\": gives access to additional features:\n"
 "\n"
 " * \"Save partition table\": saves the partition table to a floppy. Useful\n"
-"for later partition-table recovery if necessary. It is strongly recommended\n"
-"to perform this step;\n"
+"for later partition-table recovery, if necessary. It is strongly\n"
+"recommended to perform this step;\n"
 "\n"
 " * \"Restore partition table\": allows to restore a previously saved\n"
-"partition table from floppy disk;\n"
+"partition table from a floppy disk;\n"
 "\n"
 " * \"Rescue partition table\": if your partition table is damaged, you can\n"
 "try to recover it using this option. Please be careful and remember that it\n"
@@ -3703,40 +3709,38 @@ msgstr "Vцr tхlmodig. Denne operasjonen kan ta flere minutter."
 #: ../../help.pm_.c:541
 msgid ""
 "DrakX now needs to know if you want to perform a default (\"Recommended\")\n"
-"installation or if you want to have greater control (\"Expert\"). You can\n"
-"also choose to do a new install or an upgrade of an existing Mandrake Linux\n"
-"system:\n"
+"installation or if you want to have greater control (\"Expert\") over your\n"
+"installation. You can also choose to do a new installation or upgrade your\n"
+"existing Mandrake Linux system:\n"
 "\n"
-" * \"Install\": completely wipes out the old system, however, depending on\n"
+" * \"Install\": completely wipes out the old system. However, depending on\n"
 "what is currently installed on your machine, you may be able to keep some\n"
 "old partitions (Linux or otherwise) unchanged;\n"
 "\n"
 " * \"Upgrade\": this installation class allows to simply update the\n"
-"packages currently installed on your Mandrake Linux system. It keeps the\n"
-"current partitions of your hard drives as well as user configurations. All\n"
-"other configuration steps remain available, similar to a normal\n"
-"installation;\n"
+"packages currently installed on your Mandrake Linux system. It keeps your\n"
+"hard drives' current partitions as well as user configurations. All other\n"
+"configuration steps remain available, similar to a normal installation;\n"
 "\n"
 " * \"Upgrade Packages Only\": this new installation class allows you to\n"
 "upgrade an existing Mandrake Linux system while keeping all system\n"
 "configurations unchanged. Adding new packages to the current installation\n"
 "is also possible.\n"
 "\n"
-"Upgrades should work fine on Mandrake Linux systems containing version\n"
-"\"8.1\" or later.\n"
+"Upgrades should work fine on Mandrake Linux systems using version \"8.1\"\n"
+"or later.\n"
 "\n"
-"Depending on your knowledge of GNU/Linux, select one of the following\n"
-"choices:\n"
+"Depending on your GNU/Linux knowledge, select one of the following choices:\n"
 "\n"
 " * Recommended: choose this if you have never installed a GNU/Linux\n"
 "operating system. The installation will be very easy and you will only be\n"
 "asked a few questions;\n"
 "\n"
-" * Expert: if you have a good understanding of GNU/Linux, you may wish to\n"
+" * Expert: if you have a good GNU/Linux understanding, you may wish to\n"
 "perform a highly customized installation. Some of the decisions you will\n"
-"have to make may be difficult if you do not have good knowledge of\n"
-"GNU/Linux, so it is not recommended that those without a fair amount of\n"
-"experience select this installation class."
+"have to make may be difficult if you do not have good GNU/Linux knowledge,\n"
+"so it is not recommended that those without a fair amount of experience\n"
+"select this installation class."
 msgstr ""
 
 #: ../../help.pm_.c:578
@@ -3753,8 +3757,8 @@ msgid ""
 "supported keyboards.\n"
 "\n"
 "If you choose a keyboard layout based on a non-latin alphabet, you will be\n"
-"asked on next dialog to choose the key binding that will switch the\n"
-"keyboard layout between the latin and non latin layouts."
+"asked in the next dialog to choose the key binding that will switch the\n"
+"keyboard layout between the latin and non-latin layouts."
 msgstr ""
 
 #: ../../help.pm_.c:594
@@ -3766,22 +3770,26 @@ msgid ""
 "Clicking on the \"Advanced\" button will allow you to select other\n"
 "languages to be installed on your workstation. Selecting other languages\n"
 "will install the language-specific files for system documentation and\n"
-"applications. For example, if you will host users from Spain on your\n"
-"machine, select English as the main language in the tree view and in the\n"
-"Advanced section click on the box corresponding to \"Spanish|Spain\".\n"
+"applications. For example, if you host users from Spain on your machine,\n"
+"select English as the main language in the tree view and in the Advanced\n"
+"section, click on the box corresponding to \"Spanish|Spain\".\n"
 "\n"
 "Note that multiple languages may be installed. Once you have selected any\n"
-"additional locales, click the \"OK\" button to continue."
+"additional locales, click the \"OK\" button to continue.\n"
+"\n"
+"To switch from one language to the other, you can launch the\n"
+"\"/usr/sbin/localedrake\" command as \"root\" to change the whole system\n"
+"language, or as a simple user to only change that user's default language."
 msgstr ""
 
 #: ../../help.pm_.c:609
 msgid ""
-"DrakX generally detects the number of buttons your mouse has. If not, it\n"
-"assumes you have a two-button mouse and will set it up for third-button\n"
+"DrakX generally detects the number of buttons your mouse possesses. If not,\n"
+"it assumes you have a two-button mouse and will set it up for third-button\n"
 "emulation. DrakX will automatically know whether it is a PS/2, serial or\n"
 "USB mouse.\n"
 "\n"
-"If you wish to specify a different type of mouse select the appropriate\n"
+"If you wish to specify a different type of mouse, select the appropriate\n"
 "type from the provided list.\n"
 "\n"
 "If you choose a mouse other than the default, a test screen will be\n"
@@ -3789,12 +3797,12 @@ msgid ""
 "correct. If the mouse is not working well, press the space bar or [Return]\n"
 "to \"Cancel\" and choose again.\n"
 "\n"
-"Wheel mouses are sometimes not automatically detected. You will need to\n"
+"Sometimes, wheel mouses are not automatically detected. You will need to\n"
 "manually select it in the list. Be sure to select the one corresponding to\n"
 "the correct port it is attached to. After you have pressed the \"OK\"\n"
-"button, a mouse image is displayed. You then need to move the wheel of your\n"
-"mouse to activate it correctly. Then test all buttons and movements are\n"
-"correct."
+"button, a mouse image will be displayed. You then need to move the wheel of\n"
+"your mouse to activate it correctly. Then test that all buttons and\n"
+"movements are correct."
 msgstr ""
 
 #: ../../help.pm_.c:630
@@ -3807,21 +3815,21 @@ msgstr ""
 
 #: ../../help.pm_.c:634
 msgid ""
-"This is the most crucial decision point for the security of your GNU/Linux\n"
-"system: you have to enter the \"root\" password. \"root\" is the system\n"
-"administrator and is the only one authorized to make updates, add users,\n"
-"change the overall system configuration, and so on. In short, \"root\" can\n"
-"do everything! That is why you must choose a password that is difficult to\n"
-"guess - DrakX will tell you if it is too easy. As you can see, you can\n"
-"choose not to enter a password, but we strongly advise you against this if\n"
-"only for one reason: do not think that because you booted GNU/Linux that\n"
-"your other operating systems are safe from mistakes. Since \"root\" can\n"
-"overcome all limitations and unintentionally erase all data on partitions\n"
-"by carelessly accessing the partitions themselves, it is important for it\n"
-"to be difficult to become \"root\".\n"
+"This is the most crucial decision in regards with the security of your\n"
+"GNU/Linux system: you have to enter the \"root\" password. \"Root\" is the\n"
+"system administrator and is the only one authorized to make updates, add\n"
+"users, change the overall system configuration, and so on. In short,\n"
+"\"root\" can do everything! That is why you must choose a password that is\n"
+"difficult to guess -- DrakX will tell you if it is too easy. As you can\n"
+"see, you can choose not to enter a password, but we strongly advise you\n"
+"against this if only for one reason: do not think that because you booted\n"
+"GNU/Linux that your other operating systems are safe from mistakes. Since\n"
+"\"root\" can overcome all limitations and unintentionally erase all data on\n"
+"partitions by carelessly accessing the partitions themselves, it is\n"
+"important for it to be difficult to become \"root\".\n"
 "\n"
 "The password should be a mixture of alphanumeric characters and at least 8\n"
-"characters long. Never write down the \"root\" password - it makes it too\n"
+"characters long. Never write down the \"root\" password -- it makes it too\n"
 "easy to compromise a system.\n"
 "\n"
 "However, please do not make the password too long or complicated because\n"
@@ -3835,9 +3843,9 @@ msgid ""
 "In Expert mode, you will be asked if you will be connecting to an\n"
 "authentication server, like NIS or LDAP.\n"
 "\n"
-"If your network uses either of the LDAP, NIS, or PDC Windows Domain\n"
-"authentication services, select the appropriate one as \"authentication\".\n"
-"If you do not know, ask your network administrator.\n"
+"If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
+"services, select the appropriate one as \"authentication\". If you have no\n"
+"clue, ask your network administrator.\n"
 "\n"
 "If your computer is not connected to any administrated network, you will\n"
 "want to choose \"Local files\" for authentication."
@@ -3845,9 +3853,9 @@ msgstr ""
 
 #: ../../help.pm_.c:670
 msgid ""
-"LILO and grub are GNU/Linux bootloaders. This stage, normally, is totally\n"
+"LILO and grub are GNU/Linux bootloaders. Normally, this stage is totally\n"
 "automated. In fact, DrakX analyzes the disk boot sector and acts\n"
-"accordingly, depending on what it finds here:\n"
+"accordingly, depending on what it finds there:\n"
 "\n"
 " * if a Windows boot sector is found, it will replace it with a grub/LILO\n"
 "boot sector. Hence, you will be able to load either GNU/Linux or another\n"
@@ -3856,14 +3864,14 @@ msgid ""
 " * if a grub or LILO boot sector is found, it will replace it with a new\n"
 "one.\n"
 "\n"
-"If in doubt, DrakX will display a dialog with various options.\n"
+"if in doubt, DrakX will display a dialog with various options.\n"
 "\n"
 " * \"Bootloader to use\": you have three choices:\n"
 "\n"
-"    * \"GRUB\": if you prefer grub (text menu).\n"
+"    * \"GRUB\": if you prefer grub (text menu);\n"
 "\n"
 "    * \"LILO with graphical menu\": if you prefer LILO with its graphical\n"
-"interface.\n"
+"interface;\n"
 "\n"
 "    * \"LILO with text menu\": if you prefer LILO with its text menu\n"
 "interface.\n"
@@ -3873,7 +3881,7 @@ msgid ""
 "second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\");\n"
 "\n"
 " * \"Delay before booting the default image\": when rebooting the computer,\n"
-"this is the delay granted to the user to choose - in the bootloader menu,\n"
+"this is the delay granted to the user to choose -- in the bootloader menu,\n"
 "another boot entry than the default one.\n"
 "\n"
 "!! Beware that if you choose not to install a bootloader (by selecting\n"
@@ -3893,7 +3901,7 @@ msgid ""
 "If there is another operating system installed on your machine, it will\n"
 "automatically be added to the boot menu. Here, you can choose to fine-tune\n"
 "the existing options. Select an entry and click \"Modify\" to modify or\n"
-"remove it; \"Add\" creates a new entry; and \"Done\" goes on to the next\n"
+"remove it. \"Add\" creates a new entry. and \"Done\" goes on to the next\n"
 "installation step.\n"
 "\n"
 "You may also not want to give access to these other operating systems to\n"
@@ -3913,7 +3921,7 @@ msgstr ""
 #: ../../help.pm_.c:724
 msgid ""
 "You must indicate where you wish to place the information required to boot\n"
-"to GNU/Linux.\n"
+"GNU/Linux.\n"
 "\n"
 "Unless you know exactly what you are doing, choose \"First sector of drive\n"
 "(MBR)\"."
@@ -3926,37 +3934,29 @@ msgstr ""
 
 #: ../../help.pm_.c:731
 msgid ""
-"Here, we select a printing system for your computer. Other OSs may offer\n"
-"you one, but Mandrake Linux offers three.\n"
+"Here, we select a printing system for your computer. Other OSes may offer\n"
+"you one, but Mandrake Linux offers two.\n"
 "\n"
-" * \"pdq\" - which means ``print, don't queue'', is the choice if you have\n"
+" * \"pdq\" -- which means ``print, don't queue'', is the choice if you have\n"
 "a direct connection to your printer and you want to be able to panic out of\n"
 "printer jams, and you do not have networked printers. It will handle only\n"
 "very simple network cases and is somewhat slow for networks. Pick \"pdq\"\n"
-"if this is your maiden voyage to GNU/Linux. You can change your choices\n"
+"if this is your first voyage to GNU/Linux. You can change your choices\n"
 "after installation by running PrinterDrake from the Mandrake Control Center\n"
 "and clicking the expert button.\n"
 "\n"
-" * \"CUPS\" - ``Common Unix Printing System'', is excellent at printing to\n"
+" * \"CUPS\" -- ``Common Unix Printing System'', is excellent at printing to\n"
 "your local printer and also halfway-around the planet. It is simple and can\n"
 "act as a server or a client for the ancient \"lpd\" printing system. Hence,\n"
 "it is compatible with the systems that went before. It can do many tricks,\n"
 "but the basic setup is almost as easy as \"pdq\". If you need this to\n"
 "emulate an \"lpd\" server, you must turn on the \"cups-lpd\" daemon. It has\n"
-"graphical front-ends for printing or choosing printer options.\n"
-"\n"
-" * \"lprNG\" - ``line printer daemon New Generation''. This system can do\n"
-"approximately the same things the others can do, but it will print to\n"
-"printers mounted on a Novell Network, because it supports the IPX protocol,\n"
-"and it can print directly to shell commands. If you have need of Novell or\n"
-"printing to commands without using a separate pipe construct, use lprNG.\n"
-"Otherwise, CUPS is preferable as it is simpler and better at working over\n"
-"networks."
+"graphical front-ends for printing or choosing printer options."
 msgstr ""
 
 #: ../../help.pm_.c:759
 msgid ""
-"DrakX now detects any IDE devices present in your computer. It will also\n"
+"DrakX now detects any IDE device present in your computer. It will also\n"
 "scan for one or more PCI SCSI cards on your system. If a SCSI card is\n"
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
@@ -3966,7 +3966,7 @@ msgid ""
 "be presented with a list of SCSI cards to choose from. Click \"No\" if you\n"
 "have no SCSI hardware. If you are unsure, you can check the list of\n"
 "hardware detected in your machine by selecting \"See hardware info\" and\n"
-"clicking \"OK\". Examine the list of hardware and then click on the \"OK\"\n"
+"clicking \"OK\". Examine the hardware list and then click on the \"OK\"\n"
 "button to return to the SCSI interface question.\n"
 "\n"
 "If you have to manually specify your adapter, DrakX will ask if you want to\n"
@@ -3975,12 +3975,7 @@ msgid ""
 "usually works well.\n"
 "\n"
 "If DrakX is not able to probe for the options which need to be passed, you\n"
-"will need to provide options to the driver manually. Please review the\n"
-"``User Guide'' (chapter 3, in the ``Collecting Information on Your\n"
-"Hardware'' section) for hints on retrieving the parameters required from\n"
-"hardware documentation, from the manufacturer's web site (if you have\n"
-"Internet access) or from Microsoft Windows (if you used this hardware with\n"
-"Windows on your system)."
+"will need to manually provide options to the driver."
 msgstr ""
 
 #: ../../help.pm_.c:786
@@ -3988,7 +3983,7 @@ msgid ""
 "You can add additional entries for yaboot, either for other operating\n"
 "systems, alternate kernels, or for an emergency boot image.\n"
 "\n"
-"For other OSs, the entry consists only of a label and the \"root\"\n"
+"For other OSes, the entry consists only of a label and the \"root\"\n"
 "partition.\n"
 "\n"
 "For Linux, there are a few possible options:\n"
@@ -4019,7 +4014,7 @@ msgid ""
 "need to allocate a large ramdisk, this option can be used;\n"
 "\n"
 " * Read-write: normally the \"root\" partition is initially brought up in\n"
-"read-only, to allow a file system check before the system becomes ``live''.\n"
+"read-only, to allow a filesystem check before the system becomes ``live''.\n"
 "Here, you can override this option;\n"
 "\n"
 " * NoVideo: should the Apple video hardware prove to be exceptionally\n"
@@ -4153,7 +4148,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Here are presented various parameters concerning your machine. Depending on\n"
-"your installed hardware, you may - or not, see the following entries:\n"
+"your installed hardware, you may (or may not), see the following entries:\n"
 "\n"
 " * \"Mouse\": check the current mouse configuration and click on the button\n"
 "to change it if necessary;\n"
@@ -4168,19 +4163,19 @@ msgid ""
 "order to configure the clock according to the time zone you are in;\n"
 "\n"
 " * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
-"configuration wizard. Consult the corresponding chapter of the ``User\n"
+"configuration wizard. Consult the correpsonding chapter of the ``Starter\n"
 "Guide'' for more information on how to setup a new printer. The interface\n"
-"presented there is similar to the one used during installation;\n"
+"presented there is similar to the one used at installation time;\n"
 "\n"
-" * \"Sound card\": if a sound card is detected on your system, it is\n"
+" * \"Sound card\": if a sound card is detected on your system, it will be\n"
 "displayed here. No modification possible at installation time;\n"
 "\n"
-" * \"TV card\": if a TV card is detected on your system, it is displayed\n"
-"here. No modification possible at installation time;\n"
+" * \"TV card\": if a TV card is detected on your system, it will be\n"
+"displayed here. No modification possible at installation time;\n"
 "\n"
-" * \"ISDN card\": if an ISDN card is detected on your system, it is\n"
+" * \"ISDN card\": if an ISDN card is detected on your system, it will be\n"
 "displayed here. You can click on the button to change the parameters\n"
-"associated with it."
+"associated to it."
 msgstr ""
 "Here are presented various parameters concerning your machine. Depending on\n"
 "your installed hardware, you may - or not, see the following entries:\n"
@@ -4228,7 +4223,7 @@ msgid ""
 "to recover any data and partitions present on this hard drive, including\n"
 "any Windows data.\n"
 "\n"
-"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"Click on \"Cancel\" to stop this operation without losing any data and\n"
 "partitions present on this hard drive."
 msgstr ""
 "Klikk pх \"OK\" hvis du јnsker х slette alle data og partisjoner pх denne\n"
diff --git a/perl-install/share/po/sp.po b/perl-install/share/po/sp.po
index d1ee15d61..4b85b012b 100644
--- a/perl-install/share/po/sp.po
+++ b/perl-install/share/po/sp.po
@@ -2866,30 +2866,37 @@ msgstr "омогући подршку за радио"
 msgid ""
 "GNU/Linux is a multiuser system, and this means that each user can have his\n"
 "own preferences, his own files and so on. You can read the ``User Guide''\n"
-"to learn more. But unlike \"root\", which is the administrator, the users\n"
-"you add here will not be entitled to change anything except their own files\n"
-"and their own configuration. You will have to create at least one regular\n"
-"user for yourself. That account is where you should log in for routine use.\n"
-"Although it is very practical to log in as \"root\" everyday, it may also\n"
-"be very dangerous! The slightest mistake could mean that your system would\n"
-"not work any more. If you make a serious mistake as a regular user, you may\n"
-"only lose some information, but not the entire system.\n"
-"\n"
-"First, you have to enter your real name. This is not mandatory, of course -\n"
-"as you can actually enter whatever you want. DrakX will then take the first\n"
-"word you have entered in the box and will bring it over to the \"User\n"
+"to learn more this concept. But unlike \"root\", which is the\n"
+"administrator, the users you add here will not be entitled to change\n"
+"anything except their own files and their own configurations. You will have\n"
+"to create at least one regular user for yourself. That account is where you\n"
+"should log in for routine use. Although it is very practical to log in as\n"
+"\"root\" everyday, it may also be very dangerous! The slightest mistake\n"
+"could mean that your system would not work any more. If you make a serious\n"
+"mistake as a regular user, you may only lose some information, but not the\n"
+"entire system.\n"
+"\n"
+"First, you have to enter your real name. This is not mandatory, of course\n"
+"-- as you can actually enter whatever you want. DrakX will then take the\n"
+"first word you have entered in the box and will bring it over to the \"User\n"
 "name\". This is the name this particular user will use to log onto the\n"
 "system. You can change it. You then have to enter a password here. A\n"
-"non-privileged (regular) user's password is not as crucial as the \"root\"'\n"
+"non-privileged (regular) user's password is not as crucial as the \"root\"\n"
 "one from a security point of view, but that is no reason to neglect it:\n"
 "after all, your files are at risk.\n"
 "\n"
 "If you click on \"Accept user\", you can then add as many as you want. Add\n"
-"a user for each one of your friends: your father or your sister, for\n"
-"example. When you finish adding all the users you want, select \"Done\".\n"
+"a user for each one of the people meant to use that computer. When you are\n"
+"finish adding all the users you want, select \"Done\".\n"
 "\n"
 "Clicking the \"Advanced\" button allows you to change the default \"shell\"\n"
-"for that user (bash by default)."
+"for that user (bash by default).\n"
+"\n"
+"When you are finished adding all users, you will be proposed to choose a\n"
+"user which can automatically log into the system when the computer boots\n"
+"up. If you are interested in that feature (and do not care much about local\n"
+"security), choose the desired user and window manager, then click \"Yes\".\n"
+"If you are not interested in this feature, click \"No\"."
 msgstr ""
 "GNU/Linux је вишекориснички систем, а то значи да сваки корисник може имати "
 "сопствене\n"
@@ -2933,7 +2940,7 @@ msgid ""
 "installations. If you make any changes, you must at least define a root\n"
 "partition (\"/\"). Do not choose too small a partition or you will not be\n"
 "able to install enough software. If you want to store your data on a\n"
-"separate partition, you will also need to create a partition for \"/home\"\n"
+"separate partition, you will also need to create a \"/home\" partition\n"
 "(only possible if you have more than one Linux partition available).\n"
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
@@ -3043,7 +3050,7 @@ msgid ""
 "installation (by opposition to an upgrade), a dialog will pop up proposing\n"
 "different options for a minimal installation:\n"
 "\n"
-" * \"With X\": install the fewer packages possible to have a working\n"
+" * \"With X\": install the fewest packages possible to have a working\n"
 "graphical desktop;\n"
 "\n"
 " * \"With basic documentation\": installs the base system plus basic\n"
@@ -3059,8 +3066,8 @@ msgid ""
 "total control over what will be installed.\n"
 "\n"
 "If you started the installation in \"Upgrade\" mode, you can unselect all\n"
-"groups to avoid installing any new package. This is useful for repairing or\n"
-"updating an existing system."
+"groups to avoid installing any new package. This is useful to repair or\n"
+"update an existing system."
 msgstr ""
 "Сада је време да одредимо које програме желите да инсталирате на ваш\n"
 "систем. Постоје хиљаде пакета доступних за инсталацију на Mandrake Linux, "
@@ -3130,9 +3137,9 @@ msgid ""
 "right. When your selection is finished, click the \"Install\" button which\n"
 "will then launch the installation process. Depending on the speed of your\n"
 "hardware and the number of packages that need to be installed, it may take\n"
-"a while to complete the process. An estimate of the time it will take to\n"
-"install everything is displayed on the screen, to help you gauge if there\n"
-"is sufficient time to enjoy a cup of coffee.\n"
+"a while to complete the process. An installation time estimate is displayed\n"
+"on the screen, to help you gauge if there is sufficient time to enjoy a cup\n"
+"of coffee.\n"
 "\n"
 "!! If a server package has been selected, either intentionally or because\n"
 "it was part of a whole group, you will be asked to confirm that you really\n"
@@ -3153,8 +3160,8 @@ msgid ""
 "The tiny floppy disk icon at the bottom of the list allows to load the\n"
 "package list chosen during a previous installation. Clicking on this icon\n"
 "will ask you to insert a floppy disk previously created at the end of\n"
-"another installation. See the second tip of last step on how to create such\n"
-"a floppy."
+"another installation. See the second tip of the previous step on how to\n"
+"create such a floppy disk."
 msgstr ""
 "На крају, у зависности од вашег избора да да бирате појединачне пакете\n"
 "или не, биће вам приказано стабло са свим пакетима класификованим\n"
@@ -3202,7 +3209,7 @@ msgid ""
 "You are now able to set up your Internet/network connection. If you wish to\n"
 "connect your computer to the Internet or to a local network, click \"OK\".\n"
 "The autodetection of network devices and modem will be launched. If this\n"
-"detection fails, uncheck the \"Use auto detection\" box next time. You may\n"
+"detection fails, uncheck the \"Use auto-detection\" box next time. You may\n"
 "also choose not to configure the network, or do it later; in that case,\n"
 "simply click the \"Cancel\" button.\n"
 "\n"
@@ -3213,8 +3220,8 @@ msgid ""
 "all the parameters from your Internet Service Provider or system\n"
 "administrator.\n"
 "\n"
-"You can consult the ``User Guide'' chapter about Internet connections for\n"
-"details about the configuration, or simply wait until your system is\n"
+"You can consult the ``Starter Guide'' chapter about Internet connections\n"
+"for details about the configuration, or simply wait until your system is\n"
 "installed and use the program described there to configure your connection.\n"
 "\n"
 "If you wish to configure the network later after installation, or if you\n"
@@ -3253,9 +3260,9 @@ msgstr ""
 msgid ""
 "You may now choose which services you wish to start at boot time.\n"
 "\n"
-"Here are presented all the services available with the current\n"
-"installation. Review them carefully and uncheck those which are not always\n"
-"needed at boot time.\n"
+"Here are listed all the services available with the current installation.\n"
+"Review them carefully and uncheck those which are not always needed at boot\n"
+"time.\n"
 "\n"
 "You can get a short explanatory text about a service by selecting a\n"
 "specific service. However, if you are not sure whether a service is useful\n"
@@ -3325,12 +3332,12 @@ msgstr ""
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrake Linux rely. In this section, DrakX\n"
-"will try to configure X automatically.\n"
+"WindowMaker, etc.) bundled with Mandrake Linux rely.\n"
 "\n"
-"It is extremely rare for it to fail, unless the hardware is very old (or\n"
-"very new). If it succeeds, it will start X automatically with the best\n"
-"resolution possible, depending on the size of the monitor. A window will\n"
+"You will be presented the list of available resolutions and color depth\n"
+"available for your hardware. Choose the one that best suit your needs (you\n"
+"will be able to change that after installation though). When you are\n"
+"satisfied with the sample shown in the monitor, click \"OK\". A window will\n"
 "then appear and ask you if you can see it.\n"
 "\n"
 "If you are doing an \"Expert\" installation, you will enter the X\n"
@@ -3340,7 +3347,7 @@ msgid ""
 "If you can see the message during the test, and answer \"Yes\", then DrakX\n"
 "will proceed to the next step. If you cannot see the message, it simply\n"
 "means that the configuration was wrong and the test will automatically end\n"
-"after 10 seconds, restoring the screen. Refer then to the Video\n"
+"after 10 seconds, restoring the screen. Refer then to the video\n"
 "configuration section of the user guide for more information on how to\n"
 "configure your display."
 msgstr ""
@@ -3387,12 +3394,12 @@ msgid ""
 "at the prompt. But in case your computer cannot boot from the CD-ROM, you\n"
 "should come back to this step for help in at least two situations:\n"
 "\n"
-" * when installing the bootloader, DrakX will rewrite the boot sector (MBR)\n"
-"of your main disk (unless you are using another boot manager), to allow you\n"
-"to start up with either Windows or GNU/Linux (assuming you have Windows in\n"
-"your system). If you need to reinstall Windows, the Microsoft install\n"
-"process will rewrite the boot sector, and then you will not be able to\n"
-"start GNU/Linux!\n"
+" * when installing the bootloader, DrakX will rewrite the boot sector (\n"
+"MBR) of your main disk (unless you are using another boot manager), to\n"
+"allow you to start up with either Windows or GNU/Linux (assuming you have\n"
+"Windows in your system). If you need to reinstall Windows, the Microsoft\n"
+"install process will rewrite the boot sector, and then you will not be able\n"
+"to start GNU/Linux!\n"
 "\n"
 " * if a problem arises and you cannot start up GNU/Linux from the hard\n"
 "disk, this floppy disk will be the only means of starting up GNU/Linux. It\n"
@@ -3436,12 +3443,11 @@ msgstr ""
 
 #: ../../help.pm_.c:270
 msgid ""
-"At this point, you need to choose where you want to install the Mandrake\n"
-"Linux operating system on your hard drive. If your hard drive is empty or\n"
-"if an existing operating system is using all the available space, you will\n"
-"need to partition it. Basically, partitioning a hard drive consists of\n"
-"logically dividing it to create space to install your new Mandrake Linux\n"
-"system.\n"
+"You now need to choose where you want to install the Mandrake Linux\n"
+"operating system on your hard drive. If your hard drive is empty or if an\n"
+"existing operating system is using all the available space, you will need\n"
+"to partition it. Basically, partitioning a hard drive consists of logically\n"
+"dividing it to create space to install your new Mandrake Linux system.\n"
 "\n"
 "Because the partitioning process' effects are usually irreversible,\n"
 "partitioning can be intimidating and stressful if you are an inexperienced\n"
@@ -3450,9 +3456,9 @@ msgid ""
 "\n"
 "If you are running the installation in Expert mode, you will enter\n"
 "DiskDrake, the Mandrake Linux partitioning tool, which allows you to\n"
-"fine-tune your partitions. See the DiskDrake section in the ``User Guide''.\n"
-"From the installation interface, you can use the wizards as described here\n"
-"by clicking the dialog's \"Wizard\" button.\n"
+"fine-tune your partitions. See the DiskDrake section in the ``Starter\n"
+"Guide''. From the installation interface, you can use the wizards as\n"
+"described here by clicking the dialog's \"Wizard\" button.\n"
 "\n"
 "If partitions have already been defined, either from a previous\n"
 "installation or from another partitioning tool, simply select those to\n"
@@ -3460,7 +3466,7 @@ msgid ""
 "\n"
 "If partitions are not defined, you will need to create them using the\n"
 "wizard. Depending on your hard drive configuration, several options are\n"
-"available:\n"
+"available.\n"
 "\n"
 " * \"Use free space\": this option will simply lead to an automatic\n"
 "partitioning of your blank drive(s). You will not be prompted further;\n"
@@ -3471,9 +3477,9 @@ msgid ""
 "each of the partitions. The legacy mount points are selected by default,\n"
 "and you should generally keep them.\n"
 "\n"
-" * \"Use the free space on the Windows; partition\": if Microsoft Windows\n"
-"is installed on your hard drive and takes all the space available on it,\n"
-"you have to create free space for Linux data. To do so, you can delete your\n"
+" * \"Use the free space on the Windows partition\": if Microsoft Windows is\n"
+"installed on your hard drive and takes all the space available on it, you\n"
+"have to create free space for Linux data. To do so, you can delete your\n"
 "Microsoft Windows partition and data (see ``Erase entire disk'' or ``Expert\n"
 "mode'' solutions) or resize your Microsoft Windows partition. Resizing can\n"
 "be performed without the loss of any data, provided you previously\n"
@@ -3500,10 +3506,10 @@ msgid ""
 "   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
 " * \"Expert mode\": choose this option if you want to manually partition\n"
-"your hard drive. Be careful - it is a powerful but dangerous choice. You\n"
+"your hard drive. Be careful -- it is a powerful but dangerous option. You\n"
 "can very easily lose all your data. Hence, do not choose this unless you\n"
-"know what you are doing. To know how do use the DiskDrake utility used\n"
-"here, refer to the section ``Managing Your Partitions'' of the ````User\n"
+"know what you are doing. To know how to use the DiskDrake utility used\n"
+"here, refer to the section ``Managing Your Partitions'' of the ````Starter\n"
 "Guide''''"
 msgstr ""
 "У овом тренутку, морате да изаберете где ћете инсталирати\n"
@@ -3593,7 +3599,7 @@ msgstr ""
 
 #: ../../help.pm_.c:341
 msgid ""
-"There you are. Installation is now complete and your GNU/Linux system is\n"
+"There you are. Installation is now completed and your GNU/Linux system is\n"
 "ready to use. Just click \"OK\" to reboot the system. You can start\n"
 "GNU/Linux or Windows, whichever you prefer (if you are dual-booting), as\n"
 "soon as the computer has booted up again.\n"
@@ -3668,7 +3674,7 @@ msgstr ""
 #: ../../help.pm_.c:372
 msgid ""
 "Any partitions that have been newly defined must be formatted for use\n"
-"(formatting means creating a filesystem).\n"
+"(formatting means creating a filesystem on it).\n"
 "\n"
 "At this time, you may wish to reformat some already existing partitions to\n"
 "erase any data they contain. If you wish to do that, please select those\n"
@@ -3682,7 +3688,7 @@ msgid ""
 "\n"
 "Please be careful when selecting partitions. After formatting, all data on\n"
 "the selected partitions will be deleted and you will not be able to recover\n"
-"any of it.\n"
+"it.\n"
 "\n"
 "Click on \"OK\" when you are ready to format partitions.\n"
 "\n"
@@ -3772,9 +3778,9 @@ msgstr ""
 msgid ""
 "Before continuing, you should read carefully the terms of the license. It\n"
 "covers the whole Mandrake Linux distribution, and if you do not agree with\n"
-"all the terms in it, click on the \"Refuse\" button which will immediately\n"
-"terminate the installation. To continue with the installation, click on the\n"
-"\"Accept\" button."
+"all the terms included in it, click on the \"Refuse\" button which will\n"
+"immediately terminate the installation. To continue with the installation,\n"
+"click on the \"Accept\" button."
 msgstr ""
 "Пре него што наставите пажљиво прочитајте услове лиценце. Она\n"
 "покрива целу Mandrake Linux дистрибуцију, и уколико се не слажете\n"
@@ -3821,16 +3827,16 @@ msgid ""
 "drive;\n"
 "\n"
 " * \"Auto allocate\": this option enables to automatically create ext3 and\n"
-"swap partitions in free space of your hard drive;\n"
+"swap partitions on your hard drive's free space;\n"
 "\n"
 "\"More\": gives access to additional features:\n"
 "\n"
 " * \"Save partition table\": saves the partition table to a floppy. Useful\n"
-"for later partition-table recovery if necessary. It is strongly recommended\n"
-"to perform this step;\n"
+"for later partition-table recovery, if necessary. It is strongly\n"
+"recommended to perform this step;\n"
 "\n"
 " * \"Restore partition table\": allows to restore a previously saved\n"
-"partition table from floppy disk;\n"
+"partition table from a floppy disk;\n"
 "\n"
 " * \"Rescue partition table\": if your partition table is damaged, you can\n"
 "try to recover it using this option. Please be careful and remember that it\n"
@@ -4011,40 +4017,38 @@ msgstr "Будите стрпљиви.Траjaње ових оерациjа може бити неколико минутa"
 #: ../../help.pm_.c:541
 msgid ""
 "DrakX now needs to know if you want to perform a default (\"Recommended\")\n"
-"installation or if you want to have greater control (\"Expert\"). You can\n"
-"also choose to do a new install or an upgrade of an existing Mandrake Linux\n"
-"system:\n"
+"installation or if you want to have greater control (\"Expert\") over your\n"
+"installation. You can also choose to do a new installation or upgrade your\n"
+"existing Mandrake Linux system:\n"
 "\n"
-" * \"Install\": completely wipes out the old system, however, depending on\n"
+" * \"Install\": completely wipes out the old system. However, depending on\n"
 "what is currently installed on your machine, you may be able to keep some\n"
 "old partitions (Linux or otherwise) unchanged;\n"
 "\n"
 " * \"Upgrade\": this installation class allows to simply update the\n"
-"packages currently installed on your Mandrake Linux system. It keeps the\n"
-"current partitions of your hard drives as well as user configurations. All\n"
-"other configuration steps remain available, similar to a normal\n"
-"installation;\n"
+"packages currently installed on your Mandrake Linux system. It keeps your\n"
+"hard drives' current partitions as well as user configurations. All other\n"
+"configuration steps remain available, similar to a normal installation;\n"
 "\n"
 " * \"Upgrade Packages Only\": this new installation class allows you to\n"
 "upgrade an existing Mandrake Linux system while keeping all system\n"
 "configurations unchanged. Adding new packages to the current installation\n"
 "is also possible.\n"
 "\n"
-"Upgrades should work fine on Mandrake Linux systems containing version\n"
-"\"8.1\" or later.\n"
+"Upgrades should work fine on Mandrake Linux systems using version \"8.1\"\n"
+"or later.\n"
 "\n"
-"Depending on your knowledge of GNU/Linux, select one of the following\n"
-"choices:\n"
+"Depending on your GNU/Linux knowledge, select one of the following choices:\n"
 "\n"
 " * Recommended: choose this if you have never installed a GNU/Linux\n"
 "operating system. The installation will be very easy and you will only be\n"
 "asked a few questions;\n"
 "\n"
-" * Expert: if you have a good understanding of GNU/Linux, you may wish to\n"
+" * Expert: if you have a good GNU/Linux understanding, you may wish to\n"
 "perform a highly customized installation. Some of the decisions you will\n"
-"have to make may be difficult if you do not have good knowledge of\n"
-"GNU/Linux, so it is not recommended that those without a fair amount of\n"
-"experience select this installation class."
+"have to make may be difficult if you do not have good GNU/Linux knowledge,\n"
+"so it is not recommended that those without a fair amount of experience\n"
+"select this installation class."
 msgstr ""
 "DrakX сада треба да зна да ли желите да покренете default (\"Препоручено\")\n"
 "инсталацију или желите да имате већу контролу (\"Експерт\"). Такође\n"
@@ -4108,8 +4112,8 @@ msgid ""
 "supported keyboards.\n"
 "\n"
 "If you choose a keyboard layout based on a non-latin alphabet, you will be\n"
-"asked on next dialog to choose the key binding that will switch the\n"
-"keyboard layout between the latin and non latin layouts."
+"asked in the next dialog to choose the key binding that will switch the\n"
+"keyboard layout between the latin and non-latin layouts."
 msgstr ""
 "У принципу, DrakX бира десну тастатуру за вас (у зависности од тога који\n"
 "сте језик изабрали) и чак и нећете видети овај корак. Ипак, може\n"
@@ -4132,12 +4136,16 @@ msgid ""
 "Clicking on the \"Advanced\" button will allow you to select other\n"
 "languages to be installed on your workstation. Selecting other languages\n"
 "will install the language-specific files for system documentation and\n"
-"applications. For example, if you will host users from Spain on your\n"
-"machine, select English as the main language in the tree view and in the\n"
-"Advanced section click on the box corresponding to \"Spanish|Spain\".\n"
+"applications. For example, if you host users from Spain on your machine,\n"
+"select English as the main language in the tree view and in the Advanced\n"
+"section, click on the box corresponding to \"Spanish|Spain\".\n"
 "\n"
 "Note that multiple languages may be installed. Once you have selected any\n"
-"additional locales, click the \"OK\" button to continue."
+"additional locales, click the \"OK\" button to continue.\n"
+"\n"
+"To switch from one language to the other, you can launch the\n"
+"\"/usr/sbin/localedrake\" command as \"root\" to change the whole system\n"
+"language, or as a simple user to only change that user's default language."
 msgstr ""
 "Изаберите ваш језик за инсталацију и коришћење система.\n"
 "\n"
@@ -4156,12 +4164,12 @@ msgstr ""
 
 #: ../../help.pm_.c:609
 msgid ""
-"DrakX generally detects the number of buttons your mouse has. If not, it\n"
-"assumes you have a two-button mouse and will set it up for third-button\n"
+"DrakX generally detects the number of buttons your mouse possesses. If not,\n"
+"it assumes you have a two-button mouse and will set it up for third-button\n"
 "emulation. DrakX will automatically know whether it is a PS/2, serial or\n"
 "USB mouse.\n"
 "\n"
-"If you wish to specify a different type of mouse select the appropriate\n"
+"If you wish to specify a different type of mouse, select the appropriate\n"
 "type from the provided list.\n"
 "\n"
 "If you choose a mouse other than the default, a test screen will be\n"
@@ -4169,12 +4177,12 @@ msgid ""
 "correct. If the mouse is not working well, press the space bar or [Return]\n"
 "to \"Cancel\" and choose again.\n"
 "\n"
-"Wheel mouses are sometimes not automatically detected. You will need to\n"
+"Sometimes, wheel mouses are not automatically detected. You will need to\n"
 "manually select it in the list. Be sure to select the one corresponding to\n"
 "the correct port it is attached to. After you have pressed the \"OK\"\n"
-"button, a mouse image is displayed. You then need to move the wheel of your\n"
-"mouse to activate it correctly. Then test all buttons and movements are\n"
-"correct."
+"button, a mouse image will be displayed. You then need to move the wheel of\n"
+"your mouse to activate it correctly. Then test that all buttons and\n"
+"movements are correct."
 msgstr ""
 "DrakX генерално детектује број тастера који ваш миш посдедује. Уколико се то "
 "не деси\n"
@@ -4202,21 +4210,21 @@ msgstr ""
 
 #: ../../help.pm_.c:634
 msgid ""
-"This is the most crucial decision point for the security of your GNU/Linux\n"
-"system: you have to enter the \"root\" password. \"root\" is the system\n"
-"administrator and is the only one authorized to make updates, add users,\n"
-"change the overall system configuration, and so on. In short, \"root\" can\n"
-"do everything! That is why you must choose a password that is difficult to\n"
-"guess - DrakX will tell you if it is too easy. As you can see, you can\n"
-"choose not to enter a password, but we strongly advise you against this if\n"
-"only for one reason: do not think that because you booted GNU/Linux that\n"
-"your other operating systems are safe from mistakes. Since \"root\" can\n"
-"overcome all limitations and unintentionally erase all data on partitions\n"
-"by carelessly accessing the partitions themselves, it is important for it\n"
-"to be difficult to become \"root\".\n"
+"This is the most crucial decision in regards with the security of your\n"
+"GNU/Linux system: you have to enter the \"root\" password. \"Root\" is the\n"
+"system administrator and is the only one authorized to make updates, add\n"
+"users, change the overall system configuration, and so on. In short,\n"
+"\"root\" can do everything! That is why you must choose a password that is\n"
+"difficult to guess -- DrakX will tell you if it is too easy. As you can\n"
+"see, you can choose not to enter a password, but we strongly advise you\n"
+"against this if only for one reason: do not think that because you booted\n"
+"GNU/Linux that your other operating systems are safe from mistakes. Since\n"
+"\"root\" can overcome all limitations and unintentionally erase all data on\n"
+"partitions by carelessly accessing the partitions themselves, it is\n"
+"important for it to be difficult to become \"root\".\n"
 "\n"
 "The password should be a mixture of alphanumeric characters and at least 8\n"
-"characters long. Never write down the \"root\" password - it makes it too\n"
+"characters long. Never write down the \"root\" password -- it makes it too\n"
 "easy to compromise a system.\n"
 "\n"
 "However, please do not make the password too long or complicated because\n"
@@ -4230,9 +4238,9 @@ msgid ""
 "In Expert mode, you will be asked if you will be connecting to an\n"
 "authentication server, like NIS or LDAP.\n"
 "\n"
-"If your network uses either of the LDAP, NIS, or PDC Windows Domain\n"
-"authentication services, select the appropriate one as \"authentication\".\n"
-"If you do not know, ask your network administrator.\n"
+"If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
+"services, select the appropriate one as \"authentication\". If you have no\n"
+"clue, ask your network administrator.\n"
 "\n"
 "If your computer is not connected to any administrated network, you will\n"
 "want to choose \"Local files\" for authentication."
@@ -4278,9 +4286,9 @@ msgstr ""
 
 #: ../../help.pm_.c:670
 msgid ""
-"LILO and grub are GNU/Linux bootloaders. This stage, normally, is totally\n"
+"LILO and grub are GNU/Linux bootloaders. Normally, this stage is totally\n"
 "automated. In fact, DrakX analyzes the disk boot sector and acts\n"
-"accordingly, depending on what it finds here:\n"
+"accordingly, depending on what it finds there:\n"
 "\n"
 " * if a Windows boot sector is found, it will replace it with a grub/LILO\n"
 "boot sector. Hence, you will be able to load either GNU/Linux or another\n"
@@ -4289,14 +4297,14 @@ msgid ""
 " * if a grub or LILO boot sector is found, it will replace it with a new\n"
 "one.\n"
 "\n"
-"If in doubt, DrakX will display a dialog with various options.\n"
+"if in doubt, DrakX will display a dialog with various options.\n"
 "\n"
 " * \"Bootloader to use\": you have three choices:\n"
 "\n"
-"    * \"GRUB\": if you prefer grub (text menu).\n"
+"    * \"GRUB\": if you prefer grub (text menu);\n"
 "\n"
 "    * \"LILO with graphical menu\": if you prefer LILO with its graphical\n"
-"interface.\n"
+"interface;\n"
 "\n"
 "    * \"LILO with text menu\": if you prefer LILO with its text menu\n"
 "interface.\n"
@@ -4306,7 +4314,7 @@ msgid ""
 "second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\");\n"
 "\n"
 " * \"Delay before booting the default image\": when rebooting the computer,\n"
-"this is the delay granted to the user to choose - in the bootloader menu,\n"
+"this is the delay granted to the user to choose -- in the bootloader menu,\n"
 "another boot entry than the default one.\n"
 "\n"
 "!! Beware that if you choose not to install a bootloader (by selecting\n"
@@ -4377,7 +4385,7 @@ msgid ""
 "If there is another operating system installed on your machine, it will\n"
 "automatically be added to the boot menu. Here, you can choose to fine-tune\n"
 "the existing options. Select an entry and click \"Modify\" to modify or\n"
-"remove it; \"Add\" creates a new entry; and \"Done\" goes on to the next\n"
+"remove it. \"Add\" creates a new entry. and \"Done\" goes on to the next\n"
 "installation step.\n"
 "\n"
 "You may also not want to give access to these other operating systems to\n"
@@ -4398,7 +4406,7 @@ msgstr ""
 #: ../../help.pm_.c:724
 msgid ""
 "You must indicate where you wish to place the information required to boot\n"
-"to GNU/Linux.\n"
+"GNU/Linux.\n"
 "\n"
 "Unless you know exactly what you are doing, choose \"First sector of drive\n"
 "(MBR)\"."
@@ -4411,32 +4419,24 @@ msgstr ""
 
 #: ../../help.pm_.c:731
 msgid ""
-"Here, we select a printing system for your computer. Other OSs may offer\n"
-"you one, but Mandrake Linux offers three.\n"
+"Here, we select a printing system for your computer. Other OSes may offer\n"
+"you one, but Mandrake Linux offers two.\n"
 "\n"
-" * \"pdq\" - which means ``print, don't queue'', is the choice if you have\n"
+" * \"pdq\" -- which means ``print, don't queue'', is the choice if you have\n"
 "a direct connection to your printer and you want to be able to panic out of\n"
 "printer jams, and you do not have networked printers. It will handle only\n"
 "very simple network cases and is somewhat slow for networks. Pick \"pdq\"\n"
-"if this is your maiden voyage to GNU/Linux. You can change your choices\n"
+"if this is your first voyage to GNU/Linux. You can change your choices\n"
 "after installation by running PrinterDrake from the Mandrake Control Center\n"
 "and clicking the expert button.\n"
 "\n"
-" * \"CUPS\" - ``Common Unix Printing System'', is excellent at printing to\n"
+" * \"CUPS\" -- ``Common Unix Printing System'', is excellent at printing to\n"
 "your local printer and also halfway-around the planet. It is simple and can\n"
 "act as a server or a client for the ancient \"lpd\" printing system. Hence,\n"
 "it is compatible with the systems that went before. It can do many tricks,\n"
 "but the basic setup is almost as easy as \"pdq\". If you need this to\n"
 "emulate an \"lpd\" server, you must turn on the \"cups-lpd\" daemon. It has\n"
-"graphical front-ends for printing or choosing printer options.\n"
-"\n"
-" * \"lprNG\" - ``line printer daemon New Generation''. This system can do\n"
-"approximately the same things the others can do, but it will print to\n"
-"printers mounted on a Novell Network, because it supports the IPX protocol,\n"
-"and it can print directly to shell commands. If you have need of Novell or\n"
-"printing to commands without using a separate pipe construct, use lprNG.\n"
-"Otherwise, CUPS is preferable as it is simpler and better at working over\n"
-"networks."
+"graphical front-ends for printing or choosing printer options."
 msgstr ""
 "Сада треба да изаберемо систем за штампање за ваш рачунар. Други OS-ови вам\n"
 "нуде један, али вам Mandrake Linux нуди чак три.\n"
@@ -4476,7 +4476,7 @@ msgstr ""
 
 #: ../../help.pm_.c:759
 msgid ""
-"DrakX now detects any IDE devices present in your computer. It will also\n"
+"DrakX now detects any IDE device present in your computer. It will also\n"
 "scan for one or more PCI SCSI cards on your system. If a SCSI card is\n"
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
@@ -4486,7 +4486,7 @@ msgid ""
 "be presented with a list of SCSI cards to choose from. Click \"No\" if you\n"
 "have no SCSI hardware. If you are unsure, you can check the list of\n"
 "hardware detected in your machine by selecting \"See hardware info\" and\n"
-"clicking \"OK\". Examine the list of hardware and then click on the \"OK\"\n"
+"clicking \"OK\". Examine the hardware list and then click on the \"OK\"\n"
 "button to return to the SCSI interface question.\n"
 "\n"
 "If you have to manually specify your adapter, DrakX will ask if you want to\n"
@@ -4495,12 +4495,7 @@ msgid ""
 "usually works well.\n"
 "\n"
 "If DrakX is not able to probe for the options which need to be passed, you\n"
-"will need to provide options to the driver manually. Please review the\n"
-"``User Guide'' (chapter 3, in the ``Collecting Information on Your\n"
-"Hardware'' section) for hints on retrieving the parameters required from\n"
-"hardware documentation, from the manufacturer's web site (if you have\n"
-"Internet access) or from Microsoft Windows (if you used this hardware with\n"
-"Windows on your system)."
+"will need to manually provide options to the driver."
 msgstr ""
 "DrakX сада треба да детектује IDE уређаје присутне у вешем рачунару.DrakX "
 "ће \n"
@@ -4537,7 +4532,7 @@ msgid ""
 "You can add additional entries for yaboot, either for other operating\n"
 "systems, alternate kernels, or for an emergency boot image.\n"
 "\n"
-"For other OSs, the entry consists only of a label and the \"root\"\n"
+"For other OSes, the entry consists only of a label and the \"root\"\n"
 "partition.\n"
 "\n"
 "For Linux, there are a few possible options:\n"
@@ -4568,7 +4563,7 @@ msgid ""
 "need to allocate a large ramdisk, this option can be used;\n"
 "\n"
 " * Read-write: normally the \"root\" partition is initially brought up in\n"
-"read-only, to allow a file system check before the system becomes ``live''.\n"
+"read-only, to allow a filesystem check before the system becomes ``live''.\n"
 "Here, you can override this option;\n"
 "\n"
 " * NoVideo: should the Apple video hardware prove to be exceptionally\n"
@@ -4713,7 +4708,7 @@ msgstr ""
 #: ../../help.pm_.c:865
 msgid ""
 "Here are presented various parameters concerning your machine. Depending on\n"
-"your installed hardware, you may - or not, see the following entries:\n"
+"your installed hardware, you may (or may not), see the following entries:\n"
 "\n"
 " * \"Mouse\": check the current mouse configuration and click on the button\n"
 "to change it if necessary;\n"
@@ -4728,19 +4723,19 @@ msgid ""
 "order to configure the clock according to the time zone you are in;\n"
 "\n"
 " * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
-"configuration wizard. Consult the corresponding chapter of the ``User\n"
+"configuration wizard. Consult the correpsonding chapter of the ``Starter\n"
 "Guide'' for more information on how to setup a new printer. The interface\n"
-"presented there is similar to the one used during installation;\n"
+"presented there is similar to the one used at installation time;\n"
 "\n"
-" * \"Sound card\": if a sound card is detected on your system, it is\n"
+" * \"Sound card\": if a sound card is detected on your system, it will be\n"
 "displayed here. No modification possible at installation time;\n"
 "\n"
-" * \"TV card\": if a TV card is detected on your system, it is displayed\n"
-"here. No modification possible at installation time;\n"
+" * \"TV card\": if a TV card is detected on your system, it will be\n"
+"displayed here. No modification possible at installation time;\n"
 "\n"
-" * \"ISDN card\": if an ISDN card is detected on your system, it is\n"
+" * \"ISDN card\": if an ISDN card is detected on your system, it will be\n"
 "displayed here. You can click on the button to change the parameters\n"
-"associated with it."
+"associated to it."
 msgstr ""
 "Овде су приказани различити параметри везани за вашу машину. У зависности\n"
 "од вашег инсталираног хардвера, можетеy - или не морате, погледајте "
@@ -4791,7 +4786,7 @@ msgid ""
 "to recover any data and partitions present on this hard drive, including\n"
 "any Windows data.\n"
 "\n"
-"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"Click on \"Cancel\" to stop this operation without losing any data and\n"
 "partitions present on this hard drive."
 msgstr ""
 "Кликните на \"У реду\" уколико желите да избришетe све податкe и \n"