sync with code

71 files changed, 20779 insertions, 10784 deletions

diff --git a/perl-install/share/po/af.po b/perl-install/share/po/af.po
index d838fbab6..7f51189f2 100644
--- a/perl-install/share/po/af.po
+++ b/perl-install/share/po/af.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-af\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2005-04-21 17:33+0200\n"
 "Last-Translator: Dirk van der Walt <dirkvanderwalt@webmail.co.za>\n"
 "Language-Team: Afrikaans\n"
@@ -1400,18 +1400,14 @@ msgstr "Kies 'n ander partisie"
 msgid "Choose a partition"
 msgstr "Kies 'n partisie"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Skakel oor na normale gebruiksvlak"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Skakel oor na kundige gebruiksvlak"
+msgid "More"
+msgstr "Meer Keuses"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "Konfigurasie"
@@ -1459,13 +1455,17 @@ msgstr "Verwyder almal"
 msgid "Auto allocate"
 msgstr "Outo-allokeer"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Meer Keuses"
+msgid "Toggle to normal mode"
+msgstr "Skakel oor na normale gebruiksvlak"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Skakel oor na kundige gebruiksvlak"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Hardeskyfinligting"
@@ -1519,7 +1519,12 @@ msgstr "Voeg by RAID"
 msgid "Add to LVM"
 msgstr "Voeg by LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Gebruiker ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Uitwis"
@@ -1534,7 +1539,12 @@ msgstr "Verwyder uit RAID"
 msgid "Remove from LVM"
 msgstr "Verwyder uit LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Verwyder uit LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Verander RAID"
@@ -1708,7 +1718,27 @@ msgstr ""
 "verklien het,sal daar toetste op u lêerstelsel(s) gedoen word,\n"
 "volgende keer as Windows™ selflaai"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Enkripsie-sleutel van lêerstelsel"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Kies 'n enkripsie-sleutel vir u lêerstelsel"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Enkripsie-sleutel"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Kies 'n bestaande RAID om by toe te voeg"
@@ -1820,7 +1850,12 @@ msgstr "U sal moet herlaai voor die veranderinge geaktiveer kan word"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Die partisielys op skyf %s gaan opdateer word"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Partisie %s word formateer"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Alle data om partisie %s sal uitgewis word met formatering."
@@ -1952,7 +1987,27 @@ msgstr "Geheg\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Enkripsie-sleutel"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2055,12 +2110,7 @@ msgstr "Tipe Partisielys: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "op bus %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Enkripsie-sleutel van lêerstelsel"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Kies 'n enkripsie-sleutel vir u lêerstelsel"
@@ -2077,12 +2127,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Die enkripsie-sleutels stem nie ooreen nie."
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Enkripsie-sleutel"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Enkripsie-sleutel (nogmaals)"
@@ -2197,11 +2242,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "U moet oor 'n FAT partisie wat as /boot/efi geheg is, beskik"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Partisie %s word formateer"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4632,7 +4672,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4640,8 +4683,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4661,52 +4704,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4720,9 +4768,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4743,7 +4791,55 @@ msgid ""
 "For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4762,67 +4858,55 @@ msgstr ""
 "Indien u onseker is oor 'n patent, raadpleeg die plaaslike wette.\n"
 "( Wees daarom bly jy woon nie in die VSA nie! )"
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6718,6 +6802,67 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Installasie het gefaal!"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Gebruik libsafe vir bedieners"
 
diff --git a/perl-install/share/po/am.po b/perl-install/share/po/am.po
index 01f60f29a..06e008bd5 100644
--- a/perl-install/share/po/am.po
+++ b/perl-install/share/po/am.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2004-06-01 03:36+0100\n"
 "Last-Translator: Alemayehu <alemayehu@gmx.at>\n"
 "Language-Team: Amharic <am-translate@geez.org>\n"
@@ -1350,18 +1350,14 @@ msgstr "ሌላ ክፋይ ይምረጡ"
 msgid "Choose a partition"
 msgstr "ክፋይ ይምረጡ"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr ""
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr ""
+msgid "More"
+msgstr "ተጨማሪ"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "ስየማ"
@@ -1409,13 +1405,17 @@ msgstr "ሁሉንም ሰርዝ"
 msgid "Auto allocate"
 msgstr "በራስ-ገዝ አመልካች"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "ተጨማሪ"
+msgid "Toggle to normal mode"
+msgstr ""
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr ""
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "የቋሚ ዲስክ መረጃ"
@@ -1467,7 +1467,12 @@ msgstr "ወደ RAID ጨምር"
 msgid "Add to LVM"
 msgstr "ወደ LVM ጨምር"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "የተጠቃሚ መለያ ቁጥር"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "አጥፋ"
@@ -1482,7 +1487,12 @@ msgstr "ከRAID አስወግድ"
 msgid "Remove from LVM"
 msgstr "ከLVM አስወግድ"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "ከLVM አስወግድ"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "RAID ለውጥ"
@@ -1646,7 +1656,27 @@ msgid ""
 "filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "የፋይል-ሲስተም ሚስጢራዊ ግልበጣ ቁልፍ"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "የፋይል-ሲስተም ሚስጢራዊ ግልበጣ ቁልፍ"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "የሚስጢራዊ ግልበጣ ቁልፍ"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr ""
@@ -1758,7 +1788,12 @@ msgstr ""
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr ""
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "ክፋይ %sን በማስተካከል ላይ"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1890,7 +1925,27 @@ msgstr ""
 msgid "RAID %s\n"
 msgstr "URI፦"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "የሚስጢራዊ ግልበጣ ቁልፍ"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -1984,12 +2039,7 @@ msgstr "የክፋይ ጠረጴዛ ዓይነት: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "በጣቢያ %d ID %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "የፋይል-ሲስተም ሚስጢራዊ ግልበጣ ቁልፍ"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr ""
@@ -2004,12 +2054,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr ""
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "የሚስጢራዊ ግልበጣ ቁልፍ"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "የሚስጢራዊ ግልበጣ ቁልፍ (እንደገና)"
@@ -2120,11 +2165,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr ""
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "ክፋይ %sን በማስተካከል ላይ"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4434,7 +4474,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4442,8 +4485,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4463,52 +4506,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4522,9 +4570,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4545,7 +4593,55 @@ msgid ""
 "For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4557,38 +4653,54 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
+#: messages.pm:123
 #, c-format
 msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
 "\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
 "\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
 "\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
 "\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
diff --git a/perl-install/share/po/ar.po b/perl-install/share/po/ar.po
index 252624767..3343a7966 100644
--- a/perl-install/share/po/ar.po
+++ b/perl-install/share/po/ar.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2005-03-03 01:06+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -1408,18 +1408,14 @@ msgstr "اختيار تجزيء آخر"
 msgid "Choose a partition"
 msgstr "اختيار تجزيء"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "الانتقال إلى الوضع العادي"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "الانتقال إلى وضعية الخبير"
+msgid "More"
+msgstr "المزيد"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "التهيئة"
@@ -1470,13 +1466,17 @@ msgstr "مسح الكل"
 msgid "Auto allocate"
 msgstr "تحديد آلي"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "المزيد"
+msgid "Toggle to normal mode"
+msgstr "الانتقال إلى الوضع العادي"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "الانتقال إلى وضعية الخبير"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "معلومات القرص الصلب"
@@ -1528,7 +1528,12 @@ msgstr "إضافة إلى RAID"
 msgid "Add to LVM"
 msgstr "إضافة إلى LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "هوية المستخدم"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "حذف"
@@ -1543,7 +1548,12 @@ msgstr "ازالة من RAID"
 msgid "Remove from LVM"
 msgstr "ازالة من LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "ازالة من LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "تعديل RAID"
@@ -1714,7 +1724,27 @@ msgstr ""
 "للتأكد من صحة البيانات بعد إعادة تحجيم التجزيئات، \n"
 "سيتم الدقيق على نظام الملفات عند التشغيل القادم لويندوز(TM)"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "مفتاح تشفير نظام الملفات"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "اختيار مفتاح تشفير نظام الملفات"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "مفتاح التشفير"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "اختيار RAID موجود للإضافة إليه"
@@ -1826,7 +1856,12 @@ msgstr "ستحتاج إلى إعادة التشغيل قبل أن يتم تفع�
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "جدول التجزئة للقرص %s سيتم كتابته إلى القرص"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "جاري تنسيق التجزيء %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "بعد تنسيق التجزيء %s، فإن كل البيانات الموجودة على هذا التجزيء ستفقد"
@@ -1958,7 +1993,27 @@ msgstr "محمل\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "مفتاح التشفير"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2062,12 +2117,7 @@ msgstr "نوع جدول التجزئة: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "على القناة %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "مفتاح تشفير نظام الملفات"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "اختيار مفتاح تشفير نظام الملفات"
@@ -2082,12 +2132,7 @@ msgstr "مفتاح التشفير هذا بسيط جدا (يجب أن يكون %
 msgid "The encryption keys do not match"
 msgstr "مفاتيح التشفير غير متطابقة"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "مفتاح التشفير"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "مفتاح التشفير (مرة أخرى)"
@@ -2202,11 +2247,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "لديك تجزيء FAT تم تحميلها على /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "جاري تنسيق التجزيء %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4614,7 +4654,7 @@ msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4624,7 +4664,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4632,8 +4675,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4653,52 +4696,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4712,9 +4760,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4826,7 +4874,55 @@ msgstr ""
 "سيحوّل الاختصام إلى محاكم القضاء ذات العلاقة في باريس - فرنسا.\n"
 "في حال وجود أي أسئلةٍ عن هذه الوثيقة، يرجى الاتّصال بماندريبا ش.م. \n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4845,67 +4941,55 @@ msgstr ""
 "براءة الاختراع\n"
 "قد تنطبق عليك، تحقّق من القوانين المحليّة لبلدك."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"تحذير\n"
-"\n"
-"فضلاً اقرأ الشروط أدناه. إذا كنت لا توافق على أي\n"
-"جزء، لن يسمح لك بتثبيت وسيط القرص المدمج التالي. اضغط 'رفض' \n"
-"لمتابعة التثبيت بدون هذه الوسائط.\n"
-"\n"
-"\n"
-"بعض المكونات الموجودة في وسيط القرص المدمج التالي غير محكومة\n"
-"بموجب ترخبص GPL أو الاتفاقيات المماثلة. كل مكون من تلك محكوم\n"
-"بموجب بنود و شروط الترخيص الخاص به تحديداً. \n"
-"فضلاً اقرأ باهتمام و أن تستجيب لهذه التراخيص قبل أن \n"
-"تستخدم أو تعيد توزيع هذه المكونات. \n"
-"مثل هذه التراخيص بشكل عام قد تمنع نقل أو  نسخ (باستثناء النسخ الاحتياطي)\n"
-"أو إعادة توزيع أو ممارسة الهندسة العكسية أو فك تركيب أو فك تجميع أو تعديل\n"
-"المكون.\n"
-"أي انتهاك للاتفاقية سيتسبب في انهاء حقوقك تحت الترخيص\n"
-"المحدد بشكل فوري. الا إذا كان الترخيص يعطيك مثل هذه الحقوق.\n"
-"عادة لا يسمح لك بتثبيت هذه البرامج على أكثر من نظام واحد\n"
-"أو تعديله لكي يتم استخدامه على شبكة. في حال شكك فضلاً \n"
-"اتصل بشكل مباشر مع موزع أو مؤلف هذا المكون.\n"
-"النقل إلى طرف ثالث أو نسخ هذه المكونات بما فيه \n"
-"وثائق المساعدة ممنوع عادةً.\n"
-"\n"
-"\n"
-"جميع الحقوق الخاصة بالمكونات الموجودة في وسيط القرص \n"
-"المدمج التالي مملوكة لأصحابها و محمية بموجب قوانين الملكية \n"
-"الفكرية المنطبقة على البرمجيات.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6776,6 +6860,67 @@ msgstr ""
 msgid "Installation failed"
 msgstr "فشل التّثبيت"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "تحذير\n"
+#~ "\n"
+#~ "فضلاً اقرأ الشروط أدناه. إذا كنت لا توافق على أي\n"
+#~ "جزء، لن يسمح لك بتثبيت وسيط القرص المدمج التالي. اضغط 'رفض' \n"
+#~ "لمتابعة التثبيت بدون هذه الوسائط.\n"
+#~ "\n"
+#~ "\n"
+#~ "بعض المكونات الموجودة في وسيط القرص المدمج التالي غير محكومة\n"
+#~ "بموجب ترخبص GPL أو الاتفاقيات المماثلة. كل مكون من تلك محكوم\n"
+#~ "بموجب بنود و شروط الترخيص الخاص به تحديداً. \n"
+#~ "فضلاً اقرأ باهتمام و أن تستجيب لهذه التراخيص قبل أن \n"
+#~ "تستخدم أو تعيد توزيع هذه المكونات. \n"
+#~ "مثل هذه التراخيص بشكل عام قد تمنع نقل أو  نسخ (باستثناء النسخ الاحتياطي)\n"
+#~ "أو إعادة توزيع أو ممارسة الهندسة العكسية أو فك تركيب أو فك تجميع أو "
+#~ "تعديل\n"
+#~ "المكون.\n"
+#~ "أي انتهاك للاتفاقية سيتسبب في انهاء حقوقك تحت الترخيص\n"
+#~ "المحدد بشكل فوري. الا إذا كان الترخيص يعطيك مثل هذه الحقوق.\n"
+#~ "عادة لا يسمح لك بتثبيت هذه البرامج على أكثر من نظام واحد\n"
+#~ "أو تعديله لكي يتم استخدامه على شبكة. في حال شكك فضلاً \n"
+#~ "اتصل بشكل مباشر مع موزع أو مؤلف هذا المكون.\n"
+#~ "النقل إلى طرف ثالث أو نسخ هذه المكونات بما فيه \n"
+#~ "وثائق المساعدة ممنوع عادةً.\n"
+#~ "\n"
+#~ "\n"
+#~ "جميع الحقوق الخاصة بالمكونات الموجودة في وسيط القرص \n"
+#~ "المدمج التالي مملوكة لأصحابها و محمية بموجب قوانين الملكية \n"
+#~ "الفكرية المنطبقة على البرمجيات.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "استخدام libsafe للخادمات"
 
diff --git a/perl-install/share/po/az.po b/perl-install/share/po/az.po
index a48b15785..65a21d3d2 100644
--- a/perl-install/share/po/az.po
+++ b/perl-install/share/po/az.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-az\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2005-03-31 14:21+0200\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -1403,18 +1403,14 @@ msgstr "Başqa bölmə seçin"
 msgid "Choose a partition"
 msgstr "Bölmə seçin"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Normal moda keç"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Mütəxəssis moduna keç"
+msgid "More"
+msgstr "Daha Çox Seçim"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "Quraşdırma"
@@ -1464,13 +1460,17 @@ msgstr "Hamısını təmizlə"
 msgid "Auto allocate"
 msgstr "Avtomatik ayır"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Daha Çox Seçim"
+msgid "Toggle to normal mode"
+msgstr "Normal moda keç"
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Mütəxəssis moduna keç"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Sabit disk mə'lumatı"
@@ -1522,7 +1522,12 @@ msgstr "RAIDə əlavə et"
 msgid "Add to LVM"
 msgstr "LVMə əlavə et"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "İstifadəçi ID'si"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Sil"
@@ -1537,7 +1542,12 @@ msgstr "RAİD'dən ayır"
 msgid "Remove from LVM"
 msgstr "LVMdən ayır"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "LVMdən ayır"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "RAIDi dəyişdir"
@@ -1713,7 +1723,27 @@ msgstr ""
 "bütövlüyünü qorumaq üçün fayl sistemi yoxlamaları bir sonrakı\n"
 "Windows(TM) açılışınızda işə salınacaq."
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Fayl sistemi şifrələmə açarı"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Fayl sistemi şifrələmə açarınızı seçin"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Şifrələmə açarı"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Əlavə etmək üçün mövcud bir RAİD seçin"
@@ -1825,7 +1855,12 @@ msgstr "Yeni qurğuların fəallaşmağı üçün sistemi yenidən başlatmalıs
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "%s sürücüsünün bölmə cədvəli diskə yazılacaq"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "%s bölməsi şəkilləndirilir"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1958,7 +1993,27 @@ msgstr "Bağlı\n"
 msgid "RAID %s\n"
 msgstr "RAİD %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Şifrələmə açarı"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2060,12 +2115,7 @@ msgstr "Bölmə cədvəli növü: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "%d kanalında, %d id'li\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Fayl sistemi şifrələmə açarı"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Fayl sistemi şifrələmə açarınızı seçin"
@@ -2080,12 +2130,7 @@ msgstr "Bu şifrələmə açarı çox sadədir (ən az %d hərf böyüklüyünd�
 msgid "The encryption keys do not match"
 msgstr "Şifrələmə açarları uyğun gəlmir"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Şifrələmə açarı"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Şifrələrmə açarı (təkrar)"
@@ -2200,11 +2245,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "/boot/efi ünvanına bağlanmış FAT bölməniz olmalıdır"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "%s bölməsi şəkilləndirilir"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4636,7 +4676,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4644,8 +4687,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4665,52 +4708,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4724,9 +4772,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4864,7 +4912,55 @@ msgstr ""
 "Paris - France.\n"
 "For any question on this document, please contact Mandriva S.A.  \n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4882,67 +4978,55 @@ msgstr ""
 "Əgər patentlərin sizə ait olub olmadığını bilmirsinizsə yerli qanunlarınızı\n"
 "gözdən keçirin."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a şəbəkə. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6832,6 +6916,67 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Qurulum bacarılmadı"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a şəbəkə. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Vericilər üçün libsafe işlət"
 
diff --git a/perl-install/share/po/be.po b/perl-install/share/po/be.po
index 9acf7f4f3..a0d38314e 100644
--- a/perl-install/share/po/be.po
+++ b/perl-install/share/po/be.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2000-09-24 12:30 +0100\n"
 "Last-Translator: Alexander Bokovoy <ab@avilink.net>\n"
 "Language-Team: be\n"
@@ -1356,18 +1356,14 @@ msgstr "Стварэнне новага раздзелу"
 msgid "Choose a partition"
 msgstr "Абярыце дзеянне"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Звычайны рэжым"
-
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to expert mode"
-msgstr "Рэжым эксперту"
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
+#, fuzzy, c-format
+msgid "More"
+msgstr "Перанос"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Падцьверджаньне"
@@ -1415,13 +1411,17 @@ msgstr "Ачысціць усё"
 msgid "Auto allocate"
 msgstr "Размеркаваць аўтаматычна"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
-#, fuzzy, c-format
-msgid "More"
-msgstr "Перанос"
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to normal mode"
+msgstr "Звычайны рэжым"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Рэжым эксперту"
+
+#: diskdrake/interactive.pm:332
 #, fuzzy, c-format
 msgid "Hard drive information"
 msgstr "Канфігурацыя сістэмных сэрвісаў"
@@ -1475,7 +1475,12 @@ msgstr "Дадаць да RAID"
 msgid "Add to LVM"
 msgstr "Дадаць да LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ID карыстальніка"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Знішчыць"
@@ -1490,7 +1495,12 @@ msgstr "Выдаліць з RAID"
 msgid "Remove from LVM"
 msgstr "Выдаліць з LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Выдаліць з LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Змяніць RAID"
@@ -1657,7 +1667,27 @@ msgid ""
 "filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, fuzzy, c-format
+msgid "Filesystem encryption key"
+msgstr "Тыпы файлавых сістэмаў:"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Тыпы файлавых сістэмаў:"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr ""
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Абярыце існуючы RAID для дадання"
@@ -1769,7 +1799,12 @@ msgstr "Каб змяненні ўступілі ў дзеянне, необхо
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Табліца размяшчэння прылады %s будзе запісана на дыск"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Фарматаванне раздзелу %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Усе дадзеные ў раздзеле %s будуць страчаны пасля фарматавання"
@@ -1901,7 +1936,27 @@ msgstr "Заманціравана\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid "Encrypted"
+msgstr ""
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, fuzzy, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -1995,12 +2050,7 @@ msgstr "Тып табліцы раздзелаў: %s\n"
 msgid "on channel %d id %d\n"
 msgstr ""
 
-#: diskdrake/interactive.pm:1295
-#, fuzzy, c-format
-msgid "Filesystem encryption key"
-msgstr "Тыпы файлавых сістэмаў:"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr ""
@@ -2016,12 +2066,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Паролі не супадаюць"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr ""
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr ""
@@ -2134,11 +2179,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr ""
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Фарматаванне раздзелу %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4460,7 +4500,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4468,8 +4511,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4489,52 +4532,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4548,9 +4596,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4571,7 +4619,55 @@ msgid ""
 "For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4583,38 +4679,54 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
+#: messages.pm:123
 #, c-format
 msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
 "\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
 "\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
 "\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
 "\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
diff --git a/perl-install/share/po/bg.po b/perl-install/share/po/bg.po
index 485ece3ca..ab2e0d88d 100644
--- a/perl-install/share/po/bg.po
+++ b/perl-install/share/po/bg.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-bg\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2004-09-15 13:27+0200\n"
 "Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -1393,18 +1393,14 @@ msgstr "Изберете друг дял"
 msgid "Choose a partition"
 msgstr "Изберете дял"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Премини в Нормален режим"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Премини в Експертен режим"
+msgid "More"
+msgstr "Още"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "Настройка"
@@ -1452,13 +1448,17 @@ msgstr "Изчисти всичко"
 msgid "Auto allocate"
 msgstr "Автоматично създаване"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Още"
+msgid "Toggle to normal mode"
+msgstr "Премини в Нормален режим"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Премини в Експертен режим"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Информацията за твърдия диск"
@@ -1512,7 +1512,12 @@ msgstr "Прибави към RAID"
 msgid "Add to LVM"
 msgstr "Прибави към LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Потребителски номер"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Изтрий"
@@ -1527,7 +1532,12 @@ msgstr "Премахни от RAID"
 msgid "Remove from LVM"
 msgstr "Премахни от LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Премахни от LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Модифицирай RAID"
@@ -1696,7 +1706,27 @@ msgid ""
 "filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Криптиращ ключ за файлова система"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Избор на криптиращ ключ за еашата файлова система"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Ключ за криптиране"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Изберете съществуващ RAID за прибавяне"
@@ -1808,7 +1838,12 @@ msgstr "Трябва да рестартирате, преди променит�
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Таблицата на дяловете на устройство %s ще бъде записана върху диска"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Форматиране на дял %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "След форматиране на дяла %s, всички данни върху него ще бъдат загубени"
@@ -1940,7 +1975,27 @@ msgstr "Монтиран\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Ключ за криптиране"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2044,12 +2099,7 @@ msgstr "Тип на таблицата с дялове: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "на канал %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Криптиращ ключ за файлова система"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Избор на криптиращ ключ за еашата файлова система"
@@ -2065,12 +2115,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Ключовете за криптиране не съвпадат"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Ключ за криптиране"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Ключ за криптиране (отново)"
@@ -2187,11 +2232,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Трябва да имате FAT дял монтиран в /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Форматиране на дял %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4564,7 +4604,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4572,8 +4615,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4593,52 +4636,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4652,9 +4700,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4793,7 +4841,55 @@ msgstr ""
 "неговия оригинал на\n"
 "английски.\n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4805,68 +4901,55 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Внимание\n"
-"\n"
-"Моля, прочетете условията по-долу. Ако не сте съгласни с някое от тях,\n"
-"не можете да продължите инсталацията на следващия CD носител. Натиснете\n"
-"'Откажи', за да продължите инсталацията без тези носители.\n"
-"\n"
-"\n"
-"Някои компоненти съдържащи се в следващия CD носител не са разпространяват\n"
-"под GPL Лиценза или подобен такъв. Всеки такъв компонент е под условията\n"
-"и положенията на специфичния му лиценз. Моля, прочетете внимателно и изцяло\n"
-"тези специфични лицензи преди да използвате или разпространявате "
-"споменатите\n"
-"компоненти.\n"
-"Такива лицензи по принцип предотвратява преноса, копирането (освен с цел\n"
-"съхранение), разпространяването, обратния инженеринг, деасемблирането\n"
-"декомпилацията или модификацията на компонентите.\n"
-"Всяко нарушаване на спогодбата незабавно преустановява правата ви по\n"
-"специфичния лиценз. Освен ако специфичния лиценз ви дава такива права,\n"
-"обикновено не можете да инсталирате програмите на повече от една система\n"
-"или да ги пригаждате за използване в мрежа. Ако не сте сигурни, моля\n"
-"свържете се с дистрибуция или редактора на компонена.\n"
-"Прехвърлянето на трети лица или копирането на всяка компонента, включително\n"
-"на документацията, обикновено са забранени.\n"
-"\n"
-"\n"
-"Всички права на компонентите от следващия CD носител принадлежат на\n"
-"съответните им автори и са защитени като интелектуална собственост от\n"
-"законите за авторски права приложими за софтуерните програми.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6610,6 +6693,70 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Инсталацията провалена"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Внимание\n"
+#~ "\n"
+#~ "Моля, прочетете условията по-долу. Ако не сте съгласни с някое от тях,\n"
+#~ "не можете да продължите инсталацията на следващия CD носител. Натиснете\n"
+#~ "'Откажи', за да продължите инсталацията без тези носители.\n"
+#~ "\n"
+#~ "\n"
+#~ "Някои компоненти съдържащи се в следващия CD носител не са "
+#~ "разпространяват\n"
+#~ "под GPL Лиценза или подобен такъв. Всеки такъв компонент е под условията\n"
+#~ "и положенията на специфичния му лиценз. Моля, прочетете внимателно и "
+#~ "изцяло\n"
+#~ "тези специфични лицензи преди да използвате или разпространявате "
+#~ "споменатите\n"
+#~ "компоненти.\n"
+#~ "Такива лицензи по принцип предотвратява преноса, копирането (освен с цел\n"
+#~ "съхранение), разпространяването, обратния инженеринг, деасемблирането\n"
+#~ "декомпилацията или модификацията на компонентите.\n"
+#~ "Всяко нарушаване на спогодбата незабавно преустановява правата ви по\n"
+#~ "специфичния лиценз. Освен ако специфичния лиценз ви дава такива права,\n"
+#~ "обикновено не можете да инсталирате програмите на повече от една система\n"
+#~ "или да ги пригаждате за използване в мрежа. Ако не сте сигурни, моля\n"
+#~ "свържете се с дистрибуция или редактора на компонена.\n"
+#~ "Прехвърлянето на трети лица или копирането на всяка компонента, "
+#~ "включително\n"
+#~ "на документацията, обикновено са забранени.\n"
+#~ "\n"
+#~ "\n"
+#~ "Всички права на компонентите от следващия CD носител принадлежат на\n"
+#~ "съответните им автори и са защитени като интелектуална собственост от\n"
+#~ "законите за авторски права приложими за софтуерните програми.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Използвайте libsafe за сървъри"
 
diff --git a/perl-install/share/po/bn.po b/perl-install/share/po/bn.po
index d4829449e..7f822e534 100644
--- a/perl-install/share/po/bn.po
+++ b/perl-install/share/po/bn.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX HEAD\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2005-03-19 23:18+0600\n"
 "Last-Translator: Samia <mailsamia2001@yahoo.com>\n"
 "Language-Team: Bangla <mdk-translation@bengalinux.org>\n"
@@ -1407,18 +1407,14 @@ msgstr "অন্য একটি পার্টিশন পছন্দ ক�
 msgid "Choose a partition"
 msgstr "একটি পার্টিশন পছন্দ করুন"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "সাধারণ মোডে বদল করো"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "দক্ষ মোডে বদল করো"
+msgid "More"
+msgstr "আরও"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "কনফিগারেশন"
@@ -1470,13 +1466,17 @@ msgstr "সব বন্ধ করো"
 msgid "Auto allocate"
 msgstr "সয়ংক্রিয়ভাবে সাজানো"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "আরও"
+msgid "Toggle to normal mode"
+msgstr "সাধারণ মোডে বদল করো"
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "দক্ষ মোডে বদল করো"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "হার্ড ড্রাইভের তথ্য"
@@ -1530,7 +1530,12 @@ msgstr "RAID-তে যোগ করো"
 msgid "Add to LVM"
 msgstr "LVM-এ যোগ করো"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ব্যবহারকারীর ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "মুছে ফেলো"
@@ -1545,7 +1550,12 @@ msgstr "RAID থেকে মুছে ফেলো"
 msgid "Remove from LVM"
 msgstr "LVM থেকে মুছে ফেলো"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "LVM থেকে মুছে ফেলো"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "RAID পরিবর্তন করো"
@@ -1717,7 +1727,27 @@ msgstr ""
 "পার্টিশনের পুনরাকৃতির পর ডাটার সম্পূর্ণতা নিশ্চিত করার জন্য, \n"
 "উইন্ডোজে(TM) আপনার পরবর্তী বুটে ফাইলসিস্টেম পরীক্ষা চলবে"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "ফাইল সিস্টেমের এনক্রিপশন কী"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "আপনার ফাইল সিস্টেমের এনক্রিপশন কী পছন্দ করুন"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "এনক্রিপশন কী"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "যোগ করার জন্য উপস্থিত একটি RAID পছন্দ করুন"
@@ -1829,7 +1859,12 @@ msgstr "পরিবর্তনগুলি অবস্থান নেবা�
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "%s ড্রাইভের পার্টিশন টেবিল ডিস্কে লিখতে যাচ্ছি"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "%s পার্টিশন ফরম্যাট করা হচ্ছে"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "পার্টিশন %s -কে ফরমেট করার পরে এই পার্টিশনের সমস্থ ডাটা হারিয়ে যাবে"
@@ -1962,7 +1997,27 @@ msgstr "মাউন্ট করা হয়েছে\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "এনক্রিপশন কী"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2066,12 +2121,7 @@ msgstr "পার্টিশন টেবিলের ধরণ: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "%d চ্যানেলে %d আইডিতে\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "ফাইল সিস্টেমের এনক্রিপশন কী"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "আপনার ফাইল সিস্টেমের এনক্রিপশন কী পছন্দ করুন"
@@ -2086,12 +2136,7 @@ msgstr "এই এনক্রিপশন কী টি খুবই সাধ�
 msgid "The encryption keys do not match"
 msgstr "এনক্রিপশন কীগুলি মিলছেনা"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "এনক্রিপশন কী"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "এনক্রিপশন কী (পুনরায়)"
@@ -2206,11 +2251,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "আপনার /boot/efi -এ অবশ্যই একটি FAT পার্টিশন থাকতে হবে"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "%s পার্টিশন ফরম্যাট করা হচ্ছে"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4649,7 +4689,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4657,8 +4700,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4678,52 +4721,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4737,9 +4785,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4760,7 +4808,55 @@ msgid ""
 "For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4777,38 +4873,54 @@ msgstr ""
 "http://www.mp3licensing.com । আপনি যদি অনিশ্চিত হোন যদি এর যেকোন\n"
 "একটি আপনার জন্যও প্রযোজ্য হতে পারে, আপনার স্থানীয় আইন পরীক্ষা করুন।"
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
diff --git a/perl-install/share/po/br.po b/perl-install/share/po/br.po
index 33684b9f5..ed87dcd00 100644
--- a/perl-install/share/po/br.po
+++ b/perl-install/share/po/br.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX 10.2\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-02-23 16:06+0100\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
 "Language-Team: Brezhoneg <ofisk@wanadoo.fr>\n"
@@ -1369,18 +1369,14 @@ msgstr "Dibabit ur parzhadur all"
 msgid "Choose a partition"
 msgstr "Dibabit ur parzhadur"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Tremen er mod boas"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Tremen er mod mailh"
+msgid "More"
+msgstr "Mui"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Kadarnadur"
@@ -1428,13 +1424,17 @@ msgstr "Skarañ an holl"
 msgid "Auto allocate"
 msgstr "Ac'hubiñ ent emgefreek"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Mui"
+msgid "Toggle to normal mode"
+msgstr "Tremen er mod boas"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Tremen er mod mailh"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Titouroù ar bladenn"
@@ -1488,7 +1488,12 @@ msgstr "Ouzhpennañ da RAID"
 msgid "Add to LVM"
 msgstr "Ouzhpennañ da LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ID an arveriad"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Dilemel"
@@ -1503,7 +1508,12 @@ msgstr "Lemel diwar RAID"
 msgid "Remove from LVM"
 msgstr "Lemel diwar LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Lemel diwar LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Kemmañ RAID"
@@ -1670,7 +1680,27 @@ msgid ""
 "filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Alc'hwez enrinegadur ar reizhiad restroù"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Dibab hoc'h alc'hwez enrinegadur ar reizhiad restroù"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Alc'hwez enrinegadur"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Dibabit da be RAID ouzhpennañ"
@@ -1785,7 +1815,12 @@ msgstr "Ret e vo deoc'h adloc'hañ a-raok ma talvezo ar c'hemm"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "War-nes bezañ skrivet war bladenn eo taolenn barzhañ an ardivink %s"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "O furmadiñ ar parzhadur %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1918,7 +1953,27 @@ msgstr "Marc'het\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Alc'hwez enrinegadur"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2014,12 +2069,7 @@ msgstr "Seurt taolenn barzhañ : %s\n"
 msgid "on channel %d id %d\n"
 msgstr "war kanol %d Nn %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Alc'hwez enrinegadur ar reizhiad restroù"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Dibab hoc'h alc'hwez enrinegadur ar reizhiad restroù"
@@ -2035,12 +2085,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "An alc'hwezoù enrinegadur ne glot ket"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Alc'hwez enrinegadur"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Alc'hwez enrinegadur (adarre)"
@@ -2155,11 +2200,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Ret eo deoc'h kaout ur parzhadur FAT marc'het war /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "O furmadiñ ar parzhadur %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4527,7 +4567,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4535,8 +4578,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4556,52 +4599,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4615,9 +4663,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4638,7 +4686,55 @@ msgid ""
 "For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4650,38 +4746,54 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
+#: messages.pm:123
 #, c-format
 msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
 "\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
 "\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
 "\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
 "\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
diff --git a/perl-install/share/po/bs.po b/perl-install/share/po/bs.po
index 2795c8466..79a44da98 100644
--- a/perl-install/share/po/bs.po
+++ b/perl-install/share/po/bs.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bs\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2006-09-13 19:15+0200\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -1423,18 +1423,14 @@ msgstr "Izaberi drugu particiju"
 msgid "Choose a partition"
 msgstr "Izaberi particiju"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Prebaci u normalni mod"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Prebaci u ekspertni mod"
+msgid "More"
+msgstr "Još"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Potvrda"
@@ -1485,13 +1481,17 @@ msgstr "Obriši sve"
 msgid "Auto allocate"
 msgstr "Auto alokacija"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Još"
+msgid "Toggle to normal mode"
+msgstr "Prebaci u normalni mod"
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Prebaci u ekspertni mod"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Informacije o hard disku"
@@ -1545,7 +1545,12 @@ msgstr "Dodaj na RAID"
 msgid "Add to LVM"
 msgstr "Dodaj na LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Korisnički ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Obriši"
@@ -1560,7 +1565,12 @@ msgstr "Ukloni sa RAIDa"
 msgid "Remove from LVM"
 msgstr "Ukloni sa LVMa"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Ukloni sa LVMa"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Modificiraj RAID"
@@ -1737,7 +1747,27 @@ msgstr ""
 "prilikom idućeg pokretanja Windows(TM) biće izvršena provjera datotečnog "
 "sistema"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Ključ za kodiranje datotečnog sistema"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Izaberite vaš ključ za kodiranje datotečnog sistema"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Ključ enkripcije"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Izaberite postojeći RAID na koji ćete dodati"
@@ -1853,7 +1883,12 @@ msgstr ""
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Tabela particija za uređaj %s će biti zapisana na disk"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formatiram particiju %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1993,7 +2028,27 @@ msgstr "Montirana\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Ključ enkripcije"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2097,12 +2152,7 @@ msgstr "Tip tabele particija: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "na kanalu %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Ključ za kodiranje datotečnog sistema"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Izaberite vaš ključ za kodiranje datotečnog sistema"
@@ -2119,12 +2169,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Ključevi enkripcije se ne poklapaju"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Ključ enkripcije"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Ključ enkripcije (još jednom)"
@@ -2240,11 +2285,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Morate imati FAT particiju montiranu na /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formatiram particiju %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4677,7 +4717,7 @@ msgstr "Bootloader ne može rukovati /boot particijom na više fizičkih volumen
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4687,7 +4727,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4695,8 +4738,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4716,52 +4759,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4775,9 +4823,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4920,7 +4968,55 @@ msgstr ""
 "Paris - France.\n"
 "For any question on this document, please contact Mandriva S.A.  \n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4939,71 +5035,55 @@ msgstr ""
 "niste\n"
 "sigurni da li se patent odnosi na vas, provjerite vaše lokalne zakone."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Pažnja\n"
-"\n"
-"Molim pročitajte pažljivo uslove licence ispod. Ako se ne slažete sa bilo\n"
-"kojim dijelom, nije vam dozvoljeno da instalirate naredne CD medije. "
-"Pritisnite\n"
-"dugme 'Ne prihvatam' da biste nastavili sa instalacijom bez korištenja ovih "
-"medija.\n"
-"Budući da prevodilac ovog teksta nije u mogućnosti da osigura pravnu\n"
-"provjeru prevedenog teksta, tekst je ostavljen u originalnom (engleskom)\n"
-"obliku.\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6901,6 +6981,71 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Instalacija nije uspjela"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Pažnja\n"
+#~ "\n"
+#~ "Molim pročitajte pažljivo uslove licence ispod. Ako se ne slažete sa "
+#~ "bilo\n"
+#~ "kojim dijelom, nije vam dozvoljeno da instalirate naredne CD medije. "
+#~ "Pritisnite\n"
+#~ "dugme 'Ne prihvatam' da biste nastavili sa instalacijom bez korištenja "
+#~ "ovih medija.\n"
+#~ "Budući da prevodilac ovog teksta nije u mogućnosti da osigura pravnu\n"
+#~ "provjeru prevedenog teksta, tekst je ostavljen u originalnom (engleskom)\n"
+#~ "obliku.\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Koristi libsafe za servere"
 
diff --git a/perl-install/share/po/ca.po b/perl-install/share/po/ca.po
index 0a9911aa4..36d76a680 100644
--- a/perl-install/share/po/ca.po
+++ b/perl-install/share/po/ca.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2005-09-13 23:24+0200\n"
 "Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -1417,19 +1417,15 @@ msgstr "Trieu una altra partició"
 msgid "Choose a partition"
 msgstr "Trieu una partició"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Canvia al mode normal"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Canvia al mode expert"
+msgid "More"
+msgstr "Més"
 
 #
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "Configuració"
@@ -1479,13 +1475,17 @@ msgstr "Buida-ho tot"
 msgid "Auto allocate"
 msgstr "Assigna automàticament"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Més"
+msgid "Toggle to normal mode"
+msgstr "Canvia al mode normal"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Canvia al mode expert"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Informació del disc dur"
@@ -1539,7 +1539,12 @@ msgstr "Afegeix al RAID"
 msgid "Add to LVM"
 msgstr "Afegeix a l'LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ID d'usuari"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Suprimeix"
@@ -1554,7 +1559,12 @@ msgstr "Elimina del RAID"
 msgid "Remove from LVM"
 msgstr "Elimina de l'LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Elimina de l'LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Modifica el RAID"
@@ -1729,7 +1739,27 @@ msgstr ""
 "les comprovacions del sistema de fitxers es realitzaran el proper cop que "
 "arrenqueu en Windows(TM)"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Clau de xifratge del sistema de fitxers: "
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Escolliu la clau de xifratge del sistema de fitxers"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Clau de xifratge"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Escolliu un RAID existent al qual afegir-ho"
@@ -1842,7 +1872,12 @@ msgstr ""
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "La taula de particions de la unitat %s s'escriurà al disc"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "S'està formatant la partició %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Després de formatar la partició %s, se'n perdran totes les dades"
@@ -1974,7 +2009,27 @@ msgstr "Muntat\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Clau de xifratge"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2078,12 +2133,7 @@ msgstr "Tipus de taula de particions: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "al canal %d amb id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Clau de xifratge del sistema de fitxers: "
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Escolliu la clau de xifratge del sistema de fitxers"
@@ -2100,12 +2150,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Les claus de xifratge no coincideixen"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Clau de xifratge"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Clau de xifratge (un altre cop)"
@@ -2223,11 +2268,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Heu de tenir una partició FAT muntada en /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "S'està formatant la partició %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4676,7 +4716,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4684,8 +4727,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4705,52 +4748,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4764,9 +4812,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4889,7 +4937,55 @@ msgstr ""
 "Per a qualsevol tema relacionat amb aquest document, poseu-vos en\n"
 "contacte amb Mandriva S.A.\n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4910,71 +5006,55 @@ msgstr ""
 "patent és aplicable\n"
 "consulteu les lleis locals."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Avís\n"
-"\n"
-"Si us plau, llegiu atentament les clàusules següents. Si no esteu\n"
-"d'acord amb qualsevol d'elles, no esteu autoritzat a instal·lar\n"
-"els CD següents. Premeu 'Rebutja' per continuar la instal·lació\n"
-"sense utilitzar aquests CD.\n"
-"\n"
-"\n"
-"Alguns dels components que s'inclouen en aquest CD no estan\n"
-"regits per la llicència GPL o acords semblants. Cadascun d'aquests\n"
-"components es regeix per les clàusules i condicions de la seva\n"
-"pròpia llicència específica. Si us plau, llegiu atentament i\n"
-"accepteu aquestes llicències específiques abans d'utilitzar o\n"
-"redistribuir els components esmentats. En general, aquestes\n"
-"llicències impedeixen la transferència, duplicació (excepte amb\n"
-"la finalitat de fer-ne còpies de seguretat), redistribució,\n"
-"enginyeria inversa, desassemblatge, decompilació o modificació del\n"
-"component. Qualsevol violació de l'acord finalitzarà immediatament\n"
-"els vostres drets sobre la llicència específica. Tret que la\n"
-"llicència específica us en garanteixi els drets, normalment no\n"
-"podreu instal·lar els programes en més d'un sistema, ni adaptar-lo\n"
-"per utilitzar-lo en una xarxa. En cas de dubte, poseu-vos en\n"
-"contacte directament amb el distribuïdor o editor del component.\n"
-"La transferència a terceres parts i la còpia d'aquests components,\n"
-"incloent la documentació, estan en general prohibides.\n"
-"\n"
-"\n"
-"Tots els drets sobre els components del CD següent pertanyen als\n"
-"seus autors respectius i estan protegits per les lleis de\n"
-"propietat intel·lectual i de copyright aplicables als programes\n"
-"informàtics.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6895,6 +6975,70 @@ msgstr ""
 msgid "Installation failed"
 msgstr "La instal·lació ha fallat"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Avís\n"
+#~ "\n"
+#~ "Si us plau, llegiu atentament les clàusules següents. Si no esteu\n"
+#~ "d'acord amb qualsevol d'elles, no esteu autoritzat a instal·lar\n"
+#~ "els CD següents. Premeu 'Rebutja' per continuar la instal·lació\n"
+#~ "sense utilitzar aquests CD.\n"
+#~ "\n"
+#~ "\n"
+#~ "Alguns dels components que s'inclouen en aquest CD no estan\n"
+#~ "regits per la llicència GPL o acords semblants. Cadascun d'aquests\n"
+#~ "components es regeix per les clàusules i condicions de la seva\n"
+#~ "pròpia llicència específica. Si us plau, llegiu atentament i\n"
+#~ "accepteu aquestes llicències específiques abans d'utilitzar o\n"
+#~ "redistribuir els components esmentats. En general, aquestes\n"
+#~ "llicències impedeixen la transferència, duplicació (excepte amb\n"
+#~ "la finalitat de fer-ne còpies de seguretat), redistribució,\n"
+#~ "enginyeria inversa, desassemblatge, decompilació o modificació del\n"
+#~ "component. Qualsevol violació de l'acord finalitzarà immediatament\n"
+#~ "els vostres drets sobre la llicència específica. Tret que la\n"
+#~ "llicència específica us en garanteixi els drets, normalment no\n"
+#~ "podreu instal·lar els programes en més d'un sistema, ni adaptar-lo\n"
+#~ "per utilitzar-lo en una xarxa. En cas de dubte, poseu-vos en\n"
+#~ "contacte directament amb el distribuïdor o editor del component.\n"
+#~ "La transferència a terceres parts i la còpia d'aquests components,\n"
+#~ "incloent la documentació, estan en general prohibides.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tots els drets sobre els components del CD següent pertanyen als\n"
+#~ "seus autors respectius i estan protegits per les lleis de\n"
+#~ "propietat intel·lectual i de copyright aplicables als programes\n"
+#~ "informàtics.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Empra libsafe per als servidors"
 
diff --git a/perl-install/share/po/cs.po b/perl-install/share/po/cs.po
index 397a79984..65e84a461 100644
--- a/perl-install/share/po/cs.po
+++ b/perl-install/share/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cs\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-09-12 22:59+0200\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -1429,18 +1429,14 @@ msgstr "Vybrat jiný oddíl"
 msgid "Choose a partition"
 msgstr "Vyberte oddíl"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Přepnout se do módu 'normální'"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Přepnout se do režimu 'expert'"
+msgid "More"
+msgstr "Více"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Potvrzení"
@@ -1491,13 +1487,17 @@ msgstr "Vše smazat"
 msgid "Auto allocate"
 msgstr "Automaticky rozmístit"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Více"
+msgid "Toggle to normal mode"
+msgstr "Přepnout se do módu 'normální'"
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Přepnout se do režimu 'expert'"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Informace o pevném disku"
@@ -1552,7 +1552,12 @@ msgstr "Přidat do RAIDu"
 msgid "Add to LVM"
 msgstr "Přidat do LVMu"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ID uživatele"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Smazat"
@@ -1567,7 +1572,12 @@ msgstr "Odebrat z RAIDu"
 msgid "Remove from LVM"
 msgstr "Odebrat z LVMu"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Odebrat z LVMu"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Změnit RAID"
@@ -1738,7 +1748,27 @@ msgstr ""
 "Pro zachování integrity po provedené změně velikosti oddílu(ů) bude při\n"
 "dalším spuštění systému Windows provedena kontrola souborového systému."
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Klíč pro šifrovaný souborový systém"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Vyberte si šifrovací klíč pro souborový systém"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Šifrovací klíč"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Zvolte existující RAID pro přidání"
@@ -1852,7 +1882,12 @@ msgstr "Aby se změny uplatnily budete muset restartovat počítač"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Bude zapsána nová tabulka oddílů na disku %s"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formátuji oddíl %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Když naformátujete oddíl %s, ztratíte tím všechna jeho data"
@@ -1989,7 +2024,27 @@ msgstr "Připojený\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Šifrovací klíč"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2093,12 +2148,7 @@ msgstr "Typ tabulky oddílů: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "na kanále %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Klíč pro šifrovaný souborový systém"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Vyberte si šifrovací klíč pro souborový systém"
@@ -2114,12 +2164,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Šifrovací klíče se neshodují"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Šifrovací klíč"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Šifrovací klíč (znovu)"
@@ -2234,11 +2279,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Musíte mít FAT oddíl připojený na /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formátuji oddíl %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4670,7 +4710,7 @@ msgstr "Zavaděč neumí pracovat s adresářem /boot na více fyzických svazc�
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4680,7 +4720,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4688,8 +4731,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4709,52 +4752,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4768,9 +4816,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4906,7 +4954,55 @@ msgstr ""
 "Paris - France.\n"
 "For any question on this document, please contact Mandriva S.A.  \n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4924,64 +5020,55 @@ msgstr ""
 "nejste jisti, zda se na vás nevztahuje některý patent, prostudujte si\n"
 "vaše místně příslušné právní normy."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Varování\n"
-"\n"
-"Přečtěte si prosím pozorně následující termíny. Pokud s nimi nesouhlasíte,\n"
-"nejste oprávněn pokračovat v instalaci následujícím CD. Stiskněte\n"
-"\"Odmítnout\" pro pokračování v instalaci bez tohoto média.\n"
-"\n"
-"\n"
-"Některé programy na dalším CD médiu nejsou šířeny podle licence GPL či\n"
-"podobné. Každý z těchto programů je šířen podle vlastní licence a podmínek.\n"
-"Čtete pozorně tyto licence a podmínky před tím, než začnete daný software\n"
-"používat nebo šířit.\n"
-"Některé licence zakazují přenášení, vytváření duplikátů (mimo záložní "
-"kopii),\n"
-"další šíření, dekompilaci, reverzní engineering nebo modifikaci komponent.\n"
-"Každé porušení podmínek okamžitě přerušuje vaše práva podle dané licence.\n"
-"I když dané licence dávají nějaká práva, není dovoleno instalovat daný\n"
-"program na více systémů, přizpůsobovat ho provozu na síti. V případě\n"
-"pochybností kontaktujte distributora nebo výrobce daného programu.\n"
-"Přenechání práv třetím osobám nebo kopírování části komponent či\n"
-"dokumentace je také zakázáno.\n"
-"\n"
-"\n"
-"Všechna práva na programy na dalším CD médiu patří jejím právoplatným\n"
-"vlastníkům podle autorského zákona.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6878,6 +6965,68 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Instalace selhala"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Varování\n"
+#~ "\n"
+#~ "Přečtěte si prosím pozorně následující termíny. Pokud s nimi "
+#~ "nesouhlasíte,\n"
+#~ "nejste oprávněn pokračovat v instalaci následujícím CD. Stiskněte\n"
+#~ "\"Odmítnout\" pro pokračování v instalaci bez tohoto média.\n"
+#~ "\n"
+#~ "\n"
+#~ "Některé programy na dalším CD médiu nejsou šířeny podle licence GPL či\n"
+#~ "podobné. Každý z těchto programů je šířen podle vlastní licence a "
+#~ "podmínek.\n"
+#~ "Čtete pozorně tyto licence a podmínky před tím, než začnete daný "
+#~ "software\n"
+#~ "používat nebo šířit.\n"
+#~ "Některé licence zakazují přenášení, vytváření duplikátů (mimo záložní "
+#~ "kopii),\n"
+#~ "další šíření, dekompilaci, reverzní engineering nebo modifikaci "
+#~ "komponent.\n"
+#~ "Každé porušení podmínek okamžitě přerušuje vaše práva podle dané "
+#~ "licence.\n"
+#~ "I když dané licence dávají nějaká práva, není dovoleno instalovat daný\n"
+#~ "program na více systémů, přizpůsobovat ho provozu na síti. V případě\n"
+#~ "pochybností kontaktujte distributora nebo výrobce daného programu.\n"
+#~ "Přenechání práv třetím osobám nebo kopírování části komponent či\n"
+#~ "dokumentace je také zakázáno.\n"
+#~ "\n"
+#~ "\n"
+#~ "Všechna práva na programy na dalším CD médiu patří jejím právoplatným\n"
+#~ "vlastníkům podle autorského zákona.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Použít libsafe pro servery"
 
diff --git a/perl-install/share/po/cy.po b/perl-install/share/po/cy.po
index 34b4a9103..82c5037f9 100644
--- a/perl-install/share/po/cy.po
+++ b/perl-install/share/po/cy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mandriva DrakX.cy\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-08-20 08:35-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg <post@meddal.com>\n"
@@ -1415,18 +1415,14 @@ msgstr "Dewiswch raniad arall"
 msgid "Choose a partition"
 msgstr "Dewiswch raniad"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Arbenigwr > Cyffredinol"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Cyffredinol > Arbenigwr"
+msgid "More"
+msgstr "Rhagor"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Gwiriad"
@@ -1479,13 +1475,17 @@ msgstr "Clirio i gyd"
 msgid "Auto allocate"
 msgstr "Awto ddynodi"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Rhagor"
+msgid "Toggle to normal mode"
+msgstr "Arbenigwr > Cyffredinol"
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Cyffredinol > Arbenigwr"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Gwybodaeth am y ddisg galed"
@@ -1537,7 +1537,12 @@ msgstr "Ychwanegu i RAID"
 msgid "Add to LVM"
 msgstr "Ychwanegu i LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Enw Defnyddiwr"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Dileu"
@@ -1552,7 +1557,12 @@ msgstr "Tynnu o RAID"
 msgid "Remove from LVM"
 msgstr "Tynnu o LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Tynnu o LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Newid RAID"
@@ -1728,7 +1738,27 @@ msgstr ""
 "gwiriadau'r system ffeiliau'n cael eu gwneud wrth i chi ail gychwyn Windows "
 "(TM)"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Allwedd amgryptio system ffeil : "
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Dewiswch eich allwedd amgryptio system ffeiliau"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Allwedd amgryptio"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Dewis RAID presennol i ychwanegu ato"
@@ -1844,7 +1874,12 @@ msgstr "Mi fydd angen i chi ailgychwyn cyn i'r newidiadau ddod i rym"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Mae tabl rhaniad disg %s yn mynd i gael ei ysgrifennu i'r ddisg"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Yn fformatio rhaniad %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1982,7 +2017,27 @@ msgstr "Arosodwyd\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Allwedd amgryptio"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2086,12 +2141,7 @@ msgstr "Tabl rhaniad math: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "ar sianel %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Allwedd amgryptio system ffeil : "
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Dewiswch eich allwedd amgryptio system ffeiliau"
@@ -2107,12 +2157,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Nid yw'r allweddi amgryptio'n cyd-fynd"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Allwedd amgryptio"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Allwedd amgryptio (eto)"
@@ -2228,11 +2273,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Rhaid cael rhaniad FAT wedi ei arosod yn /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Yn fformatio rhaniad %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4660,7 +4700,7 @@ msgstr "Nid yw'r cychwynnydd yn gallu trin /boot ar gyfrolau ffisegol niferus"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4670,7 +4710,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4678,8 +4721,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4699,52 +4742,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4758,9 +4806,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4899,7 +4947,55 @@ msgstr ""
 "Barn, Paris - Ffrainc. Am unrhyw gwestiwn ynghylch y ddogfen hon cysylltwch "
 "â Mandriva S.A.  \n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4916,69 +5012,55 @@ msgstr ""
 "(gw. http://www.mp3licensing.com am wybodaeth bellach. Os nad ydych yn\n"
 "siŵr os yw'r patent yn berthnasol i chi, gwiriwch eich cyfreithiau lleol."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
-msgstr ""
-"\n"
-" Rhybudd\n"
-"\n"
-"Darllenwch yr amodau isod yn ofalus. Os ydych yn anghytuno gydag unrhyw\n"
-" ddarn, nid oes caniatâd i chi osod y cyfrwng CD nesaf. Pwyswch 'Gwrthod' i\n"
-" barhau'r gosodiad heb ddefnyddio'r cyfryngau hyn.\n"
-"\n"
-"Nid yw rhai cydrannau ar y CDau canlynol yn cael eu rheoli gan Drwydded GPL\n"
-" neu gytundebau tebyg. Mae'r cydrannau hynny'n cael eu rheoli gan dermau ac\n"
-" amodau ei drwydded benodol ei hun. Darllenwch yn ofalus a chadwch at y\n"
-" trwyddedau penodol cyn defnyddio neu ddosbarthu'r cydrannau hynny.\n"
-"\n"
-"Mae'r trwyddedau hynny'n atal yn gyffredinol, drosglwyddiad, dyblygu (ar "
-"wahan i\n"
-" bwrpas cadw wrth gefn), dosbarthu, cildroi peirianyddol, dadcydosod,\n"
-" dad-grynhoi neu newid y cydrannau. Bydd unrhyw dorri ar yr amodau hyn yn\n"
-"terfynu eich hawl  o dan y drwydded benodol. Oni bai ei fod yn rhoi'r hawl i "
-"chi,\n"
-"nid oes modd i chi osod y rhaglenni ar fwy nag un system na'i addasu ar "
-"gyfer\n"
-" defnydd ar rwydwaith. Os oes amheuaeth, cysylltwch yn uniongyrchol â\n"
-"dosbarthwr neu olygydd y cydrannau hynny.\n"
-"Mae trosglwyddo i drydydd parti neu gopïo'r cydrannau hynny gan gynnwys y\n"
-" ddogfennaeth, wedi ei wahardd fel rheol\n"
-"\n"
-"Mae pob hawl i gydrannau'r cyfrwng CD nesaf yn perthyn i' hawduron "
-"perthnasol\n"
-" ac maent wedi eu hamddiffyn drwy gyfreithiau eiddo deallusol a hawlfraint "
-"sy'n\n"
-" berthynol i raglenni meddalwedd.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
+msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6888,6 +6970,73 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Methodd y gosod"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ " Rhybudd\n"
+#~ "\n"
+#~ "Darllenwch yr amodau isod yn ofalus. Os ydych yn anghytuno gydag unrhyw\n"
+#~ " ddarn, nid oes caniatâd i chi osod y cyfrwng CD nesaf. Pwyswch 'Gwrthod' "
+#~ "i\n"
+#~ " barhau'r gosodiad heb ddefnyddio'r cyfryngau hyn.\n"
+#~ "\n"
+#~ "Nid yw rhai cydrannau ar y CDau canlynol yn cael eu rheoli gan Drwydded "
+#~ "GPL\n"
+#~ " neu gytundebau tebyg. Mae'r cydrannau hynny'n cael eu rheoli gan dermau "
+#~ "ac\n"
+#~ " amodau ei drwydded benodol ei hun. Darllenwch yn ofalus a chadwch at y\n"
+#~ " trwyddedau penodol cyn defnyddio neu ddosbarthu'r cydrannau hynny.\n"
+#~ "\n"
+#~ "Mae'r trwyddedau hynny'n atal yn gyffredinol, drosglwyddiad, dyblygu (ar "
+#~ "wahan i\n"
+#~ " bwrpas cadw wrth gefn), dosbarthu, cildroi peirianyddol, dadcydosod,\n"
+#~ " dad-grynhoi neu newid y cydrannau. Bydd unrhyw dorri ar yr amodau hyn "
+#~ "yn\n"
+#~ "terfynu eich hawl  o dan y drwydded benodol. Oni bai ei fod yn rhoi'r "
+#~ "hawl i chi,\n"
+#~ "nid oes modd i chi osod y rhaglenni ar fwy nag un system na'i addasu ar "
+#~ "gyfer\n"
+#~ " defnydd ar rwydwaith. Os oes amheuaeth, cysylltwch yn uniongyrchol â\n"
+#~ "dosbarthwr neu olygydd y cydrannau hynny.\n"
+#~ "Mae trosglwyddo i drydydd parti neu gopïo'r cydrannau hynny gan gynnwys "
+#~ "y\n"
+#~ " ddogfennaeth, wedi ei wahardd fel rheol\n"
+#~ "\n"
+#~ "Mae pob hawl i gydrannau'r cyfrwng CD nesaf yn perthyn i' hawduron "
+#~ "perthnasol\n"
+#~ " ac maent wedi eu hamddiffyn drwy gyfreithiau eiddo deallusol a "
+#~ "hawlfraint sy'n\n"
+#~ " berthynol i raglenni meddalwedd.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Defnyddiwch libsafe ar gyfer gweinyddion"
 
diff --git a/perl-install/share/po/da.po b/perl-install/share/po/da.po
index 87dd0e94e..8175aa1d5 100644
--- a/perl-install/share/po/da.po
+++ b/perl-install/share/po/da.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-03-22 12:06+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: dansk <dansk@dansk-gruppen.dk>\n"
@@ -1420,18 +1420,14 @@ msgstr "Vælg en ny partition"
 msgid "Choose a partition"
 msgstr "Vælg en partition"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Ekspert -> Normal"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Normal -> Ekspert"
+msgid "More"
+msgstr "Mere"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Bekræftelse"
@@ -1483,13 +1479,17 @@ msgstr "Slet alt"
 msgid "Auto allocate"
 msgstr "Allokér automatisk"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Mere"
+msgid "Toggle to normal mode"
+msgstr "Ekspert -> Normal"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Normal -> Ekspert"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Drev-information"
@@ -1543,7 +1543,12 @@ msgstr "Tilføj til RAID"
 msgid "Add to LVM"
 msgstr "Tilføj til LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Bruger-id"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Slet"
@@ -1558,7 +1563,12 @@ msgstr "Fjern fra RAID"
 msgid "Remove from LVM"
 msgstr "Fjern fra LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Fjern fra LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Ændr RAID"
@@ -1733,7 +1743,27 @@ msgstr ""
 "For at sikre dataintegritet efter ændring af størrelse på partitioner \n"
 "vil filsystemtjek blive kørt ved din næste opstart af Windows(TM)"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Krypteringsnøgle for filsystem"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Vælg din krypteringsnøgle for filsystemet"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Krypteringsnøgle"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Vælg en eksisterende RAID som skal udvides"
@@ -1848,7 +1878,12 @@ msgstr "Du skal genstarte maskinen for at aktivere ændringerne"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Partitionstabellen for disk %s vil nu blive skrevet på disken"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formaterer partition %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1987,7 +2022,27 @@ msgstr "Monteret\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Krypteringsnøgle"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2091,12 +2146,7 @@ msgstr "Partitionstabel-type: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "på kanal %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Krypteringsnøgle for filsystem"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Vælg din krypteringsnøgle for filsystemet"
@@ -2112,12 +2162,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Krypteringsnøglerne stemmer ikke overens"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Krypteringsnøgle"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Krypteringsnøgle (igen)"
@@ -2233,11 +2278,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Du skal have en FAT-partition monteret under /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formaterer partition %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4660,7 +4700,7 @@ msgstr "Opstartsindlæseren kan ikke håndtere /boot på flere fysiske volumer"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4670,7 +4710,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4678,8 +4721,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4699,52 +4742,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4758,9 +4806,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4868,8 +4916,56 @@ msgstr ""
 "rette domstol i Paris, Frankrig. Ved spørgsmål omkring dette dokument, "
 "kontakt venligst Mandriva S.A.  \n"
 
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
 # Mangler
-#: messages.pm:90
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4886,64 +4982,55 @@ msgstr ""
 "brug (se http://www.mp3licensing.com for flere detaljer) Hvis du er usikker "
 "om et patent kan vedrøre dig, så tjek din lokale lovgivning."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Advarsel\n"
-"\n"
-"Læs venligst betingelserne nedenfor omhyggeligt. Hvis du ikke er enig i alt "
-"der står, må du ikke installere indholdet af CD-en. Tryk på 'Nægt'  for at "
-"fortsætte installationen uden disse cdrommer.\n"
-"\n"
-"\n"
-"Visse komponenter på den næste CD er ikke omfattet af GPL-licensen eller  "
-"andre lignende licenser. Hver enkelt komponent er derfor omfattet af  de "
-"betingelser der er beskrevet i dets egen licens.  Læs derfor venligst "
-"betingelserne omhyggeligt og følg de opstillede betingelser når du bruger og/"
-"eller videredistribuerer komponenterne. Sådanne licenser forhindrer normalt "
-"kopiering (sikkerhedskopiering undtaget),  videredistribuering, at folk "
-"skiller programmet ad, eller ændrer i komponenterne. Ethvert brud på "
-"licensen vil øjeblikkeligt fratage dig rettighederne beskrevet i den "
-"specifikke licens. Medmindre licensen giver dig lov hertil, vil det  normalt "
-"ikke være tilladt at installere programmet på mere end én maskine,  eller "
-"bruge det på et netværk. Hvis du er i tvivl, så kontakt venligst producenten "
-"af komponenten direkte. Overdragelse til tredjemand eller kopiering af "
-"sådanne komponenter inklusive  dokumentationen er normalt forbudt.\n"
-"\n"
-"\n"
-"Alle rettigheder til komponenterne på CD-en tilhører deres respektive "
-"skabere og er beskyttet af Lov om Ophavsret.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6849,6 +6936,64 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Installation mislykkedes"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Advarsel\n"
+#~ "\n"
+#~ "Læs venligst betingelserne nedenfor omhyggeligt. Hvis du ikke er enig i "
+#~ "alt der står, må du ikke installere indholdet af CD-en. Tryk på 'Nægt'  "
+#~ "for at fortsætte installationen uden disse cdrommer.\n"
+#~ "\n"
+#~ "\n"
+#~ "Visse komponenter på den næste CD er ikke omfattet af GPL-licensen eller  "
+#~ "andre lignende licenser. Hver enkelt komponent er derfor omfattet af  de "
+#~ "betingelser der er beskrevet i dets egen licens.  Læs derfor venligst "
+#~ "betingelserne omhyggeligt og følg de opstillede betingelser når du bruger "
+#~ "og/eller videredistribuerer komponenterne. Sådanne licenser forhindrer "
+#~ "normalt kopiering (sikkerhedskopiering undtaget),  videredistribuering, "
+#~ "at folk skiller programmet ad, eller ændrer i komponenterne. Ethvert brud "
+#~ "på licensen vil øjeblikkeligt fratage dig rettighederne beskrevet i den "
+#~ "specifikke licens. Medmindre licensen giver dig lov hertil, vil det  "
+#~ "normalt ikke være tilladt at installere programmet på mere end én "
+#~ "maskine,  eller bruge det på et netværk. Hvis du er i tvivl, så kontakt "
+#~ "venligst producenten af komponenten direkte. Overdragelse til tredjemand "
+#~ "eller kopiering af sådanne komponenter inklusive  dokumentationen er "
+#~ "normalt forbudt.\n"
+#~ "\n"
+#~ "\n"
+#~ "Alle rettigheder til komponenterne på CD-en tilhører deres respektive "
+#~ "skabere og er beskyttet af Lov om Ophavsret.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Brug libsafe for servere"
 
diff --git a/perl-install/share/po/de.po b/perl-install/share/po/de.po
index 8027f9f55..5818c9a5e 100644
--- a/perl-install/share/po/de.po
+++ b/perl-install/share/po/de.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-09-16 11:01+0200\n"
 "Last-Translator: Oliver Burger <oliver@mandrivauser.de>\n"
 "Language-Team: deutsch <cooker-i18n@mandrivalinux.org>\n"
@@ -224,7 +224,8 @@ msgstr "einschränken"
 
 #: any.pm:421
 #, c-format
-msgid "Option ``Restrict command line options'' is of no use without a password"
+msgid ""
+"Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "Die Option „Gebrauch der Kommandozeilen-Parameter einschränken“ ist ohne \n"
 "Angabe eines Passwortes wirkungslos."
@@ -415,7 +416,8 @@ msgstr "Bitte geben Sie einen Benutzernamen an"
 
 #: any.pm:776
 #, c-format
-msgid "The user name must contain only lower cased letters, numbers, `-' and `_'"
+msgid ""
+"The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 "Der Benutzername sollte nur aus Kleinbuchstaben, Ziffern, \n"
 "„-“ und „_“ bestehen"
@@ -674,7 +676,8 @@ msgstr ""
 
 #: any.pm:1222
 #, c-format
-msgid "You can export using NFS or SMB. Please select which you would like to use."
+msgid ""
+"You can export using NFS or SMB. Please select which you would like to use."
 msgstr ""
 "Sie können die Dateien mittels SMB oder NFS anbieten. Welche Variante wollen "
 "Sie?"
@@ -782,8 +785,10 @@ msgstr "Lokale Datei:"
 
 #: authentication.pm:64
 #, c-format
-msgid "Use local for all authentication and information user tell in local file"
-msgstr "Benutze lokale Dateien zur Authentifizierung und für Benutzerinformationen"
+msgid ""
+"Use local for all authentication and information user tell in local file"
+msgstr ""
+"Benutze lokale Dateien zur Authentifizierung und für Benutzerinformationen"
 
 #: authentication.pm:65
 #, c-format
@@ -1043,7 +1048,8 @@ msgstr "Kein Passwort"
 #: authentication.pm:253
 #, c-format
 msgid "This password is too short (it must be at least %d characters long)"
-msgstr "Dieses Passwort ist zu einfach (es muss mindestens %d Zeichen lang sein)!"
+msgstr ""
+"Dieses Passwort ist zu einfach (es muss mindestens %d Zeichen lang sein)!"
 
 #: authentication.pm:358
 #, c-format
@@ -1456,18 +1462,14 @@ msgstr "Wählen Sie eine andere Partition"
 msgid "Choose a partition"
 msgstr "Wählen Sie eine Partition"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "In den Normal-Modus wechseln"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "In den Experten-Modus wechseln"
+msgid "More"
+msgstr "Mehr"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Bestätigung"
@@ -1520,13 +1522,17 @@ msgstr "Alles löschen"
 msgid "Auto allocate"
 msgstr "Automatisches Erstellen"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Mehr"
+msgid "Toggle to normal mode"
+msgstr "In den Normal-Modus wechseln"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "In den Experten-Modus wechseln"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Festplatten-Informationen"
@@ -1580,7 +1586,12 @@ msgstr "Zum RAID hinzufügen"
 msgid "Add to LVM"
 msgstr "Zum LVM hinzufügen"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Benutzer ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Löschen"
@@ -1595,7 +1606,12 @@ msgstr "Aus dem RAID löschen"
 msgid "Remove from LVM"
 msgstr "Aus dem LVM löschen"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Aus dem LVM löschen"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "RAID modifizieren"
@@ -1659,7 +1675,8 @@ msgstr "Die Loopback-Datei entfernen?"
 
 #: diskdrake/interactive.pm:532
 #, c-format
-msgid "After changing type of partition %s, all data on this partition will be lost"
+msgid ""
+"After changing type of partition %s, all data on this partition will be lost"
 msgstr ""
 "Nach Änderung des Partitionstyps von %s, werden sämtliche Daten darauf "
 "gelöscht."
@@ -1771,7 +1788,27 @@ msgstr ""
 "zu gewährleisten, wird Windows™ beim nächsten Hochfahren eine\n"
 "Dateisystemprüfung durchführen."
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Dateisystem-Schlüssel"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Wählen Sie Ihren Dateisystem-Schlüssel (Passwort)"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Schlüssel"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Wählen Sie einen vorhandenen RAID"
@@ -1881,17 +1918,24 @@ msgstr "Welcher Partitionstyp?"
 #: diskdrake/interactive.pm:1064
 #, c-format
 msgid "You'll need to reboot before the modification can take place"
-msgstr "Sie müssen Ihren Rechner neu starten, damit die Veränderungen wirksam werden."
+msgstr ""
+"Sie müssen Ihren Rechner neu starten, damit die Veränderungen wirksam werden."
 
 #: diskdrake/interactive.pm:1073
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Die Partitionstabelle der Platte „%s“ wird gespeichert"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formatiere Partition „%s“"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
-msgstr "Nach Formatieren der Partition %s, werden sämtliche Daten darauf gelöscht."
+msgstr ""
+"Nach Formatieren der Partition %s, werden sämtliche Daten darauf gelöscht."
 
 #: diskdrake/interactive.pm:1103 fs/partitioning.pm:48
 #, c-format
@@ -2026,7 +2070,27 @@ msgstr "Eingehängt\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Schlüssel"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2133,12 +2197,7 @@ msgstr "Partitionstabellentyp: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "auf Kanal %d ID %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Dateisystem-Schlüssel"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Wählen Sie Ihren Dateisystem-Schlüssel (Passwort)"
@@ -2146,19 +2205,15 @@ msgstr "Wählen Sie Ihren Dateisystem-Schlüssel (Passwort)"
 #: diskdrake/interactive.pm:1299
 #, c-format
 msgid "This encryption key is too simple (must be at least %d characters long)"
-msgstr "Dieses Passwort ist zu einfach (es muss mindestens %d Zeichen lang sein)!"
+msgstr ""
+"Dieses Passwort ist zu einfach (es muss mindestens %d Zeichen lang sein)!"
 
 #: diskdrake/interactive.pm:1300
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "Die Passwörter stimmen nicht überein"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Schlüssel"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Schlüssel (erneut)"
@@ -2203,7 +2258,8 @@ msgstr "Anderer"
 
 #: diskdrake/smbnfs_gtk.pm:178
 #, c-format
-msgid "Please enter your username, password and domain name to access this host."
+msgid ""
+"Please enter your username, password and domain name to access this host."
 msgstr "Bitte geben Sie Benutzername, Passwort und Domäne des Rechners an."
 
 #: diskdrake/smbnfs_gtk.pm:180
@@ -2271,11 +2327,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "/boot/efi muss eine FAT Partition sein"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formatiere Partition „%s“"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -2640,7 +2691,8 @@ msgstr "Partitionierung"
 #: fs/partitioning_wizard.pm:168
 #, c-format
 msgid "Which size do you want to keep for Microsoft Windows® on partition %s?"
-msgstr "Wieviel Platz benötigen sie noch für Microsoft Windows® auf Partition %s?"
+msgstr ""
+"Wieviel Platz benötigen sie noch für Microsoft Windows® auf Partition %s?"
 
 #: fs/partitioning_wizard.pm:169
 #, c-format
@@ -2727,7 +2779,8 @@ msgstr "Partitionierunsgfehler: %s"
 #: fs/type.pm:370
 #, c-format
 msgid "You can not use JFS for partitions smaller than 16MB"
-msgstr "Sie können JFS nicht für Partitionen verwenden, die kleiner als 16MB sind!"
+msgstr ""
+"Sie können JFS nicht für Partitionen verwenden, die kleiner als 16MB sind!"
 
 #: fs/type.pm:371
 #, c-format
@@ -2845,12 +2898,14 @@ msgstr ""
 #: fsedit.pm:423
 #, c-format
 msgid "You can not use an encrypted file system for mount point %s"
-msgstr "Sie können kein verschlüsseltes Medium für den Einhängepunkt %s verwenden."
+msgstr ""
+"Sie können kein verschlüsseltes Medium für den Einhängepunkt %s verwenden."
 
 #: fsedit.pm:487
 #, c-format
 msgid "Not enough free space for auto-allocating"
-msgstr "Nicht genug freier Platz, damit ich selbst eine Partition anlegen kann."
+msgstr ""
+"Nicht genug freier Platz, damit ich selbst eine Partition anlegen kann."
 
 #: fsedit.pm:489
 #, c-format
@@ -3161,7 +3216,7 @@ msgstr ""
 "Hier können Sie einen alternativen Treiber (entweder OSS oder ALSA) für Ihre "
 "Soundkarte (%s) auswählen"
 
-#. -PO: here the first %s is either "OSS" or "ALSA",
+#. -PO: here the first %s is either "OSS" or "ALSA", 
 #. -PO: the second %s is the name of the current driver
 #. -PO: and the third %s is the name of the default driver
 #: harddrake/sound.pm:392
@@ -4715,11 +4770,12 @@ msgstr "Entfernen Sie erst die Logischen Medien\n"
 #: lvm.pm:184
 #, c-format
 msgid "The bootloader can't handle /boot on multiple physical volumes"
-msgstr "Der Bootloader beherrscht „/boot“ nicht auf mehreren physischen Datenträgern"
+msgstr ""
+"Der Bootloader beherrscht „/boot“ nicht auf mehreren physischen Datenträgern"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4729,7 +4785,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4737,8 +4796,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4758,52 +4817,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4817,9 +4881,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4951,7 +5015,55 @@ msgstr ""
 "Zu jeglicher Frage zu diesem Dokument kontaktieren Sie bitte\n"
 "Mandriva S. A.\n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4970,70 +5082,55 @@ msgstr ""
 "unsicher \n"
 "sind ob ein Patent sie betrifft prüfen Sie die Gesetze Ihres Landes."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Achtung\n"
-"\n"
-"Bitte lesen Sie die nachfolgenden Ausführungen sorgfältig. Wenn Sie mit\n"
-"irgendeinem Teil nicht einverstanden sind, dürfen Sie nicht den Inhalt\n"
-"der folgenden CDs installieren. Klicken Sie auf „Zurückweisen“, um die\n"
-"Installation ohne Verwendung dieser CDs fortzusetzen.\n"
-"\n"
-"\n"
-"Einige Komponenten auf den nachfolgenden CDs unterliegen nicht der GPL\n"
-"oder ähnlichen Lizenzabkommen. Jede dieser Komponenten unterliegt dann\n"
-"den Bedingungen ihrer eigenen spezifischen Lizenz.\n"
-"Bitte lesen Sie diese Lizenzen sorgfältig und nur wenn Sie mit ihnen\n"
-"einverstanden sind, dürfen Sie die entsprechenden Produkte entsprechend\n"
-"ihrer Lizenz benutzen und weitergeben.\n"
-"Solche Lizenzen verbieten im allgemeinen das Transferieren, Duplizieren\n"
-"(außer für Sicherheitskopien), Weitergeben, Decompilieren, Disassamblen\n"
-"oder Verändern der Komponente.\n"
-"Jeder Bruch des Lizenzabkommens beendet sofort die Ihnen im Rahmen der\n"
-"Lizenz eingeräumten Rechte. Wenn die jeweilige Lizenz Ihnen nicht\n"
-"entsprechende Rechte einräumt, dürfen Sie die Programme nicht auf mehr\n"
-"als einem System installieren oder zur Benutzung in einem Netzwerk\n"
-"einrichten. Im Zweifelsfall kontaktieren Sie bitte den Vertreiber oder\n"
-"Herausgeber der jeweiligen Komponente.\n"
-"Transfer an Dritte oder Kopieren solcher Komponenten inklusive ihrer\n"
-"Dokumentation ist normalerweise verboten.\n"
-"\n"
-"\n"
-"Alle Rechte an den Komponenten der nachfolgenden CDs liegen bei den\n"
-"jeweiligen Autoren und sind durch die Urheberrechtsgesetze für\n"
-"Softwareprodukte geschützt.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -5300,7 +5397,8 @@ msgstr "Konnte Verknüpfung /usr/share/sane/%s nicht erstellen!"
 #: scanner.pm:113
 #, c-format
 msgid "Could not copy firmware file %s to /usr/share/sane/firmware!"
-msgstr "Ich konnte die Firmware Datei %s nicht auf /usr/share/sane/firmware kopieren!"
+msgstr ""
+"Ich konnte die Firmware Datei %s nicht auf /usr/share/sane/firmware kopieren!"
 
 #: scanner.pm:120
 #, c-format
@@ -5377,7 +5475,8 @@ msgstr "Erlaube direkte Root Anmeldung."
 
 #: security/help.pm:33
 #, c-format
-msgid "Allow the list of users on the system on display managers (kdm and gdm)."
+msgid ""
+"Allow the list of users on the system on display managers (kdm and gdm)."
 msgstr ""
 "Erlaube die Liste der Benutzer dieses Rechner im Displaymanager (kdm und "
 "gdm)."
@@ -5563,7 +5662,8 @@ msgstr ""
 #: security/help.pm:102
 #, c-format
 msgid "Set password aging to \"max\" days and delay to change to \"inactive\"."
-msgstr "Setze Passwort-Alterung auf „maximal“ Tage um die Alterung abzuschalten."
+msgstr ""
+"Setze Passwort-Alterung auf „maximal“ Tage um die Alterung abzuschalten."
 
 #: security/help.pm:104
 #, c-format
@@ -5642,12 +5742,14 @@ msgstr "Wenn auf „Ja“ gesetzt, prüfe auf leere Passwörter in /etc/shadow."
 #: security/help.pm:122
 #, c-format
 msgid "if set to yes, verify checksum of the suid/sgid files."
-msgstr "Wenn auf „Ja“ gesetzt, kontrolliere die Prüfsumme der suid/sgid Dateien"
+msgstr ""
+"Wenn auf „Ja“ gesetzt, kontrolliere die Prüfsumme der suid/sgid Dateien"
 
 #: security/help.pm:123
 #, c-format
 msgid "if set to yes, check additions/removals of suid root files."
-msgstr "Wenn auf „Ja“ gesetzt, Suche von Veränderungen bei „suid root“ Dateien."
+msgstr ""
+"Wenn auf „Ja“ gesetzt, Suche von Veränderungen bei „suid root“ Dateien."
 
 #: security/help.pm:124
 #, c-format
@@ -5668,8 +5770,10 @@ msgstr "Wenn auf „Ja“ gesetzt, starte chkrootkit Überprüfung"
 
 #: security/help.pm:127
 #, c-format
-msgid "if set, send the mail report to this email address else send it to root."
-msgstr "Wenn ausgefüllt, wird E-Mail an diese Adresse geschickt, sonst an „root“."
+msgid ""
+"if set, send the mail report to this email address else send it to root."
+msgstr ""
+"Wenn ausgefüllt, wird E-Mail an diese Adresse geschickt, sonst an „root“."
 
 #: security/help.pm:128
 #, c-format
@@ -5896,7 +6000,8 @@ msgstr "Prüfe auf ungesicherte Benutzerkonten"
 #: security/l10n.pm:47
 #, c-format
 msgid "Check permissions of files in the users' home"
-msgstr "Überprüfe Dateiberechtigungen in den persönlichen Verzeichnissen (/home)"
+msgstr ""
+"Überprüfe Dateiberechtigungen in den persönlichen Verzeichnissen (/home)"
 
 #: security/l10n.pm:48
 #, c-format
@@ -5951,7 +6056,8 @@ msgstr "Keine leeren E-Mail-Berichte senden"
 #: security/l10n.pm:58
 #, c-format
 msgid "If set, send the mail report to this email address else send it to root"
-msgstr "Wenn ausgefüllt, wird E-Mail an diese Adresse geschickt, sonst an „root“."
+msgstr ""
+"Wenn ausgefüllt, wird E-Mail an diese Adresse geschickt, sonst an „root“."
 
 #: security/l10n.pm:59
 #, c-format
@@ -6151,8 +6257,11 @@ msgstr ""
 
 #: services.pm:28
 #, c-format
-msgid "Common UNIX Printing System (CUPS) is an advanced printer spooling system"
-msgstr "Das Common UNIX Printing System (CUPS) ist ein fortgeschrittenes Drucker-Warteschlangensystem"
+msgid ""
+"Common UNIX Printing System (CUPS) is an advanced printer spooling system"
+msgstr ""
+"Das Common UNIX Printing System (CUPS) ist ein fortgeschrittenes Drucker-"
+"Warteschlangensystem"
 
 #: services.pm:29
 #, c-format
@@ -6199,7 +6308,8 @@ msgstr ""
 
 #: services.pm:38
 #, c-format
-msgid "Apache is a World Wide Web server. It is used to serve HTML files and CGI."
+msgid ""
+"Apache is a World Wide Web server. It is used to serve HTML files and CGI."
 msgstr ""
 "Apache ist ein World-Wide-Web-Server. Mit seiner Hilfe können Sie \n"
 "HTML-Dateien über HTTP publizieren. Der Server ist CGI-fähig."
@@ -6294,7 +6404,9 @@ msgstr ""
 msgid ""
 "DBUS is a daemon which broadcasts notifications of system events and other "
 "messages"
-msgstr "DBUS ist ein Dienst, der Meldungen über System-Ereignisse und andere Nachrichten überträgt"
+msgstr ""
+"DBUS ist ein Dienst, der Meldungen über System-Ereignisse und andere "
+"Nachrichten überträgt"
 
 #: services.pm:58
 #, c-format
@@ -6356,7 +6468,8 @@ msgstr ""
 #: services.pm:68
 #, c-format
 msgid "Synchronizes system time using the Network Time Protocol (NTP)"
-msgstr "Synchronisiert die Systemzeit unter Benutzung des Network Time Protocol (NTP)"
+msgstr ""
+"Synchronisiert die Systemzeit unter Benutzung des Network Time Protocol (NTP)"
 
 #: services.pm:69
 #, c-format
@@ -6471,15 +6584,20 @@ msgstr ""
 
 #: services.pm:92
 #, c-format
-msgid "SANE (Scanner Access Now Easy) enables to access scanners, video cameras, ..."
-msgstr "SANE (Scanner Access Now Easy) erlaubt es, Scanner, Videokameras und ähnliches anzusprechen"
+msgid ""
+"SANE (Scanner Access Now Easy) enables to access scanners, video cameras, ..."
+msgstr ""
+"SANE (Scanner Access Now Easy) erlaubt es, Scanner, Videokameras und "
+"ähnliches anzusprechen"
 
 #: services.pm:93
 #, c-format
 msgid ""
 "The SMB/CIFS protocol enables to share access to files & printers and also "
 "integrates with a Windows Server domain"
-msgstr "DAS SMB/CIFS Protokoll erlaubt es, den Zugang zu Dateien und Druckern zu teilen und integriert sich auch in eine Windows Server Umgebung"
+msgstr ""
+"DAS SMB/CIFS Protokoll erlaubt es, den Zugang zu Dateien und Druckern zu "
+"teilen und integriert sich auch in eine Windows Server Umgebung"
 
 #: services.pm:94
 #, c-format
@@ -6491,7 +6609,9 @@ msgstr "Starten des Sound-Systems Ihres Rechners"
 msgid ""
 "Secure Shell is a network protocol that allows data to be exchanged over a "
 "secure channel between two computers"
-msgstr "Secure Shell ist ein Netzwerkprotokoll, das es erlaubt, Daten über eine sichere Verbindung zwischen zwei Computern auszutauschen"
+msgstr ""
+"Secure Shell ist ein Netzwerkprotokoll, das es erlaubt, Daten über eine "
+"sichere Verbindung zwischen zwei Computern auszutauschen"
 
 #: services.pm:96
 #, c-format
@@ -6971,3 +7091,65 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Die Installation schlug fehl!"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Achtung\n"
+#~ "\n"
+#~ "Bitte lesen Sie die nachfolgenden Ausführungen sorgfältig. Wenn Sie mit\n"
+#~ "irgendeinem Teil nicht einverstanden sind, dürfen Sie nicht den Inhalt\n"
+#~ "der folgenden CDs installieren. Klicken Sie auf „Zurückweisen“, um die\n"
+#~ "Installation ohne Verwendung dieser CDs fortzusetzen.\n"
+#~ "\n"
+#~ "\n"
+#~ "Einige Komponenten auf den nachfolgenden CDs unterliegen nicht der GPL\n"
+#~ "oder ähnlichen Lizenzabkommen. Jede dieser Komponenten unterliegt dann\n"
+#~ "den Bedingungen ihrer eigenen spezifischen Lizenz.\n"
+#~ "Bitte lesen Sie diese Lizenzen sorgfältig und nur wenn Sie mit ihnen\n"
+#~ "einverstanden sind, dürfen Sie die entsprechenden Produkte entsprechend\n"
+#~ "ihrer Lizenz benutzen und weitergeben.\n"
+#~ "Solche Lizenzen verbieten im allgemeinen das Transferieren, Duplizieren\n"
+#~ "(außer für Sicherheitskopien), Weitergeben, Decompilieren, Disassamblen\n"
+#~ "oder Verändern der Komponente.\n"
+#~ "Jeder Bruch des Lizenzabkommens beendet sofort die Ihnen im Rahmen der\n"
+#~ "Lizenz eingeräumten Rechte. Wenn die jeweilige Lizenz Ihnen nicht\n"
+#~ "entsprechende Rechte einräumt, dürfen Sie die Programme nicht auf mehr\n"
+#~ "als einem System installieren oder zur Benutzung in einem Netzwerk\n"
+#~ "einrichten. Im Zweifelsfall kontaktieren Sie bitte den Vertreiber oder\n"
+#~ "Herausgeber der jeweiligen Komponente.\n"
+#~ "Transfer an Dritte oder Kopieren solcher Komponenten inklusive ihrer\n"
+#~ "Dokumentation ist normalerweise verboten.\n"
+#~ "\n"
+#~ "\n"
+#~ "Alle Rechte an den Komponenten der nachfolgenden CDs liegen bei den\n"
+#~ "jeweiligen Autoren und sind durch die Urheberrechtsgesetze für\n"
+#~ "Softwareprodukte geschützt.\n"
diff --git a/perl-install/share/po/el.po b/perl-install/share/po/el.po
index ea035608d..91fc7c793 100644
--- a/perl-install/share/po/el.po
+++ b/perl-install/share/po/el.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-el\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-06-15 03:20+0200\n"
 "Last-Translator: nikos papadopoulos <231036448@freemail.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -1434,18 +1434,14 @@ msgstr "Επιλέξτε άλλη κατάτμηση"
 msgid "Choose a partition"
 msgstr "Επιλέξτε κατάτμηση"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Αλλαγή σε κανονικό τρόπο λειτουργίας"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Αλλαγή σε προχωρημένο τρόπο λειτουργίας"
+msgid "More"
+msgstr "Άλλα"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Επιβεβαίωση"
@@ -1499,13 +1495,17 @@ msgstr "Καθαρισμός όλων"
 msgid "Auto allocate"
 msgstr "Αυτόματη κατανομή"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Άλλα"
+msgid "Toggle to normal mode"
+msgstr "Αλλαγή σε κανονικό τρόπο λειτουργίας"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Αλλαγή σε προχωρημένο τρόπο λειτουργίας"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Πληροφορίες σκληρού δίσκου"
@@ -1559,7 +1559,12 @@ msgstr "Προσθήκη στο RAID"
 msgid "Add to LVM"
 msgstr "Προσθήκη στο LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ID Χρήστη"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Διαγραφή"
@@ -1574,7 +1579,12 @@ msgstr "Αφαίρεση από το RAID"
 msgid "Remove from LVM"
 msgstr "Αφαίρεση από το LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Αφαίρεση από το LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Τροποποίηση RAID"
@@ -1754,7 +1764,27 @@ msgstr ""
 "κατά την επόμενη φορά που θα εκκινήσεις τα Microsoft Windows®, θα "
 "εκτελεστούν έλεγχοι του συστήματος αρχείων"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Κλειδί κρυπτογράφησης συστήματος αρχείων"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Επιλέξτε το κλειδί κρυπτογράφησης του συστήματος αρχείων"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Κλειδί κρυπτογράφησης"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Επιλέξτε ένα υπάρχον RAID στο οποίο θα γίνει η προσθήκη"
@@ -1869,7 +1899,12 @@ msgstr "Απαιτείται επανεκκίνηση για να εφαρμοσ
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Ο πίνακας κατατμήσεων του δίσκου %s θα αποθηκευτεί στον δίσκο"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Μορφοποίηση κατάτμησης %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -2010,7 +2045,27 @@ msgstr "Προσαρτημένο\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Κλειδί κρυπτογράφησης"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2113,12 +2168,7 @@ msgstr "Τύπος πίνακα κατατμήσεων: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "στο κανάλι %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Κλειδί κρυπτογράφησης συστήματος αρχείων"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Επιλέξτε το κλειδί κρυπτογράφησης του συστήματος αρχείων"
@@ -2135,12 +2185,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Τα κλειδιά κρυπτογράφησης είναι ανόμοια"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Κλειδί κρυπτογράφησης"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Κλειδί κρυπτογράφησης (ξανά)"
@@ -2256,11 +2301,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Πρέπει να έχετε μια κατάτμηση FAT προσαρτημένη στο /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Μορφοποίηση κατάτμησης %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4712,7 +4752,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4720,8 +4763,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4741,52 +4784,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4800,9 +4848,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4898,7 +4946,55 @@ msgstr ""
 " Όλα\n"
 " Γαλλία\n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4910,66 +5006,55 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-" Προσοχή\n"
-"\n"
-"\n"
-" Άρνηση\n"
-"\n"
-"\n"
-"\n"
-"\n"
-" Άδεια\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-" Μεταφορά\n"
-"\n"
-"\n"
-"\n"
-" Όλα\n"
-"\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6930,6 +7015,66 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Η εγκατάσταση απέτυχε"
 
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ " Προσοχή\n"
+#~ "\n"
+#~ "\n"
+#~ " Άρνηση\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ " Άδεια\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ " Μεταφορά\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ " Όλα\n"
+#~ "\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Χρήση libsafe για διακομιστές"
 
diff --git a/perl-install/share/po/eo.po b/perl-install/share/po/eo.po
index 88373a9bf..3eb3fe5ae 100644
--- a/perl-install/share/po/eo.po
+++ b/perl-install/share/po/eo.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2003-03-12 18:31-0400\n"
 "Last-Translator: Vilhelmo Lutermano <vlutermano@free.fr>\n"
 "Language-Team: esperanto <eo@li.org>\n"
@@ -1380,18 +1380,14 @@ msgstr "Elektu alian subdiskon"
 msgid "Choose a partition"
 msgstr "Elektu subdiskon"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Ŝanĝu al Normala reĝimo"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Ŝanĝu al Spertula reĝimo"
+msgid "More"
+msgstr "Plu"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "Konfigurado"
@@ -1439,13 +1435,17 @@ msgstr "Forviŝu ĉion"
 msgid "Auto allocate"
 msgstr "Aŭtomate disponigu"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Plu"
+msgid "Toggle to normal mode"
+msgstr "Ŝanĝu al Normala reĝimo"
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Ŝanĝu al Spertula reĝimo"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Informoj pri fiksdisko(j)"
@@ -1499,7 +1499,12 @@ msgstr "Aldonu al RAID (Redundanca Aro de Malmultekostaj Diskoj)"
 msgid "Add to LVM"
 msgstr "Aldonu al LVM (Redundanca Aro de Malmultekostaj Diskoj)"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Uzula ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Forigu"
@@ -1514,7 +1519,12 @@ msgstr "Forigu de RAID (Redundanca Aro de Malmultekostaj Diskoj)"
 msgid "Remove from LVM"
 msgstr "Forigu de LVM (Redundanca Aro de Malmultekostaj Diskoj)"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Forigu de LVM (Redundanca Aro de Malmultekostaj Diskoj)"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Ŝanĝu RAID (Redundanca Aro de Malmultekostaj Diskoj)"
@@ -1688,7 +1698,27 @@ msgid ""
 "filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, fuzzy, c-format
+msgid "Filesystem encryption key"
+msgstr "Speco de dosiersistemo: "
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Speco de dosiersistemo: "
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Ĉifroŝlosilo:"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Elektu ekzistantan RAID por aldoni"
@@ -1802,7 +1832,12 @@ msgstr "Vi bezonos restarti antaŭ ol la ŝanĝo povas efektiviĝi"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "La subdisktabelo de drajvo %s estos skribata al disko"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formatas subdiskon %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1936,7 +1971,27 @@ msgstr "Muntita\n"
 msgid "RAID %s\n"
 msgstr "RAID (Redundanca Aro de Malmultekostaj Diskoj) %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Ĉifroŝlosilo:"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2036,12 +2091,7 @@ msgstr "Subdiskotabelospeco: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "ĉe kanalo %d identigaĵo %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, fuzzy, c-format
-msgid "Filesystem encryption key"
-msgstr "Speco de dosiersistemo: "
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr ""
@@ -2057,12 +2107,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "La pasvortoj ne egalas"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Ĉifroŝlosilo:"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr ""
@@ -2178,11 +2223,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Vi devas havi FAT-subdiskon en /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formatas subdiskon %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4548,7 +4588,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4556,8 +4599,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4577,52 +4620,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4636,9 +4684,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4683,7 +4731,55 @@ msgstr ""
 "Iu ajn provo instali, duobligi aŭ uzi la softvarproduktojn en maniero kiu ne "
 "kongruas kun la teksto kaj kondiĉoj de tiu ĉi licenco estas\n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4695,67 +4791,55 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
+#: messages.pm:123
 #, c-format
 msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
 "\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
 "\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
 "\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
 "\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Averto\n"
-"Bonvolu zorge legi la suban tekston. Se vi malsamopinias kun iu\n"
-"parto, vi ne rajtas instali la venontan KD-enhavon. Premu 'Rifuzas'\n"
-"por daŭrigi la instaladon sen uzi tiun KD-enhavon.\n"
-"\n"
-"\n"
-"Iuj komponantoj entenataj en la venonta KD ne estas regataj\n"
-"de la GPL-licenco aŭ similaj interkonsentoj. Ĉiu tia komponanto estas\n"
-"tiam regata de la teksto kaj kondiĉoj de ĝia propra specifa licenco.\n"
-"Bonvolu zorge legi tiajn specifajn licencojn kaj agi laŭ ili antaŭ\n"
-"ol uzi aŭ redisdoni la nomitajn komponantojn.\n"
-"Tiaj licencoj ĝenerale malhelpas transdonon, duobligon\n"
-"(escepte por savkopioj), redistribuadon, 'reverse engineering',\n"
-"malmuntadon, malkompiladon aŭ modifadon de la komponento.\n"
-"Ĉia rompo de la konsento tuj ĉesigos viajn rajtojn sub\n"
-"la respektiva licenco. Escepte se la specifa licenco donas al vi tiajn\n"
-"rajtojn, vi kutime ne povas instali la programojn sur pli ol unu\n"
-"sistemo, aŭ adapti ĝin por uzi ĝin en reto. En duba kazo bonvole kontaktu\n"
-"rekte la disdoninton aŭ la eldoninton de la komponanto.\n"
-"Transdonado al triaj partoj aŭ kopiado de tiaj komponantoj inkluzive de la \n"
-"dokumentaĵo normale estas malpermesita.\n"
-"\n"
-"\n"
-"Ĉiuj rajtoj pri la komponantoj de la venonta KD apartenas al ties\n"
-"respektivaj aŭtoroj kaj estas protektataj de leĝoj pri intelekta propraĵo "
-"kaj\n"
-"kopirajto aplikeblaj al softvaraj programoj.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6543,6 +6627,68 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Instalado malsukcesis"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Averto\n"
+#~ "Bonvolu zorge legi la suban tekston. Se vi malsamopinias kun iu\n"
+#~ "parto, vi ne rajtas instali la venontan KD-enhavon. Premu 'Rifuzas'\n"
+#~ "por daŭrigi la instaladon sen uzi tiun KD-enhavon.\n"
+#~ "\n"
+#~ "\n"
+#~ "Iuj komponantoj entenataj en la venonta KD ne estas regataj\n"
+#~ "de la GPL-licenco aŭ similaj interkonsentoj. Ĉiu tia komponanto estas\n"
+#~ "tiam regata de la teksto kaj kondiĉoj de ĝia propra specifa licenco.\n"
+#~ "Bonvolu zorge legi tiajn specifajn licencojn kaj agi laŭ ili antaŭ\n"
+#~ "ol uzi aŭ redisdoni la nomitajn komponantojn.\n"
+#~ "Tiaj licencoj ĝenerale malhelpas transdonon, duobligon\n"
+#~ "(escepte por savkopioj), redistribuadon, 'reverse engineering',\n"
+#~ "malmuntadon, malkompiladon aŭ modifadon de la komponento.\n"
+#~ "Ĉia rompo de la konsento tuj ĉesigos viajn rajtojn sub\n"
+#~ "la respektiva licenco. Escepte se la specifa licenco donas al vi tiajn\n"
+#~ "rajtojn, vi kutime ne povas instali la programojn sur pli ol unu\n"
+#~ "sistemo, aŭ adapti ĝin por uzi ĝin en reto. En duba kazo bonvole "
+#~ "kontaktu\n"
+#~ "rekte la disdoninton aŭ la eldoninton de la komponanto.\n"
+#~ "Transdonado al triaj partoj aŭ kopiado de tiaj komponantoj inkluzive de "
+#~ "la \n"
+#~ "dokumentaĵo normale estas malpermesita.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ĉiuj rajtoj pri la komponantoj de la venonta KD apartenas al ties\n"
+#~ "respektivaj aŭtoroj kaj estas protektataj de leĝoj pri intelekta propraĵo "
+#~ "kaj\n"
+#~ "kopirajto aplikeblaj al softvaraj programoj.\n"
+
 #, fuzzy
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Elektu opciojn por servilo"
diff --git a/perl-install/share/po/es.po b/perl-install/share/po/es.po
index 39ee54a10..99116a58e 100644
--- a/perl-install/share/po/es.po
+++ b/perl-install/share/po/es.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-es\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2007-09-24 18:26-0300\n"
 "Last-Translator: Fabián Mandelbaum <fmandelbaum@gmail.com>\n"
 "Language-Team: Español <es@li.org>\n"
@@ -1423,18 +1423,14 @@ msgstr "Elija otra partición"
 msgid "Choose a partition"
 msgstr "Elija una partición"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Cambiar al modo normal"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Cambiar al modo experto"
+msgid "More"
+msgstr "Más"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Confirmación"
@@ -1488,13 +1484,17 @@ msgstr "Borrar todas"
 msgid "Auto allocate"
 msgstr "Asignación automática"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Más"
+msgid "Toggle to normal mode"
+msgstr "Cambiar al modo normal"
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Cambiar al modo experto"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Información del disco rígido"
@@ -1548,7 +1548,12 @@ msgstr "Añadir al RAID"
 msgid "Add to LVM"
 msgstr "Añadir al LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ID de usuario"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Borrar"
@@ -1563,7 +1568,12 @@ msgstr "Quitar del RAID"
 msgid "Remove from LVM"
 msgstr "Quitar del LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Quitar del LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Modificar el RAID"
@@ -1738,7 +1748,27 @@ msgstr ""
 "las particiones, se pueden ejecutar verificaciones de los sist. de archivos\n"
 "la próxima vez que arranque en Windows(TM)"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Clave de cifrado del sistema de archivos"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Elija la clave de cifrado de su sistema de archivos"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Clave de cifrado"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Elegir un RAID existente al que añadir"
@@ -1852,7 +1882,12 @@ msgstr "Necesita reiniciar el equipo para que la modificación tenga efecto"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "¡Se escribirá al disco la tabla de particiones de la unidad %s"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formateando la partición %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Se perderán todos los datos de la partición %s después de formatearla"
@@ -1990,7 +2025,27 @@ msgstr "Montado\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Clave de cifrado"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2094,12 +2149,7 @@ msgstr "Tipo de la tabla de particiones: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "en el canal %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Clave de cifrado del sistema de archivos"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Elija la clave de cifrado de su sistema de archivos"
@@ -2116,12 +2166,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Las claves de cifrado no coinciden"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Clave de cifrado"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Clave de cifrado (otra vez)"
@@ -2239,11 +2284,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Debe tener una partición FAT montada en /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formateando la partición %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4689,7 +4729,7 @@ msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4699,7 +4739,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4707,8 +4750,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4728,52 +4771,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4787,9 +4835,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4927,7 +4975,55 @@ msgstr ""
 "Para cualquier pregunta relacionada con este documento, por favor,\n"
 "póngase en contacto con Mandriva S.A.\n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4947,74 +5043,55 @@ msgstr ""
 "para más detalles). Si no está seguro si una patente puede o no aplicarse\n"
 "a Usted, por favor consulte las leyes locales."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
-msgstr ""
-"\n"
-"Importante\n"
-"\n"
-"Haga el favor de leer cuidadosamente el presente documento. En caso de "
-"desacuerdo\n"
-"con el presente documento, no está autorizado a instalar los demás\n"
-"CD.  En este caso seleccione 'Rechazar' para seguir la instalación sin\n"
-"estos CD.\n"
-"\n"
-"\n"
-"Algunos componentes de software contenidos en los siguientes CD no\n"
-"están sometidos a las licencias GPL o similares que permitan la copia,\n"
-"adaptación o redistribución.  Cada uno de los componentes de software\n"
-"esta distribuido bajo los términos y condiciones de un acuerdo de\n"
-"licencia propio. Por favor, dirájase a éste y acéptelo antes de instalarlo,\n"
-"usarlo o redistribuirlo. Generalmente, estas licencias no autorizan la\n"
-"copia (salvo las destinadas a copias de seguridad), la distribución, "
-"descompilación,\n"
-"desensamblado, ingeniería inversa, reconstitución de la lógica del\n"
-"programa y/o modificación, salvo en la medida y para las necesidades\n"
-"autorizadas por las leyes vigentes.  Toda violación de la licencia\n"
-"vigente implica generalmente la caducidad de está, sin perjuicio a\n"
-"todos los demás derechos o acciones dirigidos en contra de Ud. Salvo si\n"
-"el acuerdo de licencia lo autoriza, no puede instalar estos programas\n"
-"en más de una máquina, ni adaptarlos para un uso en red. Si fuese\n"
-"necesario, contacte con el distribuidor de cada programa para\n"
-"obtener licencias adicionales. La distribución a terceros de copias de\n"
-"los programas o de la documentación que lo acompaña generalmente\n"
-"suele estar prohibida.\n"
-"\n"
-"\n"
-"Todos los derechos, títulos e intereses de esos programas son la\n"
-"propiedad exclusiva de sus autores respectivos y están protegidos por el\n"
-"derecho de la propiedad intelectual y otras leyes aplicables al derecho\n"
-"del software.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
+msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6960,6 +7037,74 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Falló la instalación"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Importante\n"
+#~ "\n"
+#~ "Haga el favor de leer cuidadosamente el presente documento. En caso de "
+#~ "desacuerdo\n"
+#~ "con el presente documento, no está autorizado a instalar los demás\n"
+#~ "CD.  En este caso seleccione 'Rechazar' para seguir la instalación sin\n"
+#~ "estos CD.\n"
+#~ "\n"
+#~ "\n"
+#~ "Algunos componentes de software contenidos en los siguientes CD no\n"
+#~ "están sometidos a las licencias GPL o similares que permitan la copia,\n"
+#~ "adaptación o redistribución.  Cada uno de los componentes de software\n"
+#~ "esta distribuido bajo los términos y condiciones de un acuerdo de\n"
+#~ "licencia propio. Por favor, dirájase a éste y acéptelo antes de "
+#~ "instalarlo,\n"
+#~ "usarlo o redistribuirlo. Generalmente, estas licencias no autorizan la\n"
+#~ "copia (salvo las destinadas a copias de seguridad), la distribución, "
+#~ "descompilación,\n"
+#~ "desensamblado, ingeniería inversa, reconstitución de la lógica del\n"
+#~ "programa y/o modificación, salvo en la medida y para las necesidades\n"
+#~ "autorizadas por las leyes vigentes.  Toda violación de la licencia\n"
+#~ "vigente implica generalmente la caducidad de está, sin perjuicio a\n"
+#~ "todos los demás derechos o acciones dirigidos en contra de Ud. Salvo si\n"
+#~ "el acuerdo de licencia lo autoriza, no puede instalar estos programas\n"
+#~ "en más de una máquina, ni adaptarlos para un uso en red. Si fuese\n"
+#~ "necesario, contacte con el distribuidor de cada programa para\n"
+#~ "obtener licencias adicionales. La distribución a terceros de copias de\n"
+#~ "los programas o de la documentación que lo acompaña generalmente\n"
+#~ "suele estar prohibida.\n"
+#~ "\n"
+#~ "\n"
+#~ "Todos los derechos, títulos e intereses de esos programas son la\n"
+#~ "propiedad exclusiva de sus autores respectivos y están protegidos por el\n"
+#~ "derecho de la propiedad intelectual y otras leyes aplicables al derecho\n"
+#~ "del software.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Utilizar libsafe para los servidores"
 
diff --git a/perl-install/share/po/et.po b/perl-install/share/po/et.po
index 2d59e69dc..a97f533ef 100644
--- a/perl-install/share/po/et.po
+++ b/perl-install/share/po/et.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-et\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-09-06 13:54+0200\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -1417,18 +1417,14 @@ msgstr "Valige muu partitsioon"
 msgid "Choose a partition"
 msgstr "Valige partitsioon"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Lülitu tavarežiimi"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Lülitu ekspertrežiimi"
+msgid "More"
+msgstr "Veel..."
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Kinnitus"
@@ -1479,13 +1475,17 @@ msgstr "Kustuta kõik"
 msgid "Auto allocate"
 msgstr "Automaatne jagamine"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Veel..."
+msgid "Toggle to normal mode"
+msgstr "Lülitu tavarežiimi"
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Lülitu ekspertrežiimi"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Kõvaketta info"
@@ -1539,7 +1539,12 @@ msgstr "Lisa RAIDi"
 msgid "Add to LVM"
 msgstr "Lisa LVMi"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Kasutaja ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Kustuta"
@@ -1554,7 +1559,12 @@ msgstr "Eemalda RAIDist"
 msgid "Remove from LVM"
 msgstr "Eemalda LVMist"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Eemalda LVMist"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Modifitseeri RAIDi"
@@ -1726,7 +1736,27 @@ msgstr ""
 "Andmete terviklikkuse tagamiseks pärast partitsiooni(de) suuruse muutmist \n"
 "kontrollitakse järgmisel Windows(TM) alglaadimisel failisüsteemi"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Failisüsteemi krüptovõti"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Valige failisüsteemi krüptovõti"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Krüptovõti"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Valige olemasolev RAID, millele lisada"
@@ -1840,7 +1870,12 @@ msgstr "Muudatuste rakendamiseks vajate alglaadimist"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Ketta %s partitsioonitabel salvestatakse"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Partitsiooni %s vormindamine"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Partitsiooni %s vormindamisel hävivad sellel kõik andmed"
@@ -1977,7 +2012,27 @@ msgstr "Haagitud\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Krüptovõti"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2082,12 +2137,7 @@ msgstr "Partitsioonitabeli tüüp: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "kanalil %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Failisüsteemi krüptovõti"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Valige failisüsteemi krüptovõti"
@@ -2102,12 +2152,7 @@ msgstr "See krüptovõti on liiga lihtne (peaks olema vähemalt %d märki)"
 msgid "The encryption keys do not match"
 msgstr "Krüptovõtmed ei klapi"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Krüptovõti"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Krüptovõti (uuesti)"
@@ -2222,11 +2267,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Teil peab olema FAT-partitsioon haagitud asukohas /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Partitsiooni %s vormindamine"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4653,7 +4693,7 @@ msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4663,7 +4703,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4671,8 +4714,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4692,52 +4735,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4751,9 +4799,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4894,7 +4942,55 @@ msgstr ""
 "Paris - France.\n"
 "For any question on this document, please contact Mandriva S.A.  \n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4913,70 +5009,55 @@ msgstr ""
 "patent\n"
 "may be applicable to you, check your local laws."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Hoiatus\n"
-"\n"
-"Palun lugege hoolega järgnevat teksti. Kui Te ei ole nõus kõigi "
-"alljärgnevate\n"
-"väidetega, on paigaldamine järgmise CD pealt keelatud. Klõpsake nupule "
-"\"Keeldun\",\n"
-"et jätkata paigaldamist ilma selle CD-ta.\n"
-"\n"
-"\n"
-"Mõned komponendid järgmisel CD-l ei ole kaitstud Üldise Avaliku Litsentsi\n"
-"või muude sarnaste litsentsidega, vaid kasutavad omaenda erilisi\n"
-"litsentsivorme. Seepärast lugege sellised litsentsid hoolega läbi ja\n"
-"tutvuge nende tingimustega, enne kui hakata neid komponente kasutama\n"
-"või levitama.\n"
-"Üldiselt kipuvad sellised litsentsid keelama komponendi kopeerimise,\n"
-"duplitseerimise (välja arvatud varundamise sihil), edastamise, muutmise\n"
-"või edasiarendamise.\n"
-"Litsentsilepingu tingimuste rikkumine lõpetab otsekohe kõik Teie õigused,\n"
-"mis kaasnesid litsentsiga nõustumisel. Kui mõni konkreetne litsentsi\n"
-"punkt Teile selliseid õigusi ei anna, ei või Te enamasti paigaldada "
-"rakendust\n"
-"enam kui ühte süsteemi ega muuta seda võrgutöö huvides. Kui Te ei ole\n"
-"tingimustes kindel, võtke ühendust komponendi levitaja või arendajaga.\n"
-"Üldjuhul on selliste komponentide, sealhulgas dokumentatsiooni, edastamine\n"
-"kolmandale poolele või kopeerimine keelatud.\n"
-"\n"
-"\n"
-"Kõigi järgmisel CD-l paiknevate komponentide õigused kuuluvad vastavalt\n"
-"nende autorile ning on kaitstud tarkvara puhul kehtivate intellektuaalse\n"
-"omandi ja autoriõiguse seadustega.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6862,6 +6943,72 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Paigaldamine nurjus"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Hoiatus\n"
+#~ "\n"
+#~ "Palun lugege hoolega järgnevat teksti. Kui Te ei ole nõus kõigi "
+#~ "alljärgnevate\n"
+#~ "väidetega, on paigaldamine järgmise CD pealt keelatud. Klõpsake nupule "
+#~ "\"Keeldun\",\n"
+#~ "et jätkata paigaldamist ilma selle CD-ta.\n"
+#~ "\n"
+#~ "\n"
+#~ "Mõned komponendid järgmisel CD-l ei ole kaitstud Üldise Avaliku "
+#~ "Litsentsi\n"
+#~ "või muude sarnaste litsentsidega, vaid kasutavad omaenda erilisi\n"
+#~ "litsentsivorme. Seepärast lugege sellised litsentsid hoolega läbi ja\n"
+#~ "tutvuge nende tingimustega, enne kui hakata neid komponente kasutama\n"
+#~ "või levitama.\n"
+#~ "Üldiselt kipuvad sellised litsentsid keelama komponendi kopeerimise,\n"
+#~ "duplitseerimise (välja arvatud varundamise sihil), edastamise, muutmise\n"
+#~ "või edasiarendamise.\n"
+#~ "Litsentsilepingu tingimuste rikkumine lõpetab otsekohe kõik Teie "
+#~ "õigused,\n"
+#~ "mis kaasnesid litsentsiga nõustumisel. Kui mõni konkreetne litsentsi\n"
+#~ "punkt Teile selliseid õigusi ei anna, ei või Te enamasti paigaldada "
+#~ "rakendust\n"
+#~ "enam kui ühte süsteemi ega muuta seda võrgutöö huvides. Kui Te ei ole\n"
+#~ "tingimustes kindel, võtke ühendust komponendi levitaja või arendajaga.\n"
+#~ "Üldjuhul on selliste komponentide, sealhulgas dokumentatsiooni, "
+#~ "edastamine\n"
+#~ "kolmandale poolele või kopeerimine keelatud.\n"
+#~ "\n"
+#~ "\n"
+#~ "Kõigi järgmisel CD-l paiknevate komponentide õigused kuuluvad vastavalt\n"
+#~ "nende autorile ning on kaitstud tarkvara puhul kehtivate intellektuaalse\n"
+#~ "omandi ja autoriõiguse seadustega.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Serveritel kasutatakse libsafe'i"
 
diff --git a/perl-install/share/po/eu.po b/perl-install/share/po/eu.po
index cf18d142d..98c4a4a0a 100644
--- a/perl-install/share/po/eu.po
+++ b/perl-install/share/po/eu.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libDrakX\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-04-24 12:53+0200\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: Euskara <eu@li.org>\n"
@@ -1416,18 +1416,14 @@ msgstr "Aukeratu beste partizio bat"
 msgid "Choose a partition"
 msgstr "Aukeratu partizio bat"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Aldatu modu normalera"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Aldatu aditu-modura"
+msgid "More"
+msgstr "Gehiago"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Baieztapena"
@@ -1479,13 +1475,17 @@ msgstr "Garbitu dena"
 msgid "Auto allocate"
 msgstr "Auto-esleitu"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Gehiago"
+msgid "Toggle to normal mode"
+msgstr "Aldatu modu normalera"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Aldatu aditu-modura"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Disko zurrunaren informazioa"
@@ -1539,7 +1539,12 @@ msgstr "Gehitu RAIDi"
 msgid "Add to LVM"
 msgstr "Gehitu LVMri"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Erabiltzaile ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Ezabatu"
@@ -1554,7 +1559,12 @@ msgstr "Kendu RAIDetik"
 msgid "Remove from LVM"
 msgstr "Kendu LVMtik"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Kendu LVMtik"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Aldatu RAID"
@@ -1728,7 +1738,27 @@ msgstr ""
 "fitxategi-sistemaren probak exekutatuko dira Windows(TM) hurrengo\n"
 "aldiz abiaraztean."
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Fitxategi-sistema enkriptatzeko gakoa"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Aukeratu fitxategi-sistema enkriptatzeko gakoa"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Enkriptatze-gakoa"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Aukeratu lehendik dagoen RAID bat gehitzeko"
@@ -1844,7 +1874,12 @@ msgstr "Berrabiarazi egin beharko duzu aldaketek eragina izan dezaten"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "%s unitateko partizio-taula diskoan idaztera doa"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "%s partizioa formateatzen"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1983,7 +2018,27 @@ msgstr "Muntatuta\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Enkriptatze-gakoa"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2087,12 +2142,7 @@ msgstr "Partizio-taularen mota: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "-  kanala: %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Fitxategi-sistema enkriptatzeko gakoa"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Aukeratu fitxategi-sistema enkriptatzeko gakoa"
@@ -2108,12 +2158,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Enkriptatze-gakoak ez datoz bat"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Enkriptatze-gakoa"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Enkriptatze-gakoa (berriro)"
@@ -2227,11 +2272,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "FAT partizio bat eduki behar duzu /boot/efi-n muntatuta"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "%s partizioa formateatzen"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4667,7 +4707,7 @@ msgstr "Abio-zamatzaileak ezin du /boot bolumen fisiko anitzetan maneiatu"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4677,7 +4717,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4685,8 +4728,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4706,52 +4749,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4765,9 +4813,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4901,7 +4949,55 @@ msgstr ""
 "Dokumentu honi buruzko edozein zalantza argitzeko, jarri harremanetan\n"
 "Mandriva S.A.rekin.  \n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4921,69 +5017,55 @@ msgstr ""
 "patente \n"
 "bat aplika daitekeen zalantzak badituzu, aztertu zure tokiko legeak."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Abisua\n"
-"\n"
-"Irakurri arretaz ondorengo baldintzak. Zerbaitekin ados ez bazaude,\n"
-"ez duzu hurrengo CDa instalatzeko baimenik. Sakatu 'Ezetsi' \n"
-"instalazioa euskarri horiek erabili gabe jarraitzeko.\n"
-"\n"
-"\n"
-"Hurrengo CDko osagai batzuk ez dira GPL Lizentziaren edo\n"
-"antzeko akordioen araberakoak. Osagai horietako bakoitza\n"
-"bere lizentzia zehatzaren baldintzen araberakoa da. \n"
-"Irakurri arretaz lizentzia horiek eta bete bertako baldintzak osagai \n"
-"horiek erabili edo birbanatu aurretik. \n"
-"Lizentzia horiek oro har osagaia transferitzea, bikoiztea (babeskopiak\n"
-"egiteko izan ezik), birbanatzea, ingeniaritza alderantzikatzea, \n"
-"desmihiztatzea, deskonpilatzea edo aldatzea eragotziko dute. \n"
-"Kontratua ez betetzeak lizentzia zehatzak ematen dituen eskubide guztiak \n"
-"kentzea ekarriko du berehala. Baldin eta lizentzia zehatzaren baldintzek "
-"eskubidea ematen\n"
-"ez badizute, normalki ezin izango dituzu programak sistema batean baino\n"
-"gehiagotan instalatu, edo sarean erabiltzeko egokitu. Zalantzarik baduzu, "
-"jarri harremanetan\n"
-"osagaiaren banatzailearekin edo editorearekin zuzenean. \n"
-"Osagai horiek hirugarrenei transferitzea edo kopiatzea, dokumentazioa\n"
-"barne, debekatuta egoten da normalki.\n"
-"\n"
-"\n"
-"Hurrengo CDko osagaiei dagozkien eskubide guztiak haien egileenak \n"
-"dira eta software-programei aplikatzen zaizkien jabetza \n"
-"intelektualaren eta copyright-aren legeek babesten dituzte.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6911,6 +6993,69 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Instalazioak huts egin du"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Abisua\n"
+#~ "\n"
+#~ "Irakurri arretaz ondorengo baldintzak. Zerbaitekin ados ez bazaude,\n"
+#~ "ez duzu hurrengo CDa instalatzeko baimenik. Sakatu 'Ezetsi' \n"
+#~ "instalazioa euskarri horiek erabili gabe jarraitzeko.\n"
+#~ "\n"
+#~ "\n"
+#~ "Hurrengo CDko osagai batzuk ez dira GPL Lizentziaren edo\n"
+#~ "antzeko akordioen araberakoak. Osagai horietako bakoitza\n"
+#~ "bere lizentzia zehatzaren baldintzen araberakoa da. \n"
+#~ "Irakurri arretaz lizentzia horiek eta bete bertako baldintzak osagai \n"
+#~ "horiek erabili edo birbanatu aurretik. \n"
+#~ "Lizentzia horiek oro har osagaia transferitzea, bikoiztea (babeskopiak\n"
+#~ "egiteko izan ezik), birbanatzea, ingeniaritza alderantzikatzea, \n"
+#~ "desmihiztatzea, deskonpilatzea edo aldatzea eragotziko dute. \n"
+#~ "Kontratua ez betetzeak lizentzia zehatzak ematen dituen eskubide "
+#~ "guztiak \n"
+#~ "kentzea ekarriko du berehala. Baldin eta lizentzia zehatzaren baldintzek "
+#~ "eskubidea ematen\n"
+#~ "ez badizute, normalki ezin izango dituzu programak sistema batean baino\n"
+#~ "gehiagotan instalatu, edo sarean erabiltzeko egokitu. Zalantzarik baduzu, "
+#~ "jarri harremanetan\n"
+#~ "osagaiaren banatzailearekin edo editorearekin zuzenean. \n"
+#~ "Osagai horiek hirugarrenei transferitzea edo kopiatzea, dokumentazioa\n"
+#~ "barne, debekatuta egoten da normalki.\n"
+#~ "\n"
+#~ "\n"
+#~ "Hurrengo CDko osagaiei dagozkien eskubide guztiak haien egileenak \n"
+#~ "dira eta software-programei aplikatzen zaizkien jabetza \n"
+#~ "intelektualaren eta copyright-aren legeek babesten dituzte.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Erabili libsafe zerbitzarietarako"
 
diff --git a/perl-install/share/po/fa.po b/perl-install/share/po/fa.po
index 318ed1c04..370136af5 100644
--- a/perl-install/share/po/fa.po
+++ b/perl-install/share/po/fa.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-fa\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2005-02-26 06:31+0100\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
 "Language-Team: Persian\n"
@@ -1416,18 +1416,14 @@ msgstr "انتخاب یک قسمت‌بندی دیگر"
 msgid "Choose a partition"
 msgstr "انتخاب یک قسمت‌بندی"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "تعویض به حالت عادی"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "تعویض به حالت کارشناسی"
+msgid "More"
+msgstr "بیشتر"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "پیکربندی"
@@ -1478,13 +1474,17 @@ msgstr "پاک کردن همه"
 msgid "Auto allocate"
 msgstr "جایابی خودکار"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "بیشتر"
+msgid "Toggle to normal mode"
+msgstr "تعویض به حالت عادی"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "تعویض به حالت کارشناسی"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "اطلاعات دیسک سخت"
@@ -1538,7 +1538,12 @@ msgstr "افزودن به RAID"
 msgid "Add to LVM"
 msgstr "افزودن به LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "شناسه‌ی کاربر"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "حذف کردن"
@@ -1553,7 +1558,12 @@ msgstr "برداشتن از RAID"
 msgid "Remove from LVM"
 msgstr "برداشتن از LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "برداشتن از LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "پیرایشگری RAID"
@@ -1728,7 +1738,27 @@ msgstr ""
 "برای اطمینان از صحت داده‌ها بعد از تغییراندازه‌ی قسمت‌بندی(ها)، \n"
 "در آغازگری بعدی بدرون ویندوز کنترل سیستم‌پرونده اجرا خواهد شد"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "کلید رمزگذاری سیستم پرونده"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "کلید رمزگذاری سیستم پرونده خود را انتخاب کنید"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "کلید رمزی"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "انتخاب یک RAID موجود برای اضافه کردن به آن"
@@ -1841,7 +1871,12 @@ msgstr "احتیاج به آغازگری مجدد دارید تا پیرایشگ
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "جدول قسمت‌بندی دستگاه %s به روی دیسک نوشته خواهد شد"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "قالب‌بندی قسمت‌بندی %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1974,7 +2009,27 @@ msgstr "سوار شده\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "کلید رمزی"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2078,12 +2133,7 @@ msgstr "نوع جدول قسمت‌بندی: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "روی کانال %d شناسه %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "کلید رمزگذاری سیستم پرونده"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "کلید رمزگذاری سیستم پرونده خود را انتخاب کنید"
@@ -2098,12 +2148,7 @@ msgstr "این کلید رمز خیلی ساده است ( باید حداقل %d
 msgid "The encryption keys do not match"
 msgstr "کلیدهای رمزی مطابقت نمی‌کنند"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "کلید رمزی"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "کلید رمزی (دوباره)"
@@ -2218,11 +2263,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "شما باید یک قسمت‌بندی FAT سوار شده در /boot/efi داشته باشید"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "قالب‌بندی قسمت‌بندی %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4653,7 +4693,7 @@ msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4663,7 +4703,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4671,8 +4714,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4692,52 +4735,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4751,9 +4799,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4866,7 +4914,55 @@ msgstr ""
 "مرحله، اختلاف به دادسرای قانون پاریس - فرانسه ارجاع داده خواهد شد. \n"
 "برای هر سؤالی درباره این نوشتار لطفاً با Mandriva S.A. تماس بگیرید.\n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4883,64 +4979,55 @@ msgstr ""
 "پایگاه http://www.mp3licensing.com مراجعه کنید). اگر در این باره مطمئن "
 "نیستید به قوانین محل اقامت خود مراجعه کنید."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"هشدار\n"
-"\n"
-"لطفا شرایط زیر را با دقت بخوانید. اگر شما با هر قسمت آن مخالف هستید،\n"
-"اجازه ندارید رسانه سی دی بعدی را نصب کنید. 'امتناع' را برای ادامه‌ی \n"
-"نصب بدون استفاده از این رسانه‌ها فشار دهید.\n"
-"\n"
-"\n"
-"بعضی از عناصر بر روی رسانه سی‌دی بعدی توسط مجوز GPL یا \n"
-"توافق‌نامه‌های شبیه اداره نمی‌شوند. هر یک از این عنصرها بوسیله شرایط\n"
-"اجازه نامه‌ی خود اداره می‌شوند. لطفاً چنین مجوز‌های مخصوص را قبل \n"
-"از استفاده یا پخش مجدد آن برنامه‌ها به دقت خوانده و آنها را متابعت کنید.\n"
-"چنین مجوز‌هایی به طور عمومی از انتقال، تکثیر (بجز برای ذخیره رزرو)، \n"
-"پخش مجدد، رمزشکنی، بازسازی معکوس، تالیف مجدد یا تغییرات در عناصر آنها\n"
-"جلوگیری می‌کنند. هر قصور از قرارداد بیدرنگ امتیازات شما را در آن \n"
-"مجوز مخصوص پایان می‌دهد. مگر شرایط مجوز مخصوص \n"
-"به شما چنین اجازه‌ای دهد، معمولًا نمی‌توانید برنامه‌ها را بر بیش از یک \n"
-"سیستم، یا برای یک شبکه استفاده کنید. در صورت تردید لطفاً با ناشر\n"
-"یا ویرایشگر آن برنامه مستقیماً تماس بگیرید.\n"
-"انتقال به شخص سوم یا رونوشت از آنها و نوشتار آنها نیز معمولاً ممنوع می‌باشد.\n"
-"\n"
-"\n"
-"تمام حقوق برنامه‌های بر روی رسانه‌ی سی‌دی بعدی به نویسندگان آنها تعلق \n"
-"داشته و توسط مالکیت نبوغی و قوانین حق امتیاز قابل اجرای برنامه‌های\n"
-"نرم‌افزاری حفاظت می‌شوند.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6827,6 +6914,64 @@ msgstr ""
 msgid "Installation failed"
 msgstr "نصب شکست خورد"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "هشدار\n"
+#~ "\n"
+#~ "لطفا شرایط زیر را با دقت بخوانید. اگر شما با هر قسمت آن مخالف هستید،\n"
+#~ "اجازه ندارید رسانه سی دی بعدی را نصب کنید. 'امتناع' را برای ادامه‌ی \n"
+#~ "نصب بدون استفاده از این رسانه‌ها فشار دهید.\n"
+#~ "\n"
+#~ "\n"
+#~ "بعضی از عناصر بر روی رسانه سی‌دی بعدی توسط مجوز GPL یا \n"
+#~ "توافق‌نامه‌های شبیه اداره نمی‌شوند. هر یک از این عنصرها بوسیله شرایط\n"
+#~ "اجازه نامه‌ی خود اداره می‌شوند. لطفاً چنین مجوز‌های مخصوص را قبل \n"
+#~ "از استفاده یا پخش مجدد آن برنامه‌ها به دقت خوانده و آنها را متابعت کنید.\n"
+#~ "چنین مجوز‌هایی به طور عمومی از انتقال، تکثیر (بجز برای ذخیره رزرو)، \n"
+#~ "پخش مجدد، رمزشکنی، بازسازی معکوس، تالیف مجدد یا تغییرات در عناصر آنها\n"
+#~ "جلوگیری می‌کنند. هر قصور از قرارداد بیدرنگ امتیازات شما را در آن \n"
+#~ "مجوز مخصوص پایان می‌دهد. مگر شرایط مجوز مخصوص \n"
+#~ "به شما چنین اجازه‌ای دهد، معمولًا نمی‌توانید برنامه‌ها را بر بیش از یک \n"
+#~ "سیستم، یا برای یک شبکه استفاده کنید. در صورت تردید لطفاً با ناشر\n"
+#~ "یا ویرایشگر آن برنامه مستقیماً تماس بگیرید.\n"
+#~ "انتقال به شخص سوم یا رونوشت از آنها و نوشتار آنها نیز معمولاً ممنوع "
+#~ "می‌باشد.\n"
+#~ "\n"
+#~ "\n"
+#~ "تمام حقوق برنامه‌های بر روی رسانه‌ی سی‌دی بعدی به نویسندگان آنها تعلق \n"
+#~ "داشته و توسط مالکیت نبوغی و قوانین حق امتیاز قابل اجرای برنامه‌های\n"
+#~ "نرم‌افزاری حفاظت می‌شوند.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "استفاده از libsafe برای کارگزارها"
 
diff --git a/perl-install/share/po/fi.po b/perl-install/share/po/fi.po
index ff5ec7c69..b169e41ef 100644
--- a/perl-install/share/po/fi.po
+++ b/perl-install/share/po/fi.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-fi - LE2005 Release\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-03-31 17:58+0300\n"
 "Last-Translator: Anssi Hannula <anssi@mandriva.org>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -1429,18 +1429,14 @@ msgstr "Valitse toinen osio"
 msgid "Choose a partition"
 msgstr "Valitse osio"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Vaihda vakiotilaan"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Vaihda asiantuntijatilaan"
+msgid "More"
+msgstr "Lisää"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Vahvistaminen"
@@ -1492,13 +1488,17 @@ msgstr "Tyhjennä kaikki"
 msgid "Auto allocate"
 msgstr "Automaattinen varaus"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Lisää"
+msgid "Toggle to normal mode"
+msgstr "Vaihda vakiotilaan"
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Vaihda asiantuntijatilaan"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Kiintolevyn tiedot"
@@ -1552,7 +1552,12 @@ msgstr "Lisää RAIDiin"
 msgid "Add to LVM"
 msgstr "Lisää LVM:iin"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Käyttäjä-ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Poista"
@@ -1567,7 +1572,12 @@ msgstr "Poista RAID:sta"
 msgid "Remove from LVM"
 msgstr "Poista LVM:stä"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Poista LVM:stä"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Muokkaa RAID:a"
@@ -1743,7 +1753,27 @@ msgstr ""
 "muuttamisen jälkeen suoritetaan tiedostojärjestelmän\n"
 "tarkistus seuraavan kerran kun käynnistät Windowsin(TM)."
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Tiedostojärjestelmän salausavain"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Valitse tiedostojärjestelmäsi salausavain"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Salausavain"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Valitse olemassa oleva RAID johon lisätään"
@@ -1857,8 +1887,13 @@ msgstr "Sinun täytyy käynnistää kone uudelleen ennen kuin muutos tulee voima
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Levyn %s osiotaulu kirjoitetaan levylle"
 
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Alustetaan osiota %s"
+
 # mat
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Kaikki osiolla %s olevat tiedot häviävät osion alustuksen yhteydessä"
@@ -1991,7 +2026,27 @@ msgstr "Liitetty\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Salausavain"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2096,12 +2151,7 @@ msgstr "Osion tyyppi: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "väylässä %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Tiedostojärjestelmän salausavain"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Valitse tiedostojärjestelmäsi salausavain"
@@ -2117,12 +2167,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Salausavaimet eivät täsmää"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Salausavain"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Salausavain (uudelleen)"
@@ -2236,11 +2281,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Sinulla pitää olla FAT-osio liitettynä hakemistoon /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Alustetaan osiota %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4669,7 +4709,7 @@ msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4679,7 +4719,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4687,8 +4730,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4708,52 +4751,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4767,9 +4815,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -5039,7 +5087,55 @@ msgstr ""
 "Paris - France.\n"
 "For any question on this document, please contact Mandriva S.A.  \n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -5066,70 +5162,55 @@ msgstr ""
 "patent\n"
 "may be applicable to you, check your local laws."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Varoitus\n"
-"\n"
-"Lue huolellisesti alla olevat ehdot. Jos et hyväksy kaikkia\n"
-"ehtoja, sinulla ei ole oikeuksia asentaa seuraavaa CD-levyä.\n"
-"Paina 'Kieltäydyn' jos haluat jatkaa asennusta käyttämättä näitä osia.\n"
-"\n"
-"\n"
-"Jotkin seuraavalla CD-levyllä olevat komponentit eivät ole GPL:n tai\n"
-"vastaavanlaisen lisenssin alaisia. Jokaisen tällaisen komponentin ehdot\n"
-"on määritelty erikseen niiden omien lisenssien mukaan. Tutustu näihin\n"
-"lisensseihin huolellisesti ennen kuin käytät tai levität näitä "
-"komponentteja\n"
-"eteenpäin.\n"
-"Tällaiset lisenssit kieltävät tavallisesti siirtämisen, kopioimisen\n"
-"(lukuunottamatta varmuuskopioita), uudelleenlevityksen, "
-"käänteissuunnittelun \n"
-"binäärikoodin kääntämisen tai muokkaamisen. Jokainen rike sopimusta \n"
-"vastaan päättää oikeutesi kyseiseen lisenssiin. Ellei ole olemassa "
-"erityisiä \n"
-"ehtoja, jotka sallivat ohjelmiston asentamisen useaan koneeseen tai \n"
-"niiden käyttämistä verkon yli, et saa myöskään tehdä niin. Jos et ole \n"
-"varma kaikista ehdoista, ota yhteys suoraan kyseisen komponentin \n"
-"tekijään tai jakelijaan. Yllä mainittujen komponenttien tai niiden \n"
-"dokumentaation saattaminen kolmannen osapuolen käsiin on tavallisesti \n"
-"kielletty.\n"
-"\n"
-"\n"
-"Kaikki oikeudet seuraavan levyn komponentteihin kuuluvat niiden \n"
-"asianomaisille tekijöille ja ne on suojattu yksityisen omaisuuden ja \n"
-"ohjelmistojen tekijänoikeuslakien mukaan.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -7028,6 +7109,69 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Asennus epäonnistui"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Varoitus\n"
+#~ "\n"
+#~ "Lue huolellisesti alla olevat ehdot. Jos et hyväksy kaikkia\n"
+#~ "ehtoja, sinulla ei ole oikeuksia asentaa seuraavaa CD-levyä.\n"
+#~ "Paina 'Kieltäydyn' jos haluat jatkaa asennusta käyttämättä näitä osia.\n"
+#~ "\n"
+#~ "\n"
+#~ "Jotkin seuraavalla CD-levyllä olevat komponentit eivät ole GPL:n tai\n"
+#~ "vastaavanlaisen lisenssin alaisia. Jokaisen tällaisen komponentin ehdot\n"
+#~ "on määritelty erikseen niiden omien lisenssien mukaan. Tutustu näihin\n"
+#~ "lisensseihin huolellisesti ennen kuin käytät tai levität näitä "
+#~ "komponentteja\n"
+#~ "eteenpäin.\n"
+#~ "Tällaiset lisenssit kieltävät tavallisesti siirtämisen, kopioimisen\n"
+#~ "(lukuunottamatta varmuuskopioita), uudelleenlevityksen, "
+#~ "käänteissuunnittelun \n"
+#~ "binäärikoodin kääntämisen tai muokkaamisen. Jokainen rike sopimusta \n"
+#~ "vastaan päättää oikeutesi kyseiseen lisenssiin. Ellei ole olemassa "
+#~ "erityisiä \n"
+#~ "ehtoja, jotka sallivat ohjelmiston asentamisen useaan koneeseen tai \n"
+#~ "niiden käyttämistä verkon yli, et saa myöskään tehdä niin. Jos et ole \n"
+#~ "varma kaikista ehdoista, ota yhteys suoraan kyseisen komponentin \n"
+#~ "tekijään tai jakelijaan. Yllä mainittujen komponenttien tai niiden \n"
+#~ "dokumentaation saattaminen kolmannen osapuolen käsiin on tavallisesti \n"
+#~ "kielletty.\n"
+#~ "\n"
+#~ "\n"
+#~ "Kaikki oikeudet seuraavan levyn komponentteihin kuuluvat niiden \n"
+#~ "asianomaisille tekijöille ja ne on suojattu yksityisen omaisuuden ja \n"
+#~ "ohjelmistojen tekijänoikeuslakien mukaan.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Käytä libsafea palvelimille"
 
diff --git a/perl-install/share/po/fr.po b/perl-install/share/po/fr.po
index 4b27a2270..996041ed8 100644
--- a/perl-install/share/po/fr.po
+++ b/perl-install/share/po/fr.po
@@ -73,7 +73,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-fr\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-09-17 15:29+0200\n"
 "Last-Translator: Christophe Berthelé <cpjc@free.fr>\n"
 "Language-Team: French <cooker-i18n@mandrivalinux.org>\n"
@@ -1515,18 +1515,14 @@ msgstr "Choisissez une autre partition"
 msgid "Choose a partition"
 msgstr "Choisissez une partition"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Passer en mode normal"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Passer en mode expert"
+msgid "More"
+msgstr "Davantage"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Confirmation"
@@ -1580,13 +1576,17 @@ msgstr "Supprimer toutes les partitions"
 msgid "Auto allocate"
 msgstr "Partitionnement automatique"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Davantage"
+msgid "Toggle to normal mode"
+msgstr "Passer en mode normal"
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Passer en mode expert"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Informations sur les disques durs"
@@ -1640,7 +1640,12 @@ msgstr "Ajouter au RAID"
 msgid "Add to LVM"
 msgstr "Ajouter au LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Id. utilisateur"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Supprimer"
@@ -1655,7 +1660,12 @@ msgstr "Supprimer du RAID"
 msgid "Remove from LVM"
 msgstr "Supprimer du LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Supprimer du LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Modifier le RAID"
@@ -1834,7 +1844,27 @@ msgstr ""
 "une vérification du système de fichier sera réalisé au prochain démarrage de "
 "Windows™"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Clé de chiffrement du système de fichiers"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Choisissez la clé de chiffrement du système de fichiers"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Clé de chiffrement"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Choisissez un RAID existant"
@@ -1952,7 +1982,12 @@ msgstr ""
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "La table des partitions de %s va maintenant être écrite sur le disque"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formatage de la partition %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -2092,7 +2127,27 @@ msgstr "Montée\n"
 msgid "RAID %s\n"
 msgstr "Appartient au RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Clé de chiffrement"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2196,12 +2251,7 @@ msgstr "Table des partitions de type : %s\n"
 msgid "on channel %d id %d\n"
 msgstr "sur canal %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Clé de chiffrement du système de fichiers"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Choisissez la clé de chiffrement du système de fichiers"
@@ -2216,12 +2266,7 @@ msgstr "Cette clé de chiffrement est trop courte (minimum %d caractères)"
 msgid "The encryption keys do not match"
 msgstr "Les clés de chiffrement ne correspondent pas"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Clé de chiffrement"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Clé de chiffrement (confirmation)"
@@ -2336,11 +2381,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Vous devez disposer d'une partition FAT montée en /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formatage de la partition %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -3221,7 +3261,7 @@ msgstr ""
 "Vous pouvez sélectionner ici un pilote alternatif (OSS ou ALSA) pour votre "
 "carte son (%s)."
 
-#. -PO: here the first %s is either "OSS" or "ALSA",
+#. -PO: here the first %s is either "OSS" or "ALSA", 
 #. -PO: the second %s is the name of the current driver
 #. -PO: and the third %s is the name of the default driver
 #: harddrake/sound.pm:392
@@ -4792,7 +4832,7 @@ msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4802,7 +4842,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4810,8 +4853,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4831,52 +4874,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4890,9 +4938,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -5015,7 +5063,55 @@ msgstr ""
 "litige. Pour toute question relative au présent document, veuillez \n"
 "contacter Mandriva S.A.\n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -5036,71 +5132,55 @@ msgstr ""
 "vigueur\n"
 "dans votre pays."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
-msgstr ""
-"\n"
-"Important\n"
-"\n"
-"Veuillez lire attentivement le présent document. En cas de désaccord \n"
-"avec l'un de ses termes vous n'êtes pas autorisé à installer les CD-ROM\n"
-"suivants. Dans ce cas, cliquez sur « Refuser » pour continuer \n"
-"l'installation sans ces médias.\n"
-"\n"
-"Certains composants logiciels contenus dans les prochains CD-ROM \n"
-"ne sont pas soumis aux licences GPL ou similaires permettant la copie, \n"
-"la modification ou la redistribution. Chacun de ces composants logiciels \n"
-"est distribué sous les termes et conditions d'un accord de licence qui \n"
-"lui est propre. Veuillez vous y référer et vous y soumettre avant de les \n"
-"installer ou de les redistribuer. Généralement, ces licences n'autorisent\n"
-"pas la copie (autre qu'à titre de sauvegarde), la redistribution, \n"
-"la décompilation, la désassemblage, l'ingénierie inverse ni la modification "
-"des\n"
-"Logiciels auxquels elles s'appliquent. Toute violation d'un des termes de la "
-"licence applicable entraîne généralement sa\n"
-"résiliation, sans préjudice de tous autres droits ou actions à votre "
-"encontre.\n"
-"À moins que l'accord de licence ne vous l'y autorise, vous ne pouvez pas \n"
-"installer ces Logiciels sur plus d'une machine ni adapter les Logiciels \n"
-"pour une utilisation en réseau. Le cas échéant, veuillez contacter le \n"
-"distributeur du programme pour acquérir des licences additionnelles.\n"
-"La distribution à des tiers de copies des Logiciels ou de la documentation\n"
-"qui les accompagne est généralement interdite.\n"
-"\n"
-"Tous les droits, titres et intérêt de ces Logiciels sont la propriété \n"
-"exclusive de leurs auteurs respectifs et sont protégés au titre des \n"
-"droits de propriété intellectuelle et de copyright applicables aux "
-"logiciels.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
+msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -7073,3 +7153,72 @@ msgstr ""
 #, c-format
 msgid "Installation failed"
 msgstr "Échec de l'installation"
+
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Important\n"
+#~ "\n"
+#~ "Veuillez lire attentivement le présent document. En cas de désaccord \n"
+#~ "avec l'un de ses termes vous n'êtes pas autorisé à installer les CD-ROM\n"
+#~ "suivants. Dans ce cas, cliquez sur « Refuser » pour continuer \n"
+#~ "l'installation sans ces médias.\n"
+#~ "\n"
+#~ "Certains composants logiciels contenus dans les prochains CD-ROM \n"
+#~ "ne sont pas soumis aux licences GPL ou similaires permettant la copie, \n"
+#~ "la modification ou la redistribution. Chacun de ces composants "
+#~ "logiciels \n"
+#~ "est distribué sous les termes et conditions d'un accord de licence qui \n"
+#~ "lui est propre. Veuillez vous y référer et vous y soumettre avant de "
+#~ "les \n"
+#~ "installer ou de les redistribuer. Généralement, ces licences "
+#~ "n'autorisent\n"
+#~ "pas la copie (autre qu'à titre de sauvegarde), la redistribution, \n"
+#~ "la décompilation, la désassemblage, l'ingénierie inverse ni la "
+#~ "modification des\n"
+#~ "Logiciels auxquels elles s'appliquent. Toute violation d'un des termes de "
+#~ "la licence applicable entraîne généralement sa\n"
+#~ "résiliation, sans préjudice de tous autres droits ou actions à votre "
+#~ "encontre.\n"
+#~ "À moins que l'accord de licence ne vous l'y autorise, vous ne pouvez "
+#~ "pas \n"
+#~ "installer ces Logiciels sur plus d'une machine ni adapter les Logiciels \n"
+#~ "pour une utilisation en réseau. Le cas échéant, veuillez contacter le \n"
+#~ "distributeur du programme pour acquérir des licences additionnelles.\n"
+#~ "La distribution à des tiers de copies des Logiciels ou de la "
+#~ "documentation\n"
+#~ "qui les accompagne est généralement interdite.\n"
+#~ "\n"
+#~ "Tous les droits, titres et intérêt de ces Logiciels sont la propriété \n"
+#~ "exclusive de leurs auteurs respectifs et sont protégés au titre des \n"
+#~ "droits de propriété intellectuelle et de copyright applicables aux "
+#~ "logiciels.\n"
diff --git a/perl-install/share/po/fur.po b/perl-install/share/po/fur.po
index a7d898d96..76220e7d6 100644
--- a/perl-install/share/po/fur.po
+++ b/perl-install/share/po/fur.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2004-06-28 17:41+0200\n"
 "Last-Translator: Andrea Gracco <graccoandrea@tin.it>\n"
 "Language-Team: furlan <gft@freelists.org>\n"
@@ -1351,18 +1351,14 @@ msgstr "Sielç une partizion diferente"
 msgid "Choose a partition"
 msgstr "Sielç une partizion"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr ""
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr ""
+msgid "More"
+msgstr "Di plui"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "Configurazion"
@@ -1412,13 +1408,17 @@ msgstr "Scancele dut"
 msgid "Auto allocate"
 msgstr ""
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Di plui"
+msgid "Toggle to normal mode"
+msgstr ""
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr ""
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr ""
@@ -1472,7 +1472,12 @@ msgstr "Zonte a RAID"
 msgid "Add to LVM"
 msgstr "Zonte a LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ID Utent"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Scancele"
@@ -1487,7 +1492,12 @@ msgstr "Rimôf di RAID"
 msgid "Remove from LVM"
 msgstr "Rimôf di LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Rimôf di LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Mude RAID"
@@ -1654,7 +1664,27 @@ msgid ""
 "filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Clâf di cifradure dal filesystem"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Sielç le to clâf di cifradure"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Clâf di cifradure"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Sielç un RAID esistin par zontâ"
@@ -1766,7 +1796,12 @@ msgstr ""
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr ""
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr ""
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1898,7 +1933,27 @@ msgstr "Montât\n"
 msgid "RAID %s\n"
 msgstr "Discs RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Clâf di cifradure"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -1994,12 +2049,7 @@ msgstr "Sorte di tabele des partizions: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "sul canâl %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Clâf di cifradure dal filesystem"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Sielç le to clâf di cifradure"
@@ -2016,12 +2066,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Les clâfs di cifradure no corispuindin"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Clâf di cifradure"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Clâf di cifradure (ancjemò)"
@@ -2134,11 +2179,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr ""
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr ""
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4447,7 +4487,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4455,8 +4498,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4476,52 +4519,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4535,9 +4583,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4558,7 +4606,55 @@ msgid ""
 "For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4570,38 +4666,54 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
+#: messages.pm:123
 #, c-format
 msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
 "\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
 "\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
 "\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
 "\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
diff --git a/perl-install/share/po/ga.po b/perl-install/share/po/ga.po
index 78bf159d0..db5e734c0 100644
--- a/perl-install/share/po/ga.po
+++ b/perl-install/share/po/ga.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2005-09-12 18:04+0200\n"
 "Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <ga@li.org>\n"
@@ -1352,18 +1352,14 @@ msgstr "Roghnaigh rann eile"
 msgid "Choose a partition"
 msgstr "Roghnaigh rann"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr ""
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr ""
+msgid "More"
+msgstr "Mór"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Deimhniú"
@@ -1413,13 +1409,17 @@ msgstr "Glan gach ceann"
 msgid "Auto allocate"
 msgstr ""
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Mór"
+msgid "Toggle to normal mode"
+msgstr ""
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr ""
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Eolas faoi cruadhioscaí"
@@ -1473,7 +1473,12 @@ msgstr "Cur le RAID"
 msgid "Add to LVM"
 msgstr "Cur le LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ID Úsáideoir"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Scríos"
@@ -1488,7 +1493,12 @@ msgstr "Bain ó RAID"
 msgid "Remove from LVM"
 msgstr "Bain ó RAID"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Bain ó RAID"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Athraigh RAID"
@@ -1652,7 +1662,27 @@ msgid ""
 "filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, fuzzy, c-format
+msgid "Filesystem encryption key"
+msgstr "Cineál córas-comhadlanna:"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Cineál córas-comhadlanna:"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Eochair chriptiúcháin:"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Roghnaigh RAID atá ann le méadú"
@@ -1764,7 +1794,12 @@ msgstr "Beidh ort an ríomhaire a aththosnú sula ndéanfar an athrú"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Scríobhfar clár diosca %s go dhiosca"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Ag formáidiú rann %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1896,7 +1931,27 @@ msgstr "Feistithe\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Eochair chriptiúcháin:"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -1990,12 +2045,7 @@ msgstr "Cinéal tabla rann: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "ar bhús %d, id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, fuzzy, c-format
-msgid "Filesystem encryption key"
-msgstr "Cineál córas-comhadlanna:"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr ""
@@ -2010,12 +2060,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Ní mar a chéile na pasfhocail"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Eochair chriptiúcháin:"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr ""
@@ -2129,11 +2174,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr ""
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Ag formáidiú rann %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4485,7 +4525,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4493,8 +4536,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4514,52 +4557,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4573,9 +4621,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4596,7 +4644,55 @@ msgid ""
 "For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4608,38 +4704,54 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
+#: messages.pm:123
 #, c-format
 msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
 "\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
 "\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
 "\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
 "\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
diff --git a/perl-install/share/po/gl.po b/perl-install/share/po/gl.po
index 5f6fa5e87..ffc6d8ded 100644
--- a/perl-install/share/po/gl.po
+++ b/perl-install/share/po/gl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libDrakX-gl\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-04-13 20:37+0100\n"
 "Last-Translator: Leandro Regueiro <leandro DOT regueiro AT gmail DOT com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -1423,18 +1423,14 @@ msgstr "Escolla outra partición"
 msgid "Choose a partition"
 msgstr "Escolla unha partición"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Cambiar a modo normal"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Cambiar a modo experto"
+msgid "More"
+msgstr "Máis"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Confirmación"
@@ -1488,13 +1484,17 @@ msgstr "Borrar todas"
 msgid "Auto allocate"
 msgstr "Asignación automática"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Máis"
+msgid "Toggle to normal mode"
+msgstr "Cambiar a modo normal"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Cambiar a modo experto"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Información da unidade de disco duro"
@@ -1548,7 +1548,12 @@ msgstr "Engadir ó RAID"
 msgid "Add to LVM"
 msgstr "Engadir ó LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ID de Usuario"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Eliminar"
@@ -1563,7 +1568,12 @@ msgstr "Quitar do RAID"
 msgid "Remove from LVM"
 msgstr "Quitar do LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Quitar do LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Modifica-lo RAID"
@@ -1739,7 +1749,27 @@ msgstr ""
 "executaranse unhas verificacións do sistema de ficheiros a próxima vez que "
 "arrinque Windows(TM)"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Clave de cifrado do sistema de ficheiros"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Escolla a clave de cifrado do seu sistema de ficheiros"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Clave de cifrado"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Escolla un dos RAID para engadirlla"
@@ -1854,7 +1884,12 @@ msgstr ""
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "¡Escribirase no disco a táboa de particións da unidade %s"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formatando a partición %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Ó formata-la partición %s, perderanse tódolos datos da partición"
@@ -1992,7 +2027,27 @@ msgstr "Montado\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Clave de cifrado"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2092,12 +2147,7 @@ msgstr "Tipo de táboa de particións: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "na canle %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Clave de cifrado do sistema de ficheiros"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Escolla a clave de cifrado do seu sistema de ficheiros"
@@ -2113,12 +2163,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "As claves de cifrado non coinciden"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Clave de cifrado"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Clave de cifrado (outra vez)"
@@ -2236,11 +2281,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Debe ter unha partición FAT montada en /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formatando a partición %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4675,7 +4715,7 @@ msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4685,7 +4725,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4693,8 +4736,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4714,52 +4757,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4773,9 +4821,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4926,7 +4974,55 @@ msgstr ""
 "Para calquera pregunta sobre este documento, por favor contacte con Mandriva "
 "S.A.  \n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4946,68 +5042,55 @@ msgstr ""
 "está seguro de se lle pode afectar unha patente, verifique as súas leis "
 "locais."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
 "\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
 "\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Advertencia\n"
-"\n"
-"Por favor, lea con tino os termos de embaixo. Se non está de acordo con\n"
-"algunha parte, non se lle permite instalar o seguinte CD. Prema 'Rexeitar'\n"
-"para continua-la instalación sen usar eses soportes.\n"
-"\n"
-"\n"
-"Algúns dos compoñentes contidos no seguinte CD non están rexidos\n"
-"pola Licenza GPL ou documentos semellantes. Cada un deses\n"
-"compoñentes réxese polos termos e condicións da súa propia licenza\n"
-"específica. Por favor, lea con tino e cumpra cada unha desas licenzas\n"
-"específicas antes de usar ou redistribuír ditos compoñentes.\n"
-"Tales licenzas impedirán en xeral a transferencia, duplicación (agás co\n"
-"propósito da copia de seguridade), redistribución, enxeñería inversa, \n"
-"desensamblamento, descompilación ou modificación do compoñente. \n"
-"Calquera infracción do contrato terminará inmediatamente cos seus dereitos\n"
-"baixo esa licenza específica. A non ser que os termos desa licenza\n"
-"específica lle conceda ditos dereitos, normalmente non poderá instala-los\n"
-"programas en máis dun sistema, ou adaptalos para usalos nunha rede. Se\n"
-"ten dúbidas, por favor, contacte directamente co distribuidor ou editor do\n"
-"compoñente. \n"
-"A transferencia a terceiras partes ou a copia de ditos compoñentes\n"
-"incluíndo a documentación está normalmente prohibida.\n"
-"\n"
-"\n"
-"Tódolos dereitos dos compoñentes do seguinte CD pertenden ós seus\n"
-"respectivos autores e están protexidos polas leis de propiedade intelectual\n"
-"e de copyright aplicables ó software.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6927,6 +7010,72 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Fallou a instalación"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Advertencia\n"
+#~ "\n"
+#~ "Por favor, lea con tino os termos de embaixo. Se non está de acordo con\n"
+#~ "algunha parte, non se lle permite instalar o seguinte CD. Prema "
+#~ "'Rexeitar'\n"
+#~ "para continua-la instalación sen usar eses soportes.\n"
+#~ "\n"
+#~ "\n"
+#~ "Algúns dos compoñentes contidos no seguinte CD non están rexidos\n"
+#~ "pola Licenza GPL ou documentos semellantes. Cada un deses\n"
+#~ "compoñentes réxese polos termos e condicións da súa propia licenza\n"
+#~ "específica. Por favor, lea con tino e cumpra cada unha desas licenzas\n"
+#~ "específicas antes de usar ou redistribuír ditos compoñentes.\n"
+#~ "Tales licenzas impedirán en xeral a transferencia, duplicación (agás co\n"
+#~ "propósito da copia de seguridade), redistribución, enxeñería inversa, \n"
+#~ "desensamblamento, descompilación ou modificación do compoñente. \n"
+#~ "Calquera infracción do contrato terminará inmediatamente cos seus "
+#~ "dereitos\n"
+#~ "baixo esa licenza específica. A non ser que os termos desa licenza\n"
+#~ "específica lle conceda ditos dereitos, normalmente non poderá instala-"
+#~ "los\n"
+#~ "programas en máis dun sistema, ou adaptalos para usalos nunha rede. Se\n"
+#~ "ten dúbidas, por favor, contacte directamente co distribuidor ou editor "
+#~ "do\n"
+#~ "compoñente. \n"
+#~ "A transferencia a terceiras partes ou a copia de ditos compoñentes\n"
+#~ "incluíndo a documentación está normalmente prohibida.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tódolos dereitos dos compoñentes do seguinte CD pertenden ós seus\n"
+#~ "respectivos autores e están protexidos polas leis de propiedade "
+#~ "intelectual\n"
+#~ "e de copyright aplicables ó software.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Usar libsafe para os servidores"
 
diff --git a/perl-install/share/po/he.po b/perl-install/share/po/he.po
index 8ad340be3..0d04b9f0f 100644
--- a/perl-install/share/po/he.po
+++ b/perl-install/share/po/he.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libDrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-03-24 03:26+0200\n"
 "Last-Translator: Dotan Kamber <kamberd@yahoo.com>\n"
 "Language-Team: Hebrew\n"
@@ -1405,18 +1405,14 @@ msgstr "נא לבחור מחיצה אחרת"
 msgid "Choose a partition"
 msgstr "עליך לבחור מחיצה"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "עבור למצב רגיל"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "עבור למצב מומחה"
+msgid "More"
+msgstr "מתקדם"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "אישור"
@@ -1467,13 +1463,17 @@ msgstr "נקה הכל"
 msgid "Auto allocate"
 msgstr "הקצבה אוטומטית"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "מתקדם"
+msgid "Toggle to normal mode"
+msgstr "עבור למצב רגיל"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "עבור למצב מומחה"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "מידע על הכונן הקשיח"
@@ -1527,7 +1527,12 @@ msgstr "הוספה ל-RAID"
 msgid "Add to LVM"
 msgstr "הוספה ל-LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "קוד זיהוי משתמש"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "מחיקה"
@@ -1542,7 +1547,12 @@ msgstr "הסרה מ-RAID"
 msgid "Remove from LVM"
 msgstr "הסרה מ-LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "הסרה מ-LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "שינוי RAID"
@@ -1713,7 +1723,27 @@ msgstr ""
 "על מנת להבטיח את שלמות הנתונים אחרי שינוי גודל המחיצה(ות) \n"
 "תiפעל בדיקה של מערכת הקבצים באתחול הבא של חלונות"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "מפתח ההצפנה של המערכת"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "עליך לבחור את מפתח ההצפנה של המערכת שלך"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "מפתח הצפנה"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "יש לבחור RAID קיים אליו יש להוסיף"
@@ -1827,7 +1857,12 @@ msgstr "יש צורך להפעיל מחדש את המחשב בכדי שהשינ�
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "טבלת המחיצות של הכונן %s עומדת להיכתב לכונן"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "מפרמט את המחיצה %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "אחרי יצירת מערכת קבצים במחיצה %s, כל המידע במחיצה זו יאבד"
@@ -1964,7 +1999,27 @@ msgstr "מעוגן\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "מפתח הצפנה"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2067,12 +2122,7 @@ msgstr "סוג טבלת המחיצות: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "בערוץ %d זיהוי %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "מפתח ההצפנה של המערכת"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "עליך לבחור את מפתח ההצפנה של המערכת שלך"
@@ -2087,12 +2137,7 @@ msgstr "מפתח ההצפנה פשוט מדי (חייב להיות באורך ש
 msgid "The encryption keys do not match"
 msgstr "מפתחות ההצפנה לא תואמים"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "מפתח הצפנה"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "חזרה על מפתח הצפנה"
@@ -2206,11 +2251,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "חייבת להיות מחיצת FAT מעוגנת ב- boot/efi/"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "מפרמט את המחיצה %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4617,7 +4657,7 @@ msgstr "מנהל האתחול אינו יכול לעבוד עם boot/ על מס�
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4627,7 +4667,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4635,8 +4678,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4656,52 +4699,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4715,9 +4763,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4846,7 +4894,55 @@ msgstr ""
 "מנדריבה לינוקס לעברית.\n"
 "\n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4865,67 +4961,55 @@ msgstr ""
 "לא\n"
 "ידוע לך האם פטנט מסויים תקף לגבייך, עליך לבדוק את החוקים המקומיים."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"אזהרה\n"
-"\n"
-"עליך לקרוא בעיון את התנאים שלהלן. אם חלק או כל התנאים לא\n"
-"נראים לך, לא תתאפשר ההתקנה מהתקליטור הבא. עליך ללחוץ על 'דחייה' \n"
-"כדי להמשיך את ההתקנה ללא שימוש בתקליטור זה.\n"
-"\n"
-"\n"
-"מרכיבי תוכנה מסויימים הכלולים בתקליטור הבא אינם כפופים לרשיון הציבורי\n"
-"הכללי (GPL) או לרשיונות חופשיים אחרים. כל מרכיב כזה כפוף להסכם משתמש\n"
-"קצה ייחודי משלו. \n"
-"עליך לקרוא בעיון כל הסכם משתמש קצה המלווה תוכנות אלו ולוודא עמידה\n"
-"בתנאים בכל מקרה של שימוש ו/או הפצה של מרכיבי תוכנה אלו. \n"
-"\n"
-"רשיונות שאינם חופשיים אוסרים בד\"כ את ההעברה, השכפול (למעט לצרכי\n"
-"גיבוי), הפצה מחדש, הינדוס לאחור, פרוק למרכיבים, הידור לאחור או שינוי, \n"
-"אחר כלשהו. \n"
-"כל הפרה של הסכמים אלו תשלול ממך באופן מיידי את הזכות להשתמש\n"
-"בתוכנה. למעט במקרים שהסכם משתמש הקצה מאפשר לך את הזכות לכך,\n"
-"אין באפשרותך להתקין את התוכנות על יותר ממחשב אחד או להתקין את\n"
-"התוכנה לגישה דרך הרשת. בכל מקרה של ספק, עליך ליצור קשר ישיר עם\n"
-"המשווק או היצרן של התוכנה. \n"
-"העברה לצד שלישי או העתקה של מרכיבים כלשהם כולל התיעוד אסורים\n"
-" בד\"כ על פי הסכם הרישוי.\n"
-"\n"
-"כל הזכויות למרכיבים הכלולים בתקליטור הבא שמורות ליוצריהם ומוגנות \n"
-"בחוקי קניין רוחני וחוקי זכויות יוצרים התקפים עבור תוכנות מחשב.\n"
-"\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6800,6 +6884,66 @@ msgstr ""
 msgid "Installation failed"
 msgstr "ההתקנה נכשלה"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "אזהרה\n"
+#~ "\n"
+#~ "עליך לקרוא בעיון את התנאים שלהלן. אם חלק או כל התנאים לא\n"
+#~ "נראים לך, לא תתאפשר ההתקנה מהתקליטור הבא. עליך ללחוץ על 'דחייה' \n"
+#~ "כדי להמשיך את ההתקנה ללא שימוש בתקליטור זה.\n"
+#~ "\n"
+#~ "\n"
+#~ "מרכיבי תוכנה מסויימים הכלולים בתקליטור הבא אינם כפופים לרשיון הציבורי\n"
+#~ "הכללי (GPL) או לרשיונות חופשיים אחרים. כל מרכיב כזה כפוף להסכם משתמש\n"
+#~ "קצה ייחודי משלו. \n"
+#~ "עליך לקרוא בעיון כל הסכם משתמש קצה המלווה תוכנות אלו ולוודא עמידה\n"
+#~ "בתנאים בכל מקרה של שימוש ו/או הפצה של מרכיבי תוכנה אלו. \n"
+#~ "\n"
+#~ "רשיונות שאינם חופשיים אוסרים בד\"כ את ההעברה, השכפול (למעט לצרכי\n"
+#~ "גיבוי), הפצה מחדש, הינדוס לאחור, פרוק למרכיבים, הידור לאחור או שינוי, \n"
+#~ "אחר כלשהו. \n"
+#~ "כל הפרה של הסכמים אלו תשלול ממך באופן מיידי את הזכות להשתמש\n"
+#~ "בתוכנה. למעט במקרים שהסכם משתמש הקצה מאפשר לך את הזכות לכך,\n"
+#~ "אין באפשרותך להתקין את התוכנות על יותר ממחשב אחד או להתקין את\n"
+#~ "התוכנה לגישה דרך הרשת. בכל מקרה של ספק, עליך ליצור קשר ישיר עם\n"
+#~ "המשווק או היצרן של התוכנה. \n"
+#~ "העברה לצד שלישי או העתקה של מרכיבים כלשהם כולל התיעוד אסורים\n"
+#~ " בד\"כ על פי הסכם הרישוי.\n"
+#~ "\n"
+#~ "כל הזכויות למרכיבים הכלולים בתקליטור הבא שמורות ליוצריהם ומוגנות \n"
+#~ "בחוקי קניין רוחני וחוקי זכויות יוצרים התקפים עבור תוכנות מחשב.\n"
+#~ "\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "השתמש ב-libsafe עבור כל השרתים"
 
diff --git a/perl-install/share/po/hi.po b/perl-install/share/po/hi.po
index 4888c6d7c..e1ee8796f 100644
--- a/perl-install/share/po/hi.po
+++ b/perl-install/share/po/hi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-hi\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2004-04-04 21:54+0530\n"
 "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma) <dysxhi@yahoo.co.in>\n"
 "Language-Team: हिन्दी (Hindi) <dysxhi@yahoo.co.in>\n"
@@ -1401,18 +1401,14 @@ msgstr "अन्य किसी विभाजन का चयन करे�
 msgid "Choose a partition"
 msgstr "एक विभाजन का चयन करें"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "सामान्य विधा को टॉगल"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "एक्सपर्ट विधा की ओर टॉगल"
+msgid "More"
+msgstr "और अधिक"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "संरचना"
@@ -1462,13 +1458,17 @@ msgstr "सभी को साफ़"
 msgid "Auto allocate"
 msgstr "स्वतः बाँटना"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "और अधिक"
+msgid "Toggle to normal mode"
+msgstr "सामान्य विधा को टॉगल"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "एक्सपर्ट विधा की ओर टॉगल"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "हार्ड ड्राइव सूचना"
@@ -1522,7 +1522,12 @@ msgstr "रैड को जोड़ें"
 msgid "Add to LVM"
 msgstr "एलवीएम से जोड़ें"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "उपयोग-कर्ता पहचान संख्या"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "मिटायें"
@@ -1537,7 +1542,12 @@ msgstr "रैड से हटायें"
 msgid "Remove from LVM"
 msgstr "एलवीएम से हटायें"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "एलवीएम से हटायें"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "रैड को परिवर्तित करना"
@@ -1713,7 +1723,27 @@ msgstr ""
 "करने हेतु, \n"
 "विण्डो(TM) में आपके अगले बूट के समय संचिकाप्रणाली जाँच प्रक्रियाएँ चलगी "
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "संचिकातंत्र गूढ़लेखन कुँजी"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "आपकी संचिकाप्रणाली की गूढ़लेखन कुँजी का चयन करें"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "सांकेतिक कुँजी"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "एक विद्यमान रैड को जोड़ने को लिए चयन करें"
@@ -1826,7 +1856,12 @@ msgstr "परिवर्तनों को लागू करने के �
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "%s ड्राइव की विभाजन तालिका डिस्क पर लिखी जाने वाली है"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "%s विभाजन का एकसारीकरण किया जा रहा है"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1959,7 +1994,27 @@ msgstr "आरोहित\n"
 msgid "RAID %s\n"
 msgstr "रैड %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "सांकेतिक कुँजी"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2063,12 +2118,7 @@ msgstr "विभाजन तालिका का प्रकार: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "चैनल %d पर पहचान-संख्या %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "संचिकातंत्र गूढ़लेखन कुँजी"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "आपकी संचिकाप्रणाली की गूढ़लेखन कुँजी का चयन करें"
@@ -2083,12 +2133,7 @@ msgstr "गूढ़लेखन कुँजी अति सरल है (कम
 msgid "The encryption keys do not match"
 msgstr "गूढ़-लिखित कुँजियां आपस में नहीं मिलती है"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "सांकेतिक कुँजी"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "गूढ़लेखन कुँजी (पुनः)"
@@ -2202,11 +2247,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "/boot/efi में आपके पास एक फ़ैट विभाजन आरोहित होना चाहिए"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "%s विभाजन का एकसारीकरण किया जा रहा है"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4638,7 +4678,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4646,8 +4689,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4667,52 +4710,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4726,9 +4774,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4866,7 +4914,55 @@ msgstr ""
 "Paris - France.\n"
 "For any question on this document, please contact Mandriva S.A.  \n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4884,38 +4980,54 @@ msgstr ""
 "लिए देखें)। यदि आप सुनिश्चित नहीं है कि \n"
 "एक पेटेंट आप पर लागू होता है तो अपने स्थानीय कानून की जाँच करें।"
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
diff --git a/perl-install/share/po/hr.po b/perl-install/share/po/hr.po
index 2c9c8a5a1..0774817d2 100644
--- a/perl-install/share/po/hr.po
+++ b/perl-install/share/po/hr.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX 0\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2005-01-04 21:25+CET\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -1397,18 +1397,14 @@ msgstr "Izaberite drugu particiju"
 msgid "Choose a partition"
 msgstr "Izaberite particiju"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Prebaci u normalni mod"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Normalno > Ekspert"
+msgid "More"
+msgstr "Više"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "Postavke"
@@ -1458,13 +1454,17 @@ msgstr "Očisti sve"
 msgid "Auto allocate"
 msgstr "Raspodijeli automatski"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Više"
+msgid "Toggle to normal mode"
+msgstr "Prebaci u normalni mod"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Normalno > Ekspert"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Hard disk informacije"
@@ -1519,7 +1519,12 @@ msgstr "Dodaj RAID-u"
 msgid "Add to LVM"
 msgstr "Dodaj LVM-u"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Korisnički ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Obriši"
@@ -1534,7 +1539,12 @@ msgstr "Ukloni sa RAID-a"
 msgid "Remove from LVM"
 msgstr "Ukloni sa LVM-a"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Ukloni sa LVM-a"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Promijeni RAID"
@@ -1705,7 +1715,27 @@ msgid ""
 "filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Ključ enkriptiranja datotečnog sustava"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Izaberite vaš ključ za enkriptiranje datotečnog sustava"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Enkripcijski ključ"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Izaberite postojeći RAID na koji želite dodati "
@@ -1818,7 +1848,12 @@ msgstr "Trebate ponovo pokrenuti sustav prije nego promjene postanu aktivne"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Particijska tablica pogona %s će sada biti zapisana na disk"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formatiram particiju %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1951,7 +1986,27 @@ msgstr "Montiran\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Enkripcijski ključ"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2055,12 +2110,7 @@ msgstr "Vrsta particijske tabele: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "na sabirnici %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Ključ enkriptiranja datotečnog sustava"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Izaberite vaš ključ za enkriptiranje datotečnog sustava"
@@ -2077,12 +2127,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Enkripcijski ključevi se ne slažu"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Enkripcijski ključ"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Enkripcijski ključ (ponovno)"
@@ -2196,11 +2241,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Morate imati FAT particiju montiranu na /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formatiram particiju %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4578,7 +4618,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4586,8 +4629,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4607,52 +4650,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4666,9 +4714,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4802,7 +4850,55 @@ msgstr ""
 "Za bilo kakva pitanja o ovom dokumentu, molimo kontaktirajte Mandriva S."
 "A.  \n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4814,68 +4910,55 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Upozorenje\n"
-"\n"
-"Molimo pročitajte pažljivo činjenice niže. Ukoliko se ne slažete sa bilo\n"
-"kojim dijelom, nemate dozvolu instalirati slijedeći CD medij. Pritisnite "
-"'Odbij' \n"
-"za nastavak instalacije bez korištenja ovog medija.\n"
-"\n"
-"\n"
-"Neke komponente sadržane u slijedećem CD mediju nisu pokrivene\n"
-"GPL licencom ili sličnim ugovorom. Svaka takva komponenta je tada\n"
-"pokrivena stavkama i uvjetima svojim vlastitim specifičnim licencama. \n"
-"Molimo pročitajte pažljivo i složite se specifičnim licencama prije \n"
-"vašeg korištenja ili redistribuiranja navedenih komponenti. \n"
-"Takve licence općenito zabranjuju prijenos, dupliciranje \n"
-"(osim za spasonosne kopije), redistribuciju, reverzno inženjerstvo, \n"
-"disasembliranje, dekompilaciju ili promjenu komponente. \n"
-"Svako kršenje ugovora će odmah prekinuti vaša prava kod\n"
-"specifične licence. Ako vam stavke specifične licence ne odobre takva\n"
-"prava, obično ne možete instalirati programe na više od jednog\n"
-"sustava, ili prilagoditi ga za korištenje na mreži. Ako ste u nedoumici,\n"
-"kontaktirajte direktno distributera ili urednika komponente. \n"
-"Prijenos trećim osobama ili kopiranje takvih komponenti uključujući \n"
-"dokumentaciju je obično zabranjeno.\n"
-"\n"
-"\n"
-"Sva prava na komponente slijedećeg CD medija pripadaju njihovim \n"
-"uvaženim autorima i zaštićeni su intelektualnim vlasništvom i \n"
-"autorskim zakonima primjenjivim na software-ske programe.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6682,6 +6765,67 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Instalacija nije uspjela"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Upozorenje\n"
+#~ "\n"
+#~ "Molimo pročitajte pažljivo činjenice niže. Ukoliko se ne slažete sa bilo\n"
+#~ "kojim dijelom, nemate dozvolu instalirati slijedeći CD medij. Pritisnite "
+#~ "'Odbij' \n"
+#~ "za nastavak instalacije bez korištenja ovog medija.\n"
+#~ "\n"
+#~ "\n"
+#~ "Neke komponente sadržane u slijedećem CD mediju nisu pokrivene\n"
+#~ "GPL licencom ili sličnim ugovorom. Svaka takva komponenta je tada\n"
+#~ "pokrivena stavkama i uvjetima svojim vlastitim specifičnim licencama. \n"
+#~ "Molimo pročitajte pažljivo i složite se specifičnim licencama prije \n"
+#~ "vašeg korištenja ili redistribuiranja navedenih komponenti. \n"
+#~ "Takve licence općenito zabranjuju prijenos, dupliciranje \n"
+#~ "(osim za spasonosne kopije), redistribuciju, reverzno inženjerstvo, \n"
+#~ "disasembliranje, dekompilaciju ili promjenu komponente. \n"
+#~ "Svako kršenje ugovora će odmah prekinuti vaša prava kod\n"
+#~ "specifične licence. Ako vam stavke specifične licence ne odobre takva\n"
+#~ "prava, obično ne možete instalirati programe na više od jednog\n"
+#~ "sustava, ili prilagoditi ga za korištenje na mreži. Ako ste u nedoumici,\n"
+#~ "kontaktirajte direktno distributera ili urednika komponente. \n"
+#~ "Prijenos trećim osobama ili kopiranje takvih komponenti uključujući \n"
+#~ "dokumentaciju je obično zabranjeno.\n"
+#~ "\n"
+#~ "\n"
+#~ "Sva prava na komponente slijedećeg CD medija pripadaju njihovim \n"
+#~ "uvaženim autorima i zaštićeni su intelektualnim vlasništvom i \n"
+#~ "autorskim zakonima primjenjivim na software-ske programe.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Koristi libsafe za poslužitelje"
 
diff --git a/perl-install/share/po/hu.po b/perl-install/share/po/hu.po
index 28819e3b2..d292f6701 100644
--- a/perl-install/share/po/hu.po
+++ b/perl-install/share/po/hu.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libDrakX-2009.0\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-09-18 11:33+0100\n"
 "Last-Translator: Lónyai Gergely <aleph@mandriva.org>\n"
 "Language-Team: Hungarian <aleph@mandriva.org>\n"
@@ -20,18 +20,10 @@ msgstr ""
 "X-Poedit-Country: HUNGARY\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: any.pm:252
-#: any.pm:853
-#: diskdrake/interactive.pm:554
-#: diskdrake/interactive.pm:741
-#: diskdrake/interactive.pm:785
-#: diskdrake/interactive.pm:843
-#: diskdrake/interactive.pm:1133
-#: do_pkgs.pm:221
-#: do_pkgs.pm:267
-#: harddrake/sound.pm:285
-#: interactive.pm:584
-#: pkgs.pm:257
+#: any.pm:252 any.pm:853 diskdrake/interactive.pm:554
+#: diskdrake/interactive.pm:741 diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:843 diskdrake/interactive.pm:1133 do_pkgs.pm:221
+#: do_pkgs.pm:267 harddrake/sound.pm:285 interactive.pm:584 pkgs.pm:257
 #, c-format
 msgid "Please wait"
 msgstr "Kis türelmet..."
@@ -45,7 +37,8 @@ msgstr "A rendszerindító program telepítése folyamatban"
 #, c-format
 msgid ""
 "LILO wants to assign a new Volume ID to drive %s.  However, changing\n"
-"the Volume ID of a Windows NT, 2000, or XP boot disk is a fatal Windows error.\n"
+"the Volume ID of a Windows NT, 2000, or XP boot disk is a fatal Windows "
+"error.\n"
 "This caution does not apply to Windows 95 or 98, or to NT data disks.\n"
 "\n"
 "Assign a new Volume ID?"
@@ -83,12 +76,15 @@ msgstr ""
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
-"This implies you already have a bootloader on the hard drive you boot (eg: System Commander).\n"
+"This implies you already have a bootloader on the hard drive you boot (eg: "
+"System Commander).\n"
 "\n"
 "On which drive are you booting?"
 msgstr ""
-"Azt a lehetőséget választotta, hogy a rendszerbetöltőt egy partícióra telepíti.\n"
-"Ez arra utal, hogy már van rendszerbetöltő (például: System Commander) azon a\n"
+"Azt a lehetőséget választotta, hogy a rendszerbetöltőt egy partícióra "
+"telepíti.\n"
+"Ez arra utal, hogy már van rendszerbetöltő (például: System Commander) azon "
+"a\n"
 "merevlemezen, amelyről a rendszer indítása történik.\n"
 "\n"
 "Melyik meghajtóról végzi a rendszer indítását?"
@@ -133,9 +129,7 @@ msgstr "Hová kerüljön a rendszerindító program (bootloader)?"
 msgid "Boot Style Configuration"
 msgstr "A rendszerindítás beállításai"
 
-#: any.pm:396
-#: any.pm:427
-#: any.pm:428
+#: any.pm:396 any.pm:427 any.pm:428
 #, c-format
 msgid "Bootloader main options"
 msgstr "Rendszerindítási beállítások"
@@ -145,14 +139,12 @@ msgstr "Rendszerindítási beállítások"
 msgid "Bootloader"
 msgstr "Rendszerbetöltő"
 
-#: any.pm:401
-#: any.pm:431
+#: any.pm:401 any.pm:431
 #, c-format
 msgid "Bootloader to use"
 msgstr "A használni kívánt rendszerbetöltő"
 
-#: any.pm:403
-#: any.pm:433
+#: any.pm:403 any.pm:433
 #, c-format
 msgid "Boot device"
 msgstr "Rendszerindítási eszköz"
@@ -182,24 +174,18 @@ msgstr "APIC bekapcsolása"
 msgid "Enable Local APIC"
 msgstr "Helyi APIC bekapcsolása"
 
-#: any.pm:411
-#: any.pm:797
-#: any.pm:812
-#: authentication.pm:239
+#: any.pm:411 any.pm:797 any.pm:812 authentication.pm:239
 #: diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Password"
 msgstr "Jelszó"
 
-#: any.pm:413
-#: authentication.pm:250
+#: any.pm:413 authentication.pm:250
 #, c-format
 msgid "The passwords do not match"
 msgstr "A jelszavak nem egyeznek"
 
-#: any.pm:413
-#: authentication.pm:250
-#: diskdrake/interactive.pm:1300
+#: any.pm:413 authentication.pm:250 diskdrake/interactive.pm:1300
 #, c-format
 msgid "Please try again"
 msgstr "Próbálja meg újra"
@@ -209,10 +195,7 @@ msgstr "Próbálja meg újra"
 msgid "You can not use a password with %s"
 msgstr "Nem használható jelszó ezzel: %s"
 
-#: any.pm:417
-#: any.pm:799
-#: any.pm:814
-#: authentication.pm:240
+#: any.pm:417 any.pm:799 any.pm:814 authentication.pm:240
 #, c-format
 msgid "Password (again)"
 msgstr "Jelszó (még egyszer)"
@@ -229,8 +212,11 @@ msgstr "korlátozás"
 
 #: any.pm:421
 #, c-format
-msgid "Option ``Restrict command line options'' is of no use without a password"
-msgstr "\"A parancssorban átadható paraméterek korlátozása\" beállításnak jelszó nélkül nincs értelme"
+msgid ""
+"Option ``Restrict command line options'' is of no use without a password"
+msgstr ""
+"\"A parancssorban átadható paraméterek korlátozása\" beállításnak jelszó "
+"nélkül nincs értelme"
 
 #: any.pm:423
 #, c-format
@@ -272,14 +258,12 @@ msgstr "Az alapértelmezett op. rendszer?"
 msgid "Image"
 msgstr "Indítófájl"
 
-#: any.pm:506
-#: any.pm:519
+#: any.pm:506 any.pm:519
 #, c-format
 msgid "Root"
 msgstr "Gyökér"
 
-#: any.pm:507
-#: any.pm:532
+#: any.pm:507 any.pm:532
 #, c-format
 msgid "Append"
 msgstr "Hozzáfűzés"
@@ -304,17 +288,12 @@ msgstr "Indítási RAM diszk"
 msgid "Network profile"
 msgstr "Hálózati profil"
 
-#: any.pm:524
-#: any.pm:529
-#: any.pm:531
-#: diskdrake/interactive.pm:376
+#: any.pm:524 any.pm:529 any.pm:531 diskdrake/interactive.pm:376
 #, c-format
 msgid "Label"
 msgstr "Címke"
 
-#: any.pm:526
-#: any.pm:534
-#: harddrake/v4l.pm:438
+#: any.pm:526 any.pm:534 harddrake/v4l.pm:438
 #, c-format
 msgid "Default"
 msgstr "Alapértelmezés"
@@ -425,8 +404,11 @@ msgstr "Adjon meg egy felhasználónevet"
 
 #: any.pm:776
 #, c-format
-msgid "The user name must contain only lower cased letters, numbers, `-' and `_'"
-msgstr "A felhasználónév csak a következőket tartalmazhatja: kisbetűk, számok, \"-\" és \"_\""
+msgid ""
+"The user name must contain only lower cased letters, numbers, `-' and `_'"
+msgstr ""
+"A felhasználónév csak a következőket tartalmazhatja: kisbetűk, számok, \"-\" "
+"és \"_\""
 
 #: any.pm:777
 #, c-format
@@ -438,14 +420,12 @@ msgstr "A felhasználónév túl hosszú"
 msgid "This user name has already been added"
 msgstr "Már létezik ilyen felhasználónév"
 
-#: any.pm:784
-#: any.pm:816
+#: any.pm:784 any.pm:816
 #, c-format
 msgid "User ID"
 msgstr "Felh.-azonosító"
 
-#: any.pm:784
-#: any.pm:817
+#: any.pm:784 any.pm:817
 #, c-format
 msgid "Group ID"
 msgstr "Csoportazonosító"
@@ -465,8 +445,7 @@ msgstr "A(z) \"%s\" értéknek 500-nál nagyobbnak kell lennie. Mégis elfogadja
 msgid "User management"
 msgstr "Felhasználó kezelés"
 
-#: any.pm:796
-#: authentication.pm:226
+#: any.pm:796 authentication.pm:226
 #, c-format
 msgid "Set administrator (root) password"
 msgstr "A rendszergazdai (root) jelszó beállítása"
@@ -501,8 +480,7 @@ msgstr "Parancsértelmező"
 msgid "Please wait, adding media..."
 msgstr "Adatforrások felvétele..."
 
-#: any.pm:866
-#: security/l10n.pm:14
+#: any.pm:866 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "Automatikus bejelentkezés"
@@ -510,7 +488,9 @@ msgstr "Automatikus bejelentkezés"
 #: any.pm:867
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
-msgstr "Beállítható, hogy rendszerindításkor egy felhasználó automatikusan bejelentkezzen."
+msgstr ""
+"Beállítható, hogy rendszerindításkor egy felhasználó automatikusan "
+"bejelentkezzen."
 
 #: any.pm:868
 #, c-format
@@ -527,16 +507,12 @@ msgstr "Adja meg az alapértelmezett felhasználónevet:"
 msgid "Choose the window manager to run:"
 msgstr "Válassza ki a használni kívánt ablakkezelőt:"
 
-#: any.pm:881
-#: any.pm:899
-#: any.pm:957
+#: any.pm:881 any.pm:899 any.pm:957
 #, c-format
 msgid "Release Notes"
 msgstr "Verzióinformáció"
 
-#: any.pm:906
-#: any.pm:1250
-#: interactive/gtk.pm:804
+#: any.pm:906 any.pm:1250 interactive/gtk.pm:804
 #, c-format
 msgid "Close"
 msgstr "Bezárás"
@@ -546,8 +522,7 @@ msgstr "Bezárás"
 msgid "License agreement"
 msgstr "Licencegyezmény"
 
-#: any.pm:945
-#: diskdrake/dav.pm:26
+#: any.pm:945 diskdrake/dav.pm:26
 #, c-format
 msgid "Quit"
 msgstr "Kilépés"
@@ -567,8 +542,7 @@ msgstr "Elfogadom"
 msgid "Refuse"
 msgstr "Nem fogadom el"
 
-#: any.pm:980
-#: any.pm:1045
+#: any.pm:980 any.pm:1045
 #, c-format
 msgid "Please choose a language to use"
 msgstr "Válasszon nyelvet"
@@ -589,8 +563,7 @@ msgstr ""
 msgid "Multi languages"
 msgstr "Több nyelv"
 
-#: any.pm:1023
-#: any.pm:1054
+#: any.pm:1023 any.pm:1054
 #, c-format
 msgid "Old compatibility (non UTF-8) encoding"
 msgstr "Régebbi kompatibilitási (nem UTF-8) kódolás"
@@ -625,9 +598,7 @@ msgstr "Itt található az elérhető országok listája"
 msgid "Other Countries"
 msgstr "Egyéb országok"
 
-#: any.pm:1105
-#: interactive.pm:484
-#: interactive/gtk.pm:426
+#: any.pm:1105 interactive.pm:484 interactive/gtk.pm:426
 #, c-format
 msgid "Advanced"
 msgstr "Speciális"
@@ -661,31 +632,44 @@ msgstr "Egyéni"
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
-"Allowing this will permit users to simply click on \"Share\" in konqueror and nautilus.\n"
+"Allowing this will permit users to simply click on \"Share\" in konqueror "
+"and nautilus.\n"
 "\n"
 "\"Custom\" permit a per-user granularity.\n"
 msgstr ""
-"Szeretné engedélyezni a felhasználók számára azt, hogy a saját könyvtáraikat\n"
+"Szeretné engedélyezni a felhasználók számára azt, hogy a saját "
+"könyvtáraikat\n"
 "megosszák?\n"
-"Ha ez engedélyezve van, akkor a felhasználók a Konquerorban és a Nautilusban\n"
+"Ha ez engedélyezve van, akkor a felhasználók a Konquerorban és a "
+"Nautilusban\n"
 "a \"Megosztás\" funkcióval végezhetnek exportálást.\n"
 "\n"
 "Az \"Egyéni\" opció használatával felhasználónkénti beállítás lehetséges.\n"
 
 #: any.pm:1211
 #, c-format
-msgid "NFS: the traditional Unix file sharing system, with less support on Mac and Windows."
-msgstr "NFS: a hagyományos UNIX-os fájlmegosztási rendszer - Macintosh és Windows alatt kevésbé támogatott."
+msgid ""
+"NFS: the traditional Unix file sharing system, with less support on Mac and "
+"Windows."
+msgstr ""
+"NFS: a hagyományos UNIX-os fájlmegosztási rendszer - Macintosh és Windows "
+"alatt kevésbé támogatott."
 
 #: any.pm:1214
 #, c-format
-msgid "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux systems."
-msgstr "SMB: Windows, Mac OS X és Linux alatt használatos fájlmegosztási módszer."
+msgid ""
+"SMB: a file sharing system used by Windows, Mac OS X and many modern Linux "
+"systems."
+msgstr ""
+"SMB: Windows, Mac OS X és Linux alatt használatos fájlmegosztási módszer."
 
 #: any.pm:1222
 #, c-format
-msgid "You can export using NFS or SMB. Please select which you would like to use."
-msgstr "Exportálás NFS-sel vagy Sambával végezhető. Válassza ki, melyiket kívánja használni."
+msgid ""
+"You can export using NFS or SMB. Please select which you would like to use."
+msgstr ""
+"Exportálás NFS-sel vagy Sambával végezhető. Válassza ki, melyiket kívánja "
+"használni."
 
 #: any.pm:1250
 #, c-format
@@ -704,7 +688,8 @@ msgstr ""
 #: any.pm:1344
 #, c-format
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
-msgstr "Jelentkezzen ki, majd nyomja meg a Ctrl+Alt+BackSpace billentyűkombinációt"
+msgstr ""
+"Jelentkezzen ki, majd nyomja meg a Ctrl+Alt+BackSpace billentyűkombinációt"
 
 #: any.pm:1348
 #, c-format
@@ -721,8 +706,7 @@ msgstr "Időzóna"
 msgid "Which is your timezone?"
 msgstr "Melyik időzónát választja?"
 
-#: any.pm:1406
-#: any.pm:1408
+#: any.pm:1406 any.pm:1408
 #, c-format
 msgid "Date, Clock & Time Zone Settings"
 msgstr "Dátum-, óra- és időzóna-beállítások"
@@ -772,8 +756,7 @@ msgstr "NIS"
 msgid "Smart Card"
 msgstr "Intelligens kártya"
 
-#: authentication.pm:29
-#: authentication.pm:205
+#: authentication.pm:29 authentication.pm:205
 #, c-format
 msgid "Windows Domain"
 msgstr "Windowsos tartomány"
@@ -790,7 +773,8 @@ msgstr "Helyi fájl:"
 
 #: authentication.pm:64
 #, c-format
-msgid "Use local for all authentication and information user tell in local file"
+msgid ""
+"Use local for all authentication and information user tell in local file"
 msgstr "Helyi felhasználó-azonosítás és információkezelés helyi fájl alapján"
 
 #: authentication.pm:65
@@ -800,8 +784,13 @@ msgstr "LDAP:"
 
 #: authentication.pm:65
 #, c-format
-msgid "Tells your computer to use LDAP for some or all authentication. LDAP consolidates certain types of information within your organization."
-msgstr "LDAP használatát írja elő az azonosítási műveletek egy részéhez vagy mindegyikükhöz. Az LDAP a szervezeten belüli információk bizonyos részét gyűjti egy helyre."
+msgid ""
+"Tells your computer to use LDAP for some or all authentication. LDAP "
+"consolidates certain types of information within your organization."
+msgstr ""
+"LDAP használatát írja elő az azonosítási műveletek egy részéhez vagy "
+"mindegyikükhöz. Az LDAP a szervezeten belüli információk bizonyos részét "
+"gyűjti egy helyre."
 
 #: authentication.pm:66
 #, c-format
@@ -810,8 +799,12 @@ msgstr "NIS:"
 
 #: authentication.pm:66
 #, c-format
-msgid "Allows you to run a group of computers in the same Network Information Service domain with a common password and group file."
-msgstr "Lehetővé teszi számítógépek csoportjának ugyanazon Network Information Service tartományban való üzemeltetését közös jelszóval és csoportfájllal."
+msgid ""
+"Allows you to run a group of computers in the same Network Information "
+"Service domain with a common password and group file."
+msgstr ""
+"Lehetővé teszi számítógépek csoportjának ugyanazon Network Information "
+"Service tartományban való üzemeltetését közös jelszóval és csoportfájllal."
 
 #: authentication.pm:67
 #, c-format
@@ -820,8 +813,12 @@ msgstr "Windowsos tartomány:"
 
 #: authentication.pm:67
 #, c-format
-msgid "Winbind allows the system to retrieve information and authenticate users in a Windows domain."
-msgstr "A Winbind lehetővé teszi a rendszer számára, hogy információt szerezzen és felhasználókat azonosítson egy windowsos tartományban."
+msgid ""
+"Winbind allows the system to retrieve information and authenticate users in "
+"a Windows domain."
+msgstr ""
+"A Winbind lehetővé teszi a rendszer számára, hogy információt szerezzen és "
+"felhasználókat azonosítson egy windowsos tartományban."
 
 #: authentication.pm:68
 #, c-format
@@ -831,22 +828,17 @@ msgstr "Kerberos 5 :"
 #: authentication.pm:68
 #, c-format
 msgid "With Kerberos and Ldap for authentication in Active Directory Server "
-msgstr "Azonosítás Kerberos és LDAP használatával egy Active Directory kiszolgálón "
-
-#: authentication.pm:96
-#: authentication.pm:130
-#: authentication.pm:149
-#: authentication.pm:150
-#: authentication.pm:176
-#: authentication.pm:200
+msgstr ""
+"Azonosítás Kerberos és LDAP használatával egy Active Directory kiszolgálón "
+
+#: authentication.pm:96 authentication.pm:130 authentication.pm:149
+#: authentication.pm:150 authentication.pm:176 authentication.pm:200
 #: authentication.pm:878
 #, c-format
 msgid " "
 msgstr " "
 
-#: authentication.pm:97
-#: authentication.pm:131
-#: authentication.pm:177
+#: authentication.pm:97 authentication.pm:131 authentication.pm:177
 #: authentication.pm:201
 #, c-format
 msgid "Welcome to the Authentication Wizard"
@@ -854,17 +846,18 @@ msgstr "Üdvözli a Felhasználó azonosítás varázslója"
 
 #: authentication.pm:99
 #, c-format
-msgid "You have selected LDAP authentication. Please review the configuration options below "
-msgstr "Az LDAP azonosítást választotta. Kérem nézze át az alábbi beállításokat"
+msgid ""
+"You have selected LDAP authentication. Please review the configuration "
+"options below "
+msgstr ""
+"Az LDAP azonosítást választotta. Kérem nézze át az alábbi beállításokat"
 
-#: authentication.pm:101
-#: authentication.pm:156
+#: authentication.pm:101 authentication.pm:156
 #, c-format
 msgid "LDAP Server"
 msgstr "LDAP kiszolgáló"
 
-#: authentication.pm:102
-#: authentication.pm:157
+#: authentication.pm:102 authentication.pm:157
 #, c-format
 msgid "Base dn"
 msgstr "Alap dn"
@@ -874,46 +867,38 @@ msgstr "Alap dn"
 msgid "Fetch base Dn "
 msgstr "Dn alapú letöltés"
 
-#: authentication.pm:105
-#: authentication.pm:160
+#: authentication.pm:105 authentication.pm:160
 #, c-format
 msgid "Use encrypt connection with TLS "
 msgstr "TLS titkosított kapcsolat használata"
 
-#: authentication.pm:106
-#: authentication.pm:161
+#: authentication.pm:106 authentication.pm:161
 #, c-format
 msgid "Download CA Certificate "
 msgstr "CA minősítés letöltése"
 
-#: authentication.pm:108
-#: authentication.pm:141
+#: authentication.pm:108 authentication.pm:141
 #, c-format
 msgid "Use Disconnect mode "
 msgstr "Kapcsolat nélküli mód használata"
 
-#: authentication.pm:109
-#: authentication.pm:162
+#: authentication.pm:109 authentication.pm:162
 #, c-format
 msgid "Use anonymous BIND "
 msgstr "Névtelen BIND használata "
 
-#: authentication.pm:110
-#: authentication.pm:113
-#: authentication.pm:115
+#: authentication.pm:110 authentication.pm:113 authentication.pm:115
 #: authentication.pm:119
 #, c-format
 msgid "  "
 msgstr "  "
 
-#: authentication.pm:111
-#: authentication.pm:163
+#: authentication.pm:111 authentication.pm:163
 #, c-format
 msgid "Bind DN "
 msgstr "DN illesztése "
 
-#: authentication.pm:112
-#: authentication.pm:164
+#: authentication.pm:112 authentication.pm:164
 #, c-format
 msgid "Bind Password "
 msgstr "Bind jelszó"
@@ -940,8 +925,11 @@ msgstr "Shadow alapú"
 
 #: authentication.pm:133
 #, c-format
-msgid "You have selected Kerberos 5 authentication. Please review the configuration options below "
-msgstr "A Kerberos 5 azonosítást választotta. Kérem nézze át az alábbi beállításokat"
+msgid ""
+"You have selected Kerberos 5 authentication. Please review the configuration "
+"options below "
+msgstr ""
+"A Kerberos 5 azonosítást választotta. Kérem nézze át az alábbi beállításokat"
 
 #: authentication.pm:135
 #, c-format
@@ -975,8 +963,12 @@ msgstr "Ldap felhasználói információk használata"
 
 #: authentication.pm:152
 #, c-format
-msgid "You have selected Kerberos 5 for authentication, now you must choose the type of users information "
-msgstr "Kiválasztotta a Kerberos 5 azonosítást. Most ki kell választani a felhasználói információ típusát"
+msgid ""
+"You have selected Kerberos 5 for authentication, now you must choose the "
+"type of users information "
+msgstr ""
+"Kiválasztotta a Kerberos 5 azonosítást. Most ki kell választani a "
+"felhasználói információ típusát"
 
 #: authentication.pm:158
 #, c-format
@@ -985,7 +977,9 @@ msgstr "Dn alapú letöltés"
 
 #: authentication.pm:179
 #, c-format
-msgid "You have selected NIS authentication. Please review the configuration options below "
+msgid ""
+"You have selected NIS authentication. Please review the configuration "
+"options below "
 msgstr "A NIS azonosítást választotta. Kérem nézze át az alábbi beállításokat"
 
 #: authentication.pm:181
@@ -1000,8 +994,12 @@ msgstr "NIS kiszolgáló"
 
 #: authentication.pm:203
 #, c-format
-msgid "You have selected Windows Domain authentication. Please review the configuration options below "
-msgstr "A Windows Domain azonosítást választotta. Kérem nézze át az alábbi beállításokat"
+msgid ""
+"You have selected Windows Domain authentication. Please review the "
+"configuration options below "
+msgstr ""
+"A Windows Domain azonosítást választotta. Kérem nézze át az alábbi "
+"beállításokat"
 
 #: authentication.pm:207
 #, c-format
@@ -1013,8 +1011,7 @@ msgstr "Tartomány Modell"
 msgid "Active Directory Realm "
 msgstr "Active Directory realm"
 
-#: authentication.pm:225
-#: authentication.pm:241
+#: authentication.pm:225 authentication.pm:241
 #, c-format
 msgid "Authentication"
 msgstr "Felhasználóazonosítás"
@@ -1117,13 +1114,21 @@ msgstr "A rendszerindító program nem tehető %s partícióra\n"
 
 #: bootloader.pm:1964
 #, c-format
-msgid "Your bootloader configuration must be updated because partition has been renumbered"
-msgstr "A rendszerindító beállításait frissíteni kell, mivel a partíciók számozása módosult."
+msgid ""
+"Your bootloader configuration must be updated because partition has been "
+"renumbered"
+msgstr ""
+"A rendszerindító beállításait frissíteni kell, mivel a partíciók számozása "
+"módosult."
 
 #: bootloader.pm:1977
 #, c-format
-msgid "The bootloader can not be installed correctly. You have to boot rescue and choose \"%s\""
-msgstr "A rendszerindító nem telepíthető. Indítsa el a rendszert egy helyreállítási lemezzel, majd válassza ezt: \"%s\"."
+msgid ""
+"The bootloader can not be installed correctly. You have to boot rescue and "
+"choose \"%s\""
+msgstr ""
+"A rendszerindító nem telepíthető. Indítsa el a rendszert egy helyreállítási "
+"lemezzel, majd válassza ezt: \"%s\"."
 
 #: bootloader.pm:1978
 #, c-format
@@ -1150,8 +1155,7 @@ msgstr "MB"
 msgid "GB"
 msgstr "GB"
 
-#: common.pm:142
-#: common.pm:151
+#: common.pm:142 common.pm:151
 #, c-format
 msgid "TB"
 msgstr "TB"
@@ -1195,16 +1199,12 @@ msgstr ""
 msgid "New"
 msgstr "Új"
 
-#: diskdrake/dav.pm:61
-#: diskdrake/interactive.pm:382
-#: diskdrake/smbnfs_gtk.pm:75
+#: diskdrake/dav.pm:61 diskdrake/interactive.pm:382 diskdrake/smbnfs_gtk.pm:75
 #, c-format
 msgid "Unmount"
 msgstr "Leválasztás"
 
-#: diskdrake/dav.pm:62
-#: diskdrake/interactive.pm:379
-#: diskdrake/smbnfs_gtk.pm:76
+#: diskdrake/dav.pm:62 diskdrake/interactive.pm:379 diskdrake/smbnfs_gtk.pm:76
 #, c-format
 msgid "Mount"
 msgstr "Csatolás"
@@ -1214,64 +1214,37 @@ msgstr "Csatolás"
 msgid "Server"
 msgstr "Kiszolgáló"
 
-#: diskdrake/dav.pm:64
-#: diskdrake/interactive.pm:373
-#: diskdrake/interactive.pm:613
-#: diskdrake/interactive.pm:631
-#: diskdrake/interactive.pm:635
-#: diskdrake/removable.pm:23
+#: diskdrake/dav.pm:64 diskdrake/interactive.pm:373
+#: diskdrake/interactive.pm:613 diskdrake/interactive.pm:631
+#: diskdrake/interactive.pm:635 diskdrake/removable.pm:23
 #: diskdrake/smbnfs_gtk.pm:79
 #, c-format
 msgid "Mount point"
 msgstr "Csatolási pont"
 
-#: diskdrake/dav.pm:65
-#: diskdrake/interactive.pm:375
-#: diskdrake/interactive.pm:989
-#: diskdrake/removable.pm:24
+#: diskdrake/dav.pm:65 diskdrake/interactive.pm:375
+#: diskdrake/interactive.pm:989 diskdrake/removable.pm:24
 #: diskdrake/smbnfs_gtk.pm:80
 #, c-format
 msgid "Options"
 msgstr "Beállítások"
 
-#: diskdrake/dav.pm:66
-#: diskdrake/hd_gtk.pm:174
-#: diskdrake/removable.pm:26
-#: diskdrake/smbnfs_gtk.pm:82
-#: interactive/http.pm:151
+#: diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:174 diskdrake/removable.pm:26
+#: diskdrake/smbnfs_gtk.pm:82 interactive/http.pm:151
 #, c-format
 msgid "Done"
 msgstr "Kész"
 
-#: diskdrake/dav.pm:75
-#: diskdrake/hd_gtk.pm:120
-#: diskdrake/hd_gtk.pm:272
-#: diskdrake/interactive.pm:233
-#: diskdrake/interactive.pm:246
-#: diskdrake/interactive.pm:480
-#: diskdrake/interactive.pm:485
-#: diskdrake/interactive.pm:603
-#: diskdrake/interactive.pm:861
-#: diskdrake/interactive.pm:1035
-#: diskdrake/interactive.pm:1048
-#: diskdrake/interactive.pm:1051
-#: diskdrake/interactive.pm:1300
-#: diskdrake/smbnfs_gtk.pm:42
-#: do_pkgs.pm:23
-#: do_pkgs.pm:28
-#: do_pkgs.pm:44
-#: do_pkgs.pm:60
-#: do_pkgs.pm:65
-#: fsedit.pm:222
-#: interactive/http.pm:117
-#: interactive/http.pm:118
-#: modules/interactive.pm:19
-#: scanner.pm:94
-#: scanner.pm:105
-#: scanner.pm:112
-#: scanner.pm:119
-#: wizards.pm:95
-#: wizards.pm:99
+#: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:120 diskdrake/hd_gtk.pm:272
+#: diskdrake/interactive.pm:233 diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:480 diskdrake/interactive.pm:485
+#: diskdrake/interactive.pm:603 diskdrake/interactive.pm:861
+#: diskdrake/interactive.pm:1035 diskdrake/interactive.pm:1048
+#: diskdrake/interactive.pm:1051 diskdrake/interactive.pm:1300
+#: diskdrake/smbnfs_gtk.pm:42 do_pkgs.pm:23 do_pkgs.pm:28 do_pkgs.pm:44
+#: do_pkgs.pm:60 do_pkgs.pm:65 fsedit.pm:222 interactive/http.pm:117
+#: interactive/http.pm:118 modules/interactive.pm:19 scanner.pm:94
+#: scanner.pm:105 scanner.pm:112 scanner.pm:119 wizards.pm:95 wizards.pm:99
 #: wizards.pm:121
 #, c-format
 msgid "Error"
@@ -1292,30 +1265,22 @@ msgstr "Az URL-nek http:// vagy https:// kezdetűnek kell lenni"
 msgid "Server: "
 msgstr "Kiszolgáló: "
 
-#: diskdrake/dav.pm:110
-#: diskdrake/interactive.pm:453
-#: diskdrake/interactive.pm:1180
-#: diskdrake/interactive.pm:1260
+#: diskdrake/dav.pm:110 diskdrake/interactive.pm:453
+#: diskdrake/interactive.pm:1180 diskdrake/interactive.pm:1260
 #, c-format
 msgid "Mount point: "
 msgstr "Csatolási pont: "
 
-#: diskdrake/dav.pm:111
-#: diskdrake/interactive.pm:1267
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1267
 #, c-format
 msgid "Options: %s"
 msgstr "Beállítások: %s"
 
-#: diskdrake/hd_gtk.pm:54
-#: diskdrake/interactive.pm:284
-#: diskdrake/smbnfs_gtk.pm:22
-#: fs/mount_point.pm:106
-#: fs/partitioning_wizard.pm:51
-#: fs/partitioning_wizard.pm:206
-#: fs/partitioning_wizard.pm:211
-#: fs/partitioning_wizard.pm:250
-#: fs/partitioning_wizard.pm:269
-#: fs/partitioning_wizard.pm:274
+#: diskdrake/hd_gtk.pm:54 diskdrake/interactive.pm:284
+#: diskdrake/smbnfs_gtk.pm:22 fs/mount_point.pm:106
+#: fs/partitioning_wizard.pm:51 fs/partitioning_wizard.pm:206
+#: fs/partitioning_wizard.pm:211 fs/partitioning_wizard.pm:250
+#: fs/partitioning_wizard.pm:269 fs/partitioning_wizard.pm:274
 #, c-format
 msgid "Partitioning"
 msgstr "Partícionálás"
@@ -1323,12 +1288,11 @@ msgstr "Partícionálás"
 #: diskdrake/hd_gtk.pm:68
 #, c-format
 msgid "Click on a partition, choose a filesystem type then choose an action"
-msgstr "Kattintson egy partícióra, és válassza ki a használandó fájlrendszer típusát"
+msgstr ""
+"Kattintson egy partícióra, és válassza ki a használandó fájlrendszer típusát"
 
-#: diskdrake/hd_gtk.pm:102
-#: diskdrake/interactive.pm:1010
-#: diskdrake/interactive.pm:1020
-#: diskdrake/interactive.pm:1073
+#: diskdrake/hd_gtk.pm:102 diskdrake/interactive.pm:1010
+#: diskdrake/interactive.pm:1020 diskdrake/interactive.pm:1073
 #, c-format
 msgid "Read carefully"
 msgstr "Olvassa el figyelmesen"
@@ -1338,8 +1302,7 @@ msgstr "Olvassa el figyelmesen"
 msgid "Please make a backup of your data first"
 msgstr "Először készítsen biztonsági mentést az adatokról"
 
-#: diskdrake/hd_gtk.pm:103
-#: diskdrake/interactive.pm:226
+#: diskdrake/hd_gtk.pm:103 diskdrake/interactive.pm:226
 #, c-format
 msgid "Exit"
 msgstr "Kilépés"
@@ -1349,13 +1312,8 @@ msgstr "Kilépés"
 msgid "Continue"
 msgstr "Folytatás"
 
-#: diskdrake/hd_gtk.pm:170
-#: interactive.pm:649
-#: interactive/gtk.pm:781
-#: interactive/gtk.pm:797
-#: interactive/gtk.pm:815
-#: ugtk2.pm:933
-#: ugtk2.pm:934
+#: diskdrake/hd_gtk.pm:170 interactive.pm:649 interactive/gtk.pm:781
+#: interactive/gtk.pm:797 interactive/gtk.pm:815 ugtk2.pm:933 ugtk2.pm:934
 #, c-format
 msgid "Help"
 msgstr "Segítség"
@@ -1376,8 +1334,7 @@ msgstr ""
 msgid "Please click on a partition"
 msgstr "Kattintson egy partícióra"
 
-#: diskdrake/hd_gtk.pm:224
-#: diskdrake/smbnfs_gtk.pm:63
+#: diskdrake/hd_gtk.pm:224 diskdrake/smbnfs_gtk.pm:63
 #, c-format
 msgid "Details"
 msgstr "Részletek"
@@ -1422,14 +1379,12 @@ msgstr "HFS"
 msgid "Windows"
 msgstr "Windows"
 
-#: diskdrake/hd_gtk.pm:362
-#: services.pm:158
+#: diskdrake/hd_gtk.pm:362 services.pm:158
 #, c-format
 msgid "Other"
 msgstr "Egyéb"
 
-#: diskdrake/hd_gtk.pm:362
-#: diskdrake/interactive.pm:1195
+#: diskdrake/hd_gtk.pm:362 diskdrake/interactive.pm:1195
 #, c-format
 msgid "Empty"
 msgstr "Üres"
@@ -1439,22 +1394,13 @@ msgstr "Üres"
 msgid "Filesystem types:"
 msgstr "Fájlrendszer típusok:"
 
-#: diskdrake/hd_gtk.pm:390
-#: diskdrake/interactive.pm:289
-#: diskdrake/interactive.pm:361
-#: diskdrake/interactive.pm:510
-#: diskdrake/interactive.pm:694
-#: diskdrake/interactive.pm:752
-#: diskdrake/interactive.pm:841
-#: diskdrake/interactive.pm:883
-#: diskdrake/interactive.pm:884
-#: diskdrake/interactive.pm:1118
-#: diskdrake/interactive.pm:1156
-#: diskdrake/interactive.pm:1299
-#: do_pkgs.pm:19
-#: do_pkgs.pm:39
-#: do_pkgs.pm:57
-#: harddrake/sound.pm:422
+#: diskdrake/hd_gtk.pm:390 diskdrake/interactive.pm:289
+#: diskdrake/interactive.pm:361 diskdrake/interactive.pm:510
+#: diskdrake/interactive.pm:694 diskdrake/interactive.pm:752
+#: diskdrake/interactive.pm:841 diskdrake/interactive.pm:883
+#: diskdrake/interactive.pm:884 diskdrake/interactive.pm:1118
+#: diskdrake/interactive.pm:1156 diskdrake/interactive.pm:1299 do_pkgs.pm:19
+#: do_pkgs.pm:39 do_pkgs.pm:57 harddrake/sound.pm:422
 #, c-format
 msgid "Warning"
 msgstr "Figyelmeztetés"
@@ -1474,12 +1420,9 @@ msgstr "Használja először a \"Leválasztás\"-t"
 msgid "Use ``%s'' instead (in expert mode)"
 msgstr "Használja inkább ezt: \"%s\" (tapasztaltaknak)"
 
-#: diskdrake/hd_gtk.pm:399
-#: diskdrake/interactive.pm:374
-#: diskdrake/interactive.pm:548
-#: diskdrake/interactive.pm:1026
-#: diskdrake/removable.pm:25
-#: diskdrake/removable.pm:48
+#: diskdrake/hd_gtk.pm:399 diskdrake/interactive.pm:374
+#: diskdrake/interactive.pm:548 diskdrake/interactive.pm:1026
+#: diskdrake/removable.pm:25 diskdrake/removable.pm:48
 #, c-format
 msgid "Type"
 msgstr "Típus"
@@ -1494,19 +1437,14 @@ msgstr "Válasszon egy másik partíciót"
 msgid "Choose a partition"
 msgstr "Válasszon egy partíciót"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Átváltás normál módba"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Átváltás szakértői módba"
+msgid "More"
+msgstr "Egyéb"
 
-#: diskdrake/interactive.pm:267
-#: diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Megerősítés"
@@ -1531,11 +1469,11 @@ msgstr "Ki akar lépni a programból a partíciós tábla mentése nélkül?"
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "El szeretné menteni a /etc/fstab fájlban végrehajtott módosításokat?"
 
-#: diskdrake/interactive.pm:284
-#: fs/partitioning_wizard.pm:250
+#: diskdrake/interactive.pm:284 fs/partitioning_wizard.pm:250
 #, c-format
 msgid "You need to reboot for the partition table modifications to take place"
-msgstr "A partíciós tábla változásai csak a gép újraindítása után lépnek érvénybe"
+msgstr ""
+"A partíciós tábla változásai csak a gép újraindítása után lépnek érvénybe"
 
 #: diskdrake/interactive.pm:289
 #, c-format
@@ -1558,14 +1496,17 @@ msgstr "Teljes törlés"
 msgid "Auto allocate"
 msgstr "Automatikus helyfoglalás"
 
-#: diskdrake/interactive.pm:304
-#: diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Egyéb"
+msgid "Toggle to normal mode"
+msgstr "Átváltás normál módba"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Átváltás szakértői módba"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Merevlemez jellemzők"
@@ -1582,8 +1523,12 @@ msgstr "Nem hozható létre több partíció"
 
 #: diskdrake/interactive.pm:343
 #, c-format
-msgid "To have more partitions, please delete one to be able to create an extended partition"
-msgstr "További partíciók létrehozásához törölni kell egyet (hogy egy kiterjesztett partíciót létre lehessen hozni)"
+msgid ""
+"To have more partitions, please delete one to be able to create an extended "
+"partition"
+msgstr ""
+"További partíciók létrehozásához törölni kell egyet (hogy egy kiterjesztett "
+"partíciót létre lehessen hozni)"
 
 #: diskdrake/interactive.pm:354
 #, c-format
@@ -1595,8 +1540,7 @@ msgstr "A partíciós tábla újraolvasása"
 msgid "Detailed information"
 msgstr "Részletes információ"
 
-#: diskdrake/interactive.pm:377
-#: diskdrake/interactive.pm:707
+#: diskdrake/interactive.pm:377 diskdrake/interactive.pm:707
 #, c-format
 msgid "Resize"
 msgstr "Átméretezés"
@@ -1606,19 +1550,22 @@ msgstr "Átméretezés"
 msgid "Format"
 msgstr "Formázás"
 
-#: diskdrake/interactive.pm:380
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:380 diskdrake/interactive.pm:793
 #, c-format
 msgid "Add to RAID"
 msgstr "Hozzáadás RAID-hez"
 
-#: diskdrake/interactive.pm:381
-#: diskdrake/interactive.pm:811
+#: diskdrake/interactive.pm:381 diskdrake/interactive.pm:811
 #, c-format
 msgid "Add to LVM"
 msgstr "Hozzáadás LVM-hez"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Felh.-azonosító"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Törlés"
@@ -1633,7 +1580,12 @@ msgstr "Eltávolítás RAID-ből"
 msgid "Remove from LVM"
 msgstr "Eltávolítás LVM-ből"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Eltávolítás LVM-ből"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "RAID módosítása"
@@ -1648,8 +1600,7 @@ msgstr "Loopback-hez használva"
 msgid "Create"
 msgstr "Létrehozás"
 
-#: diskdrake/interactive.pm:442
-#: diskdrake/interactive.pm:444
+#: diskdrake/interactive.pm:442 diskdrake/interactive.pm:444
 #, c-format
 msgid "Create a new partition"
 msgstr "Új partíció létrehozása"
@@ -1659,14 +1610,12 @@ msgstr "Új partíció létrehozása"
 msgid "Start sector: "
 msgstr "Kezdőszektor: "
 
-#: diskdrake/interactive.pm:449
-#: diskdrake/interactive.pm:876
+#: diskdrake/interactive.pm:449 diskdrake/interactive.pm:876
 #, c-format
 msgid "Size in MB: "
 msgstr "Méret (MB): "
 
-#: diskdrake/interactive.pm:451
-#: diskdrake/interactive.pm:877
+#: diskdrake/interactive.pm:451 diskdrake/interactive.pm:877
 #, c-format
 msgid "Filesystem type: "
 msgstr "A fájlrendszer típusa: "
@@ -1690,7 +1639,8 @@ msgid ""
 msgstr ""
 "Nem lehet új partíciót létrehozni\n"
 "(mivel elérte az elsődleges partíciók lehetséges maximális számát).\n"
-"Távolítson el egy elsődleges partíciót és hozzon létre egy kiterjesztett partíciót."
+"Távolítson el egy elsődleges partíciót és hozzon létre egy kiterjesztett "
+"partíciót."
 
 #: diskdrake/interactive.pm:510
 #, c-format
@@ -1699,16 +1649,17 @@ msgstr "El szeretné távolítani a loopback fájlt?"
 
 #: diskdrake/interactive.pm:532
 #, c-format
-msgid "After changing type of partition %s, all data on this partition will be lost"
-msgstr "A(z) %s partíció típusának módosítása után a partíción levő adatok elvesznek"
+msgid ""
+"After changing type of partition %s, all data on this partition will be lost"
+msgstr ""
+"A(z) %s partíció típusának módosítása után a partíción levő adatok elvesznek"
 
 #: diskdrake/interactive.pm:545
 #, c-format
 msgid "Change partition type"
 msgstr "A partíciótípus megváltoztatása"
 
-#: diskdrake/interactive.pm:547
-#: diskdrake/removable.pm:47
+#: diskdrake/interactive.pm:547 diskdrake/removable.pm:47
 #, c-format
 msgid "Which filesystem do you want?"
 msgstr "Melyik fájlrendszert szeretné?"
@@ -1718,8 +1669,7 @@ msgstr "Melyik fájlrendszert szeretné?"
 msgid "Switching from %s to %s"
 msgstr "Átváltás %sről %sre"
 
-#: diskdrake/interactive.pm:580
-#: diskdrake/interactive.pm:583
+#: diskdrake/interactive.pm:580 diskdrake/interactive.pm:583
 #, c-format
 msgid "Which volume label?"
 msgstr "Melyik kötetcímke?"
@@ -1753,10 +1703,8 @@ msgstr ""
 msgid "Where do you want to mount %s?"
 msgstr "Hová szeretné csatolni ezt: \"%s\"?"
 
-#: diskdrake/interactive.pm:658
-#: diskdrake/interactive.pm:741
-#: fs/partitioning_wizard.pm:146
-#: fs/partitioning_wizard.pm:178
+#: diskdrake/interactive.pm:658 diskdrake/interactive.pm:741
+#: fs/partitioning_wizard.pm:146 fs/partitioning_wizard.pm:178
 #, c-format
 msgid "Resizing"
 msgstr "Átméretezés"
@@ -1779,7 +1727,8 @@ msgstr "Készítsen biztonsági mentést erről a partícióról"
 #: diskdrake/interactive.pm:701
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
-msgstr "A(z) %s partíció átméretezésekor a partíción található adatok elvesznek"
+msgstr ""
+"A(z) %s partíció átméretezésekor a partíción található adatok elvesznek"
 
 #: diskdrake/interactive.pm:708
 #, c-format
@@ -1801,23 +1750,42 @@ msgstr "Minimális méret: %s MB"
 msgid "Maximum size: %s MB"
 msgstr "Maximális méret: %s MB"
 
-#: diskdrake/interactive.pm:752
-#: fs/partitioning_wizard.pm:186
+#: diskdrake/interactive.pm:752 fs/partitioning_wizard.pm:186
 #, 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®"
 msgstr ""
-"Az adatok épségének biztosítása érdekében a legközelebbi Windows indításnál \n"
+"Az adatok épségének biztosítása érdekében a legközelebbi Windows "
+"indításnál \n"
 "fájlrendszer ellenőrzés lesz végezve"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Fájlrendszer titkosítási kulcs"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Válasszon fájlrendszer titkosítási kulcsot"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Titkosítási kulcs"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Válassza ki azt a RAID-et, amelyikhez hozzá szeretné adni a lemezt"
 
-#: diskdrake/interactive.pm:795
-#: diskdrake/interactive.pm:813
+#: diskdrake/interactive.pm:795 diskdrake/interactive.pm:813
 #, c-format
 msgid "new"
 msgstr "új"
@@ -1839,7 +1807,8 @@ msgid ""
 "Do you want to move used physical extents on this volume to other volumes?"
 msgstr ""
 "A(z) \"%s\" fizikai kötet még használatban van.\n"
-"Kívánja áthelyezni a kötet használatban levő fizikai kiterjedéseit (extent) más kötetekre?"
+"Kívánja áthelyezni a kötet használatban levő fizikai kiterjedéseit (extent) "
+"más kötetekre?"
 
 #: diskdrake/interactive.pm:843
 #, c-format
@@ -1869,15 +1838,15 @@ msgstr "Adjon meg egy fájlnevet"
 #: diskdrake/interactive.pm:883
 #, c-format
 msgid "File is already used by another loopback, choose another one"
-msgstr "Ez a fájl már egy másik loopback-hez van rendelve, válasszon egy másikat"
+msgstr ""
+"Ez a fájl már egy másik loopback-hez van rendelve, válasszon egy másikat"
 
 #: diskdrake/interactive.pm:884
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "A fájl már létezik, használjam?"
 
-#: diskdrake/interactive.pm:916
-#: diskdrake/interactive.pm:919
+#: diskdrake/interactive.pm:916 diskdrake/interactive.pm:919
 #, c-format
 msgid "Mount options"
 msgstr "Csatolási (mount) opciók"
@@ -1927,13 +1896,17 @@ msgstr "A változások csak a rendszer újraindításakor lépnek életbe"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "A(z) \"%s\" meghajtó partíciótáblájának mentése következik"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "A(z) %s partíció formázása"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "A(z) %s partíció formázásakor a partíción található adatok elvesznek!"
 
-#: diskdrake/interactive.pm:1103
-#: fs/partitioning.pm:48
+#: diskdrake/interactive.pm:1103 fs/partitioning.pm:48
 #, c-format
 msgid "Check bad blocks?"
 msgstr "Ellenőrizve legyen, hogy vannak-e hibás blokkok?"
@@ -1954,12 +1927,16 @@ msgid ""
 "Directory %s already contains data\n"
 "(%s)\n"
 "\n"
-"You can either choose to move the files into the partition that will be mounted there or leave them where they are (which results in hiding them by the contents of the mounted partition)"
+"You can either choose to move the files into the partition that will be "
+"mounted there or leave them where they are (which results in hiding them by "
+"the contents of the mounted partition)"
 msgstr ""
 "A(z) \"%s\" könyvtárban már vannak fájlok.\n"
 "(%s)\n"
 "\n"
-"Áthelyezheti a fájlokat az oda csatolandó partícióra, vagy a helyükön hagyhatja azokat (az utóbbi esetben a már ott levő fájlokat el fogja rejteni a csatolt partíció tartalma)."
+"Áthelyezheti a fájlokat az oda csatolandó partícióra, vagy a helyükön "
+"hagyhatja azokat (az utóbbi esetben a már ott levő fájlokat el fogja rejteni "
+"a csatolt partíció tartalma)."
 
 #: diskdrake/interactive.pm:1133
 #, c-format
@@ -1986,8 +1963,7 @@ msgstr "a(z) %s partíció jelenleg \"%s\"-ként ismert"
 msgid "Partitions have been renumbered: "
 msgstr "A partíciók újra lettek számozva: "
 
-#: diskdrake/interactive.pm:1181
-#: diskdrake/interactive.pm:1244
+#: diskdrake/interactive.pm:1181 diskdrake/interactive.pm:1244
 #, c-format
 msgid "Device: "
 msgstr "Eszköz: "
@@ -2007,15 +1983,13 @@ msgstr "UUID: "
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS meghajtó betűjele: %s (ez csak egy tipp)\n"
 
-#: diskdrake/interactive.pm:1188
-#: diskdrake/interactive.pm:1197
+#: diskdrake/interactive.pm:1188 diskdrake/interactive.pm:1197
 #: diskdrake/interactive.pm:1263
 #, c-format
 msgid "Type: "
 msgstr "Típus: "
 
-#: diskdrake/interactive.pm:1192
-#: diskdrake/interactive.pm:1248
+#: diskdrake/interactive.pm:1192 diskdrake/interactive.pm:1248
 #, c-format
 msgid "Name: "
 msgstr "Név: "
@@ -2065,7 +2039,27 @@ msgstr "Csatolva\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Titkosítási kulcs"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2169,12 +2163,7 @@ msgstr "A partíciós tábla típusa: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "csatorna: %d, id: %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Fájlrendszer titkosítási kulcs"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Válasszon fájlrendszer titkosítási kulcsot"
@@ -2182,19 +2171,16 @@ msgstr "Válasszon fájlrendszer titkosítási kulcsot"
 #: diskdrake/interactive.pm:1299
 #, c-format
 msgid "This encryption key is too simple (must be at least %d characters long)"
-msgstr "Ez a titkosítási kulcs túl egyszerű (legalább %d karakter hosszúnak kell lennie)"
+msgstr ""
+"Ez a titkosítási kulcs túl egyszerű (legalább %d karakter hosszúnak kell "
+"lennie)"
 
 #: diskdrake/interactive.pm:1300
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "A titkosítási kulcsok nem egyeznek"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Titkosítási kulcs"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Titkosítási kulcs (még egyszer)"
@@ -2209,18 +2195,10 @@ msgstr "Titkosítási módszer"
 msgid "Change type"
 msgstr "A típus megváltoztatása"
 
-#: diskdrake/smbnfs_gtk.pm:81
-#: interactive.pm:129
-#: interactive.pm:546
-#: interactive/curses.pm:260
-#: interactive/http.pm:104
-#: interactive/http.pm:160
-#: interactive/stdio.pm:39
-#: interactive/stdio.pm:148
-#: ugtk2.pm:415
-#: ugtk2.pm:517
-#: ugtk2.pm:526
-#: ugtk2.pm:813
+#: diskdrake/smbnfs_gtk.pm:81 interactive.pm:129 interactive.pm:546
+#: interactive/curses.pm:260 interactive/http.pm:104 interactive/http.pm:160
+#: interactive/stdio.pm:39 interactive/stdio.pm:148 ugtk2.pm:415 ugtk2.pm:517
+#: ugtk2.pm:526 ugtk2.pm:813
 #, c-format
 msgid "Cancel"
 msgstr "Mégsem"
@@ -2230,8 +2208,7 @@ msgstr "Mégsem"
 msgid "Can not login using username %s (bad password?)"
 msgstr "Nem sikerült bejelentkezni %s néven (helytelen jelszó?)"
 
-#: diskdrake/smbnfs_gtk.pm:168
-#: diskdrake/smbnfs_gtk.pm:177
+#: diskdrake/smbnfs_gtk.pm:168 diskdrake/smbnfs_gtk.pm:177
 #, c-format
 msgid "Domain Authentication Required"
 msgstr "Tartományi azonosítás szükséges"
@@ -2248,8 +2225,11 @@ msgstr "Másik"
 
 #: diskdrake/smbnfs_gtk.pm:178
 #, c-format
-msgid "Please enter your username, password and domain name to access this host."
-msgstr "Adja meg a gép eléréséhez szükséges felhasználónevet, jelszót és tartománynevet."
+msgid ""
+"Please enter your username, password and domain name to access this host."
+msgstr ""
+"Adja meg a gép eléréséhez szükséges felhasználónevet, jelszót és "
+"tartománynevet."
 
 #: diskdrake/smbnfs_gtk.pm:180
 #, c-format
@@ -2271,21 +2251,17 @@ msgstr "Kiszolgálók keresése"
 msgid "Search new servers"
 msgstr "Új kiszolgálók keresése"
 
-#: do_pkgs.pm:19
-#: do_pkgs.pm:57
+#: do_pkgs.pm:19 do_pkgs.pm:57
 #, c-format
 msgid "The package %s needs to be installed. Do you want to install it?"
 msgstr "A(z) %s csomagot telepíteni kell. Szeretné telepíteni?"
 
-#: do_pkgs.pm:23
-#: do_pkgs.pm:44
-#: do_pkgs.pm:60
+#: do_pkgs.pm:23 do_pkgs.pm:44 do_pkgs.pm:60
 #, c-format
 msgid "Could not install the %s package!"
 msgstr "Nem sikerült telepíteni a(z) %s csomagot."
 
-#: do_pkgs.pm:28
-#: do_pkgs.pm:65
+#: do_pkgs.pm:28 do_pkgs.pm:65
 #, c-format
 msgid "Mandatory package %s is missing"
 msgstr "Hiányzik a(z) \"%s\" nevű kötelező csomag"
@@ -2307,21 +2283,18 @@ msgstr "Csomagok eltávolítása..."
 
 #: 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"
-msgstr "Hiba történt - nincs olyan meghajtó, amelyen új fájlrendszert lehetne létrehozni. Ellenőrizze a gépben található eszközöket."
+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"
+msgstr ""
+"Hiba történt - nincs olyan meghajtó, amelyen új fájlrendszert lehetne "
+"létrehozni. Ellenőrizze a gépben található eszközöket."
 
-#: fs/any.pm:75
-#: fs/partitioning_wizard.pm:59
+#: fs/any.pm:75 fs/partitioning_wizard.pm:59
 #, c-format
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Szükség van egy FAT partícióra a /boot/efi ponthoz csatolva"
 
-#: fs/format.pm:63
-#: fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "A(z) %s partíció formázása"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -2332,8 +2305,7 @@ msgstr "%s fájl létrehozása és formázása"
 msgid "I do not know how to format %s in type %s"
 msgstr "A(z) %s eszköz nem formázható %s típusúra"
 
-#: fs/format.pm:127
-#: fs/format.pm:129
+#: fs/format.pm:127 fs/format.pm:129
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s formázás sikertelen a(z) %s eszközön"
@@ -2353,14 +2325,12 @@ msgstr "A(z) %s partíció csatolása"
 msgid "mounting partition %s in directory %s failed"
 msgstr "a(z) %s partíció ide történő csatolása sikertelen: %s"
 
-#: fs/mount.pm:85
-#: fs/mount.pm:102
+#: fs/mount.pm:85 fs/mount.pm:102
 #, c-format
 msgid "Checking %s"
 msgstr "%s ellenőrzése"
 
-#: fs/mount.pm:119
-#: partition_table.pm:403
+#: fs/mount.pm:119 partition_table.pm:403
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "hiba történt a(z) %s leválasztásakor: %s"
@@ -2383,7 +2353,9 @@ msgstr "Az írási gyorstár kiírása fájlbezáráskor"
 #: fs/mount_options.pm:119
 #, c-format
 msgid "Enable group disk quota accounting and optionally enforce limits"
-msgstr "Csoport lemezkvóta bekapcsolása, esetlegesen bizonyos korlátozások érvényesítésével"
+msgstr ""
+"Csoport lemezkvóta bekapcsolása, esetlegesen bizonyos korlátozások "
+"érvényesítésével"
 
 #: fs/mount_options.pm:121
 #, c-format
@@ -2416,7 +2388,9 @@ msgstr ""
 #: fs/mount_options.pm:130
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
-msgstr "A fájlrendszerben levő karakter- illetve blokkeszközök ne legyenek értelmezve."
+msgstr ""
+"A fájlrendszerben levő karakter- illetve blokkeszközök ne legyenek "
+"értelmezve."
 
 #: fs/mount_options.pm:132
 #, c-format
@@ -2425,7 +2399,8 @@ msgid ""
 "file system. This option might be useful for a server that has file systems\n"
 "containing binaries for architectures other than its own."
 msgstr ""
-"A felcsatolt fájlrendszeren levő bináris programok ne legyenek végrehajthatók.\n"
+"A felcsatolt fájlrendszeren levő bináris programok ne legyenek "
+"végrehajthatók.\n"
 "Ez akkor lehet hasznos, ha egy kiszolgálón vannak olyan fájlrendszerek is,\n"
 "amelyek más architektúrákhoz tartozó bináris programokat tartalmaznak."
 
@@ -2437,7 +2412,8 @@ msgid ""
 "have suidperl(1) installed.)"
 msgstr ""
 "A felhasználó- illetve csoportazonosító bitjének (SUID illetve SGID bit)\n"
-"tiltása. (Ez biztonságosnak tűnhet, de valójában nem az, ha fel van telepítve\n"
+"tiltása. (Ez biztonságosnak tűnhet, de valójában nem az, ha fel van "
+"telepítve\n"
 "az suidperl(1).)"
 
 #: fs/mount_options.pm:140
@@ -2453,7 +2429,9 @@ msgstr "A fájlrendszer összes I/O művelete szinkron módon történjen."
 #: fs/mount_options.pm:144
 #, c-format
 msgid "Allow every user to mount and umount the file system."
-msgstr "A fájlrendszer csatolásának és leválasztásának engedélyezése minden felhasználó számára."
+msgstr ""
+"A fájlrendszer csatolásának és leválasztásának engedélyezése minden "
+"felhasználó számára."
 
 #: fs/mount_options.pm:146
 #, c-format
@@ -2463,7 +2441,9 @@ msgstr "A fájlrendszer csatolásának engedélyezése normál felhasználók sz
 #: fs/mount_options.pm:148
 #, c-format
 msgid "Enable user disk quota accounting, and optionally enforce limits"
-msgstr "Felhasználói lemezkvóta bekapcsolása, esetlegesen bizonyos korlátozások érvényesítésével"
+msgstr ""
+"Felhasználói lemezkvóta bekapcsolása, esetlegesen bizonyos korlátozások "
+"érvényesítésével"
 
 #: fs/mount_options.pm:150
 #, c-format
@@ -2507,13 +2487,18 @@ msgstr "Válassza ki a formázandó partíciókat"
 
 #: fs/partitioning.pm:75
 #, c-format
-msgid "Failed to check filesystem %s. Do you want to repair the errors? (beware, you can lose data)"
-msgstr "A(z) \"%s\" fájlrendszer ellenőrzése hibákat eredményezett. Szeretné kijavítani a hibákat? (Legyen óvatos, mivel ez adatvesztéshez is vezethet.)"
+msgid ""
+"Failed to check filesystem %s. Do you want to repair the errors? (beware, "
+"you can lose data)"
+msgstr ""
+"A(z) \"%s\" fájlrendszer ellenőrzése hibákat eredményezett. Szeretné "
+"kijavítani a hibákat? (Legyen óvatos, mivel ez adatvesztéshez is vezethet.)"
 
 #: fs/partitioning.pm:78
 #, c-format
 msgid "Not enough swap space to fulfill installation, please add some"
-msgstr "A lapozóterület mérete nem elég nagy. Növelje meg a telepítés befejezéséhez."
+msgstr ""
+"A lapozóterület mérete nem elég nagy. Növelje meg a telepítés befejezéséhez."
 
 #: fs/partitioning_wizard.pm:51
 #, c-format
@@ -2613,8 +2598,14 @@ msgstr "A windowsos partíció méretének meghatározása"
 
 #: fs/partitioning_wizard.pm:153
 #, c-format
-msgid "Your Microsoft Windows® partition is too fragmented. Please reboot your computer under Microsoft Windows®, run the ``defrag'' utility, then restart the Mandriva Linux installation."
-msgstr "A windowsos partíció túlzottan töredezett. Indítsa újra a gépet Microsoft Windows®szal, majd futtassa a \"defrag\" programot. Ennek végeztével indítsa el újra a Mandriva Linux telepítését."
+msgid ""
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
+msgstr ""
+"A windowsos partíció túlzottan töredezett. Indítsa újra a gépet Microsoft "
+"Windows®szal, majd futtassa a \"defrag\" programot. Ennek végeztével indítsa "
+"el újra a Mandriva Linux telepítését."
 
 #: fs/partitioning_wizard.pm:156
 #, c-format
@@ -2625,7 +2616,12 @@ msgid ""
 "Your Microsoft Windows® partition will be now resized.\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"
+"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."
@@ -2649,9 +2645,7 @@ msgstr ""
 "a(z) \"%s\" gombot."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: fs/partitioning_wizard.pm:165
-#: interactive.pm:545
-#: interactive/curses.pm:263
+#: fs/partitioning_wizard.pm:165 interactive.pm:545 interactive/curses.pm:263
 #: ugtk2.pm:519
 #, c-format
 msgid "Next"
@@ -2665,7 +2659,8 @@ msgstr "Partícionálás"
 #: fs/partitioning_wizard.pm:168
 #, c-format
 msgid "Which size do you want to keep for Microsoft Windows® on partition %s?"
-msgstr "Mekkora helyet szeretne fenntartani a Microsoft Windows®nak itt: %s partíció?"
+msgstr ""
+"Mekkora helyet szeretne fenntartani a Microsoft Windows®nak itt: %s partíció?"
 
 #: fs/partitioning_wizard.pm:169
 #, c-format
@@ -2702,11 +2697,11 @@ msgstr "A teljes lemez törlése és felhasználása"
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr "Több merevlemeze van. Melyikre kívánja telepíteni a Linuxot?"
 
-#: fs/partitioning_wizard.pm:210
-#: fsedit.pm:570
+#: fs/partitioning_wizard.pm:210 fsedit.pm:570
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
-msgstr "MINDEN létező partíció és rajtuk minden adat elvész a(z) \"%s\" meghajtón"
+msgstr ""
+"MINDEN létező partíció és rajtuk minden adat elvész a(z) \"%s\" meghajtón"
 
 #: fs/partitioning_wizard.pm:220
 #, c-format
@@ -2770,12 +2765,14 @@ msgstr "kiszolgáló"
 #: fsedit.pm:116
 #, c-format
 msgid "BIOS software RAID detected on disks %s. Activate it?"
-msgstr "A következő lemezeken BIOS-os szoftveres RAID van: %s. Kívánja aktiválni?"
+msgstr ""
+"A következő lemezeken BIOS-os szoftveres RAID van: %s. Kívánja aktiválni?"
 
 #: fsedit.pm:223
 #, c-format
 msgid ""
-"I can not read the partition table of device %s, it's too corrupted for me :(\n"
+"I can not 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"
@@ -2818,32 +2815,40 @@ msgstr ""
 
 #: fsedit.pm:409
 #, c-format
-msgid "You can not use the LVM Logical Volume for mount point %s since it spans physical volumes"
-msgstr "A(z) \"%s\" csatolási ponthoz nem használható az LVM-es logikai kötet, mivel több fizikai köteten foglal helyet."
+msgid ""
+"You can not use the LVM Logical Volume for mount point %s since it spans "
+"physical volumes"
+msgstr ""
+"A(z) \"%s\" csatolási ponthoz nem használható az LVM-es logikai kötet, mivel "
+"több fizikai köteten foglal helyet."
 
 #: fsedit.pm:411
 #, c-format
 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"
+"The bootloader is not able to handle this when the volume spans physical "
+"volumes.\n"
 "You should create a /boot partition first"
 msgstr ""
 "Egy LVM-es logikai kötetet jelölt ki gyökér-fájlrendszerként (/).\n"
-"A rendszerbetöltő nem képes kezelni ezt abban az esetben, ha a logikai kötet\n"
+"A rendszerbetöltő nem képes kezelni ezt abban az esetben, ha a logikai "
+"kötet\n"
 "több fizikai köteten helyezkedik el.\n"
 "Először hozzon létre egy /boot partíciót."
 
-#: fsedit.pm:415
-#: fsedit.pm:417
+#: fsedit.pm:415 fsedit.pm:417
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "Ennek a könyvtárnak a gyökér-fájlrendszeren belül kell maradnia"
 
-#: fsedit.pm:419
-#: fsedit.pm:421
+#: fsedit.pm:419 fsedit.pm:421
 #, c-format
-msgid "You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount point\n"
-msgstr "Valódi fájlrendszert (Ext2, Ext3, ReiserFS, XFS vagy JFS) kell használni ennél a csatolási pontnál\n"
+msgid ""
+"You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
+"point\n"
+msgstr ""
+"Valódi fájlrendszert (Ext2, Ext3, ReiserFS, XFS vagy JFS) kell használni "
+"ennél a csatolási pontnál\n"
 
 #: fsedit.pm:423
 #, c-format
@@ -3144,8 +3149,12 @@ msgstr "Nincs alternatív meghajtó"
 # a 2. %s egy drivert jelöl
 #: harddrake/sound.pm:378
 #, c-format
-msgid "There's no known OSS/ALSA alternative driver for your sound card (%s) which currently uses \"%s\""
-msgstr "Nincs ismert OSS/ALSA alternatív meghajtó a hangkártyához (%s) - a kártya jelenleg ezt a meghajtót használja: \"%s\""
+msgid ""
+"There's no known OSS/ALSA alternative driver for your sound card (%s) which "
+"currently uses \"%s\""
+msgstr ""
+"Nincs ismert OSS/ALSA alternatív meghajtó a hangkártyához (%s) - a kártya "
+"jelenleg ezt a meghajtót használja: \"%s\""
 
 #: harddrake/sound.pm:385
 #, c-format
@@ -3154,10 +3163,14 @@ msgstr "Hangbeállítások"
 
 #: harddrake/sound.pm:387
 #, c-format
-msgid "Here you can select an alternative driver (either OSS or ALSA) for your sound card (%s)."
-msgstr "Itt kiválaszthat egy alternatív meghajtót (OSS vagy ALSA) a hangkártyához (%s)."
+msgid ""
+"Here you can select an alternative driver (either OSS or ALSA) for your "
+"sound card (%s)."
+msgstr ""
+"Itt kiválaszthat egy alternatív meghajtót (OSS vagy ALSA) a hangkártyához (%"
+"s)."
 
-#. -PO: here the first %s is either "OSS" or "ALSA",
+#. -PO: here the first %s is either "OSS" or "ALSA", 
 #. -PO: the second %s is the name of the current driver
 #. -PO: and the third %s is the name of the default driver
 #: harddrake/sound.pm:392
@@ -3165,40 +3178,50 @@ msgstr "Itt kiválaszthat egy alternatív meghajtót (OSS vagy ALSA) a hangkárt
 msgid ""
 "\n"
 "\n"
-"Your card currently use the %s\"%s\" driver (default driver for your card is \"%s\")"
+"Your card currently use the %s\"%s\" driver (default driver for your card is "
+"\"%s\")"
 msgstr ""
 "\n"
 "\n"
-"A hangkártya jelenleg a(z) %s\"%s\" meghajtót használja (a kártya alapértelmezett meghajtója: \"%s\")"
+"A hangkártya jelenleg a(z) %s\"%s\" meghajtót használja (a kártya "
+"alapértelmezett meghajtója: \"%s\")"
 
 #: harddrake/sound.pm:394
 #, 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(tm) 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"
+"ALSA (Advanced Linux Sound Architecture) is a modularized architecture "
+"which\n"
 "supports quite a large range of ISA, USB and PCI cards.\n"
 "\n"
 "It also provides a much higher API than OSS.\n"
 "\n"
 "To use alsa, one can either use:\n"
 "- the old compatibility OSS api\n"
-"- the new ALSA api that provides many enhanced features but requires using the ALSA library.\n"
+"- the new ALSA api that provides many enhanced features but requires using "
+"the ALSA library.\n"
 msgstr ""
-"Az OSS (Open Sound System) volt az első hang függvénykönyvtár. Operációsrendszer-független (elérhető a legtöbb UNIX-rendszeren), viszont a képességei korlátozottak.\n"
-"Hátránya az OSS-nek, hogy az ahhoz készült meghajtókban feleslegesen meg kell valósítani olyan funkciókat is, amelyek máshol már léteznek.\n"
+"Az OSS (Open Sound System) volt az első hang függvénykönyvtár. "
+"Operációsrendszer-független (elérhető a legtöbb UNIX-rendszeren), viszont a "
+"képességei korlátozottak.\n"
+"Hátránya az OSS-nek, hogy az ahhoz készült meghajtókban feleslegesen meg "
+"kell valósítani olyan funkciókat is, amelyek máshol már léteznek.\n"
 "\n"
-"Az ALSA (Advanced Linux Sound Architecture) egy modularizált architektúra, amely nagyszámú ISA-, USB- és PCI-hangkártyát támogat.\n"
+"Az ALSA (Advanced Linux Sound Architecture) egy modularizált architektúra, "
+"amely nagyszámú ISA-, USB- és PCI-hangkártyát támogat.\n"
 "\n"
 "Az ALSA fejlettebb függvénykönyvtárt biztosít, mint az OSS.\n"
 "\n"
 "Az ALSA kétféleképpen használható:\n"
 " - OSS-kompatibilis üzemmódot biztosító hívásokkal;\n"
-" - ALSA-hívásokkal, amelyek fejlettebb funkciókat valósítanak meg, de ehhez szükség van az ALSA-könyvtár használatára.\n"
+" - ALSA-hívásokkal, amelyek fejlettebb funkciókat valósítanak meg, de ehhez "
+"szükség van az ALSA-könyvtár használatára.\n"
 
-#: harddrake/sound.pm:408
-#: harddrake/sound.pm:491
+#: harddrake/sound.pm:408 harddrake/sound.pm:491
 #, c-format
 msgid "Driver:"
 msgstr "Meghajtó:"
@@ -3226,8 +3249,12 @@ msgstr "Nincs nyílt forrású meghajtó"
 # a 2. %s egy drivert jelöl
 #: harddrake/sound.pm:431
 #, c-format
-msgid "There's no free driver for your sound card (%s), but there's a proprietary driver at \"%s\"."
-msgstr "Nincs szabadon használható meghajtó a hangkártyához (%s), viszont létezik kötött licencelésű meghajtó: \"%s\"."
+msgid ""
+"There's no free driver for your sound card (%s), but there's a proprietary "
+"driver at \"%s\"."
+msgstr ""
+"Nincs szabadon használható meghajtó a hangkártyához (%s), viszont létezik "
+"kötött licencelésű meghajtó: \"%s\"."
 
 #: harddrake/sound.pm:434
 #, c-format
@@ -3251,7 +3278,8 @@ msgid ""
 "The classic bug sound tester is to run the following commands:\n"
 "\n"
 "\n"
-"- \"lspcidrake -v | fgrep -i AUDIO\" will tell you which driver your card uses\n"
+"- \"lspcidrake -v | fgrep -i AUDIO\" will tell you which driver your card "
+"uses\n"
 "by default\n"
 "\n"
 "- \"grep sound-slot /etc/modprobe.conf\" will tell you what driver it\n"
@@ -3274,7 +3302,8 @@ msgstr ""
 "- \"lspcidrake -v | fgrep -i AUDIO\": kiírja, melyik meghajtót használja\n"
 "alapértelmezésben a hangkártya\n"
 "\n"
-"- \"grep sound-slot /etc/modprobe.conf\": kiírja, milyen meghajtó használata\n"
+"- \"grep sound-slot /etc/modprobe.conf\": kiírja, milyen meghajtó "
+"használata\n"
 "van jelenleg beállítva\n"
 "\n"
 "- \"/sbin/lsmod\": ezzel ellenőrizhető, hogy be van-e töltve a megfelelő\n"
@@ -3303,7 +3332,8 @@ msgstr "Tetszőleges meghajtó kiválasztása"
 #: harddrake/sound.pm:486
 #, c-format
 msgid ""
-"If you really think that you know which driver is the right one for your card\n"
+"If you really think that you know which driver is the right one for your "
+"card\n"
 "you can pick one in the above list.\n"
 "\n"
 "The current driver for your \"%s\" sound card is \"%s\" "
@@ -3318,9 +3348,7 @@ msgstr ""
 msgid "Auto-detect"
 msgstr "Automatikus azonosítás"
 
-#: harddrake/v4l.pm:97
-#: harddrake/v4l.pm:285
-#: harddrake/v4l.pm:337
+#: harddrake/v4l.pm:97 harddrake/v4l.pm:285 harddrake/v4l.pm:337
 #, c-format
 msgid "Unknown|Generic"
 msgstr "Ismeretlen|Általános"
@@ -3338,11 +3366,16 @@ msgstr "Ismeretlen|CPH06X (bt878) [több gyártó]"
 #: 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"
-"If your card is misdetected, you can force the right tuner and card types here. Just select your tv card parameters if needed."
+"For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-"
+"detect the rights parameters.\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 ""
-"A legtöbb modern tévékártya esetén a Linux kernel bttv modulja automatikusan meghatározza a megfelelő paramétereket.\n"
-"Ha az Ön kártyáját a rendszer helytelenül határozta meg, akkor itt beállítható a megfelelő tuner- és kártyatípus. Ha szükséges, adja meg a tévékártya-paramétereket."
+"A legtöbb modern tévékártya esetén a Linux kernel bttv modulja automatikusan "
+"meghatározza a megfelelő paramétereket.\n"
+"Ha az Ön kártyáját a rendszer helytelenül határozta meg, akkor itt "
+"beállítható a megfelelő tuner- és kártyatípus. Ha szükséges, adja meg a "
+"tévékártya-paramétereket."
 
 #: harddrake/v4l.pm:478
 #, c-format
@@ -3354,34 +3387,20 @@ msgstr "Kártyatípus:"
 msgid "Tuner type:"
 msgstr "Tuner típus:"
 
-#: interactive.pm:128
-#: interactive.pm:545
-#: interactive/curses.pm:263
-#: interactive/http.pm:103
-#: interactive/http.pm:156
-#: interactive/stdio.pm:39
-#: interactive/stdio.pm:148
-#: interactive/stdio.pm:149
-#: ugtk2.pm:421
-#: ugtk2.pm:519
-#: ugtk2.pm:813
-#: ugtk2.pm:836
+#: interactive.pm:128 interactive.pm:545 interactive/curses.pm:263
+#: interactive/http.pm:103 interactive/http.pm:156 interactive/stdio.pm:39
+#: interactive/stdio.pm:148 interactive/stdio.pm:149 ugtk2.pm:421 ugtk2.pm:519
+#: ugtk2.pm:813 ugtk2.pm:836
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: interactive.pm:227
-#: modules/interactive.pm:71
-#: ugtk2.pm:812
-#: wizards.pm:156
+#: interactive.pm:227 modules/interactive.pm:71 ugtk2.pm:812 wizards.pm:156
 #, c-format
 msgid "Yes"
 msgstr "Igen"
 
-#: interactive.pm:227
-#: modules/interactive.pm:71
-#: ugtk2.pm:812
-#: wizards.pm:156
+#: interactive.pm:227 modules/interactive.pm:71 ugtk2.pm:812 wizards.pm:156
 #, c-format
 msgid "No"
 msgstr "Nem"
@@ -3391,34 +3410,27 @@ msgstr "Nem"
 msgid "Choose a file"
 msgstr "Válasszon egy fájlt"
 
-#: interactive.pm:386
-#: interactive/gtk.pm:436
+#: interactive.pm:386 interactive/gtk.pm:436
 #, c-format
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: interactive.pm:386
-#: interactive/gtk.pm:436
+#: interactive.pm:386 interactive/gtk.pm:436
 #, c-format
 msgid "Modify"
 msgstr "Módosítás"
 
-#: interactive.pm:386
-#: interactive/gtk.pm:436
+#: interactive.pm:386 interactive/gtk.pm:436
 #, c-format
 msgid "Remove"
 msgstr "Eltávolítás"
 
-#: interactive.pm:545
-#: interactive/curses.pm:263
-#: ugtk2.pm:519
+#: interactive.pm:545 interactive/curses.pm:263 ugtk2.pm:519
 #, c-format
 msgid "Finish"
 msgstr "Befejezés"
 
-#: interactive.pm:546
-#: interactive/curses.pm:260
-#: ugtk2.pm:517
+#: interactive.pm:546 interactive/curses.pm:260 ugtk2.pm:517
 #, c-format
 msgid "Previous"
 msgstr "Előző"
@@ -3428,14 +3440,12 @@ msgstr "Előző"
 msgid "Beware, Caps Lock is enabled"
 msgstr "Figyelmeztetés: a Caps Lock be van kapcsolva"
 
-#: interactive/stdio.pm:29
-#: interactive/stdio.pm:154
+#: interactive/stdio.pm:29 interactive/stdio.pm:154
 #, c-format
 msgid "Bad choice, try again\n"
 msgstr "Nem megfelelő választás, próbálja meg újra\n"
 
-#: interactive/stdio.pm:30
-#: interactive/stdio.pm:155
+#: interactive/stdio.pm:30 interactive/stdio.pm:155
 #, c-format
 msgid "Your choice? (default %s) "
 msgstr "Melyiket választja? (az alapértelmezés: %s) "
@@ -3519,8 +3529,7 @@ msgstr "default:LTR"
 msgid "Andorra"
 msgstr "Andorra"
 
-#: lang.pm:211
-#: timezone.pm:226
+#: lang.pm:211 timezone.pm:226
 #, c-format
 msgid "United Arab Emirates"
 msgstr "Egyesült Arab Emirátusok"
@@ -3565,8 +3574,7 @@ msgstr "Angola"
 msgid "Antarctica"
 msgstr "Antarktisz"
 
-#: lang.pm:220
-#: timezone.pm:271
+#: lang.pm:220 timezone.pm:271
 #, c-format
 msgid "Argentina"
 msgstr "Argentína"
@@ -3576,16 +3584,12 @@ msgstr "Argentína"
 msgid "American Samoa"
 msgstr "Amerikai Szamoa"
 
-#: lang.pm:222
-#: mirror.pm:12
-#: timezone.pm:229
+#: lang.pm:222 mirror.pm:12 timezone.pm:229
 #, c-format
 msgid "Austria"
 msgstr "Ausztria"
 
-#: lang.pm:223
-#: mirror.pm:11
-#: timezone.pm:267
+#: lang.pm:223 mirror.pm:11 timezone.pm:267
 #, c-format
 msgid "Australia"
 msgstr "Ausztrália"
@@ -3610,15 +3614,12 @@ msgstr "Bosznia és Hercegovina"
 msgid "Barbados"
 msgstr "Barbados"
 
-#: lang.pm:228
-#: timezone.pm:211
+#: lang.pm:228 timezone.pm:211
 #, c-format
 msgid "Bangladesh"
 msgstr "Banglades"
 
-#: lang.pm:229
-#: mirror.pm:13
-#: timezone.pm:231
+#: lang.pm:229 mirror.pm:13 timezone.pm:231
 #, c-format
 msgid "Belgium"
 msgstr "Belgium"
@@ -3628,8 +3629,7 @@ msgstr "Belgium"
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: lang.pm:231
-#: timezone.pm:232
+#: lang.pm:231 timezone.pm:232
 #, c-format
 msgid "Bulgaria"
 msgstr "Bulgária"
@@ -3664,9 +3664,7 @@ msgstr "Brunei Darussalam"
 msgid "Bolivia"
 msgstr "Bolívia"
 
-#: lang.pm:238
-#: mirror.pm:14
-#: timezone.pm:272
+#: lang.pm:238 mirror.pm:14 timezone.pm:272
 #, c-format
 msgid "Brazil"
 msgstr "Brazília"
@@ -3691,8 +3689,7 @@ msgstr "Bouvet-sziget"
 msgid "Botswana"
 msgstr "Botswana"
 
-#: lang.pm:243
-#: timezone.pm:230
+#: lang.pm:243 timezone.pm:230
 #, c-format
 msgid "Belarus"
 msgstr "Fehéroroszország"
@@ -3702,9 +3699,7 @@ msgstr "Fehéroroszország"
 msgid "Belize"
 msgstr "Belize"
 
-#: lang.pm:245
-#: mirror.pm:15
-#: timezone.pm:261
+#: lang.pm:245 mirror.pm:15 timezone.pm:261
 #, c-format
 msgid "Canada"
 msgstr "Kanada"
@@ -3729,9 +3724,7 @@ msgstr "Közép-Afrikai Köztársaság"
 msgid "Congo (Brazzaville)"
 msgstr "Kongó (Brazzaville)"
 
-#: lang.pm:250
-#: mirror.pm:39
-#: timezone.pm:255
+#: lang.pm:250 mirror.pm:39 timezone.pm:255
 #, c-format
 msgid "Switzerland"
 msgstr "Svájc"
@@ -3746,8 +3739,7 @@ msgstr "Elefántcsontpart"
 msgid "Cook Islands"
 msgstr "Cook-szigetek"
 
-#: lang.pm:253
-#: timezone.pm:273
+#: lang.pm:253 timezone.pm:273
 #, c-format
 msgid "Chile"
 msgstr "Chile"
@@ -3757,8 +3749,7 @@ msgstr "Chile"
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: lang.pm:255
-#: timezone.pm:212
+#: lang.pm:255 timezone.pm:212
 #, c-format
 msgid "China"
 msgstr "Kína"
@@ -3768,8 +3759,7 @@ msgstr "Kína"
 msgid "Colombia"
 msgstr "Kolumbia"
 
-#: lang.pm:257
-#: mirror.pm:16
+#: lang.pm:257 mirror.pm:16
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
@@ -3799,16 +3789,12 @@ msgstr "Karácsony-sziget"
 msgid "Cyprus"
 msgstr "Ciprus"
 
-#: lang.pm:263
-#: mirror.pm:17
-#: timezone.pm:233
+#: lang.pm:263 mirror.pm:17 timezone.pm:233
 #, c-format
 msgid "Czech Republic"
 msgstr "Cseh Köztársaság"
 
-#: lang.pm:264
-#: mirror.pm:22
-#: timezone.pm:238
+#: lang.pm:264 mirror.pm:22 timezone.pm:238
 #, c-format
 msgid "Germany"
 msgstr "Németország"
@@ -3818,9 +3804,7 @@ msgstr "Németország"
 msgid "Djibouti"
 msgstr "Dzsibuti"
 
-#: lang.pm:266
-#: mirror.pm:18
-#: timezone.pm:234
+#: lang.pm:266 mirror.pm:18 timezone.pm:234
 #, c-format
 msgid "Denmark"
 msgstr "Dánia"
@@ -3845,9 +3829,7 @@ msgstr "Algéria"
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: lang.pm:271
-#: mirror.pm:19
-#: timezone.pm:235
+#: lang.pm:271 mirror.pm:19 timezone.pm:235
 #, c-format
 msgid "Estonia"
 msgstr "Észtország"
@@ -3867,9 +3849,7 @@ msgstr "Nyugat-Szahara"
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: lang.pm:275
-#: mirror.pm:37
-#: timezone.pm:253
+#: lang.pm:275 mirror.pm:37 timezone.pm:253
 #, c-format
 msgid "Spain"
 msgstr "Spanyolország"
@@ -3879,9 +3859,7 @@ msgstr "Spanyolország"
 msgid "Ethiopia"
 msgstr "Etiópia"
 
-#: lang.pm:277
-#: mirror.pm:20
-#: timezone.pm:236
+#: lang.pm:277 mirror.pm:20 timezone.pm:236
 #, c-format
 msgid "Finland"
 msgstr "Finnország"
@@ -3906,9 +3884,7 @@ msgstr "Mikronézia"
 msgid "Faroe Islands"
 msgstr "Feröer-szigetek"
 
-#: lang.pm:282
-#: mirror.pm:21
-#: timezone.pm:237
+#: lang.pm:282 mirror.pm:21 timezone.pm:237
 #, c-format
 msgid "France"
 msgstr "Franciaország"
@@ -3918,8 +3894,7 @@ msgstr "Franciaország"
 msgid "Gabon"
 msgstr "Gabon"
 
-#: lang.pm:284
-#: timezone.pm:257
+#: lang.pm:284 timezone.pm:257
 #, c-format
 msgid "United Kingdom"
 msgstr "Egyesült Királyság"
@@ -3974,9 +3949,7 @@ msgstr "Guadeloupe"
 msgid "Equatorial Guinea"
 msgstr "Egyenlítői Guinea"
 
-#: lang.pm:295
-#: mirror.pm:23
-#: timezone.pm:239
+#: lang.pm:295 mirror.pm:23 timezone.pm:239
 #, c-format
 msgid "Greece"
 msgstr "Görögország"
@@ -3986,8 +3959,7 @@ msgstr "Görögország"
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "Dél-Georgia és a Dél-Sandwich-szigetek"
 
-#: lang.pm:297
-#: timezone.pm:262
+#: lang.pm:297 timezone.pm:262
 #, c-format
 msgid "Guatemala"
 msgstr "Guatemala"
@@ -4032,35 +4004,27 @@ msgstr "Horvátország"
 msgid "Haiti"
 msgstr "Haiti"
 
-#: lang.pm:306
-#: mirror.pm:24
-#: timezone.pm:240
+#: lang.pm:306 mirror.pm:24 timezone.pm:240
 #, c-format
 msgid "Hungary"
 msgstr "Magyarország"
 
-#: lang.pm:307
-#: timezone.pm:215
+#: lang.pm:307 timezone.pm:215
 #, c-format
 msgid "Indonesia"
 msgstr "Indonézia"
 
-#: lang.pm:308
-#: mirror.pm:25
-#: timezone.pm:241
+#: lang.pm:308 mirror.pm:25 timezone.pm:241
 #, c-format
 msgid "Ireland"
 msgstr "Írország"
 
-#: lang.pm:309
-#: mirror.pm:26
-#: timezone.pm:217
+#: lang.pm:309 mirror.pm:26 timezone.pm:217
 #, c-format
 msgid "Israel"
 msgstr "Izrael"
 
-#: lang.pm:310
-#: timezone.pm:214
+#: lang.pm:310 timezone.pm:214
 #, c-format
 msgid "India"
 msgstr "India"
@@ -4075,8 +4039,7 @@ msgstr "Brit indiai-óceáni terület"
 msgid "Iraq"
 msgstr "Irak"
 
-#: lang.pm:313
-#: timezone.pm:216
+#: lang.pm:313 timezone.pm:216
 #, c-format
 msgid "Iran"
 msgstr "Irán"
@@ -4086,9 +4049,7 @@ msgstr "Irán"
 msgid "Iceland"
 msgstr "Izland"
 
-#: lang.pm:315
-#: mirror.pm:27
-#: timezone.pm:242
+#: lang.pm:315 mirror.pm:27 timezone.pm:242
 #, c-format
 msgid "Italy"
 msgstr "Olaszország"
@@ -4103,9 +4064,7 @@ msgstr "Jamaica"
 msgid "Jordan"
 msgstr "Jordánia"
 
-#: lang.pm:318
-#: mirror.pm:28
-#: timezone.pm:218
+#: lang.pm:318 mirror.pm:28 timezone.pm:218
 #, c-format
 msgid "Japan"
 msgstr "Japán"
@@ -4145,8 +4104,7 @@ msgstr "Saint Kitts és Nevis"
 msgid "Korea (North)"
 msgstr "Korea (Észak)"
 
-#: lang.pm:326
-#: timezone.pm:219
+#: lang.pm:326 timezone.pm:219
 #, c-format
 msgid "Korea"
 msgstr "Korea"
@@ -4201,14 +4159,12 @@ msgstr "Libéria"
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: lang.pm:337
-#: timezone.pm:243
+#: lang.pm:337 timezone.pm:243
 #, c-format
 msgid "Lithuania"
 msgstr "Litvánia"
 
-#: lang.pm:338
-#: timezone.pm:244
+#: lang.pm:338 timezone.pm:244
 #, c-format
 msgid "Luxembourg"
 msgstr "Luxemburg"
@@ -4308,14 +4264,12 @@ msgstr "Maldív-szigetek"
 msgid "Malawi"
 msgstr "Malawi"
 
-#: lang.pm:358
-#: timezone.pm:263
+#: lang.pm:358 timezone.pm:263
 #, c-format
 msgid "Mexico"
 msgstr "Mexikó"
 
-#: lang.pm:359
-#: timezone.pm:220
+#: lang.pm:359 timezone.pm:220
 #, c-format
 msgid "Malaysia"
 msgstr "Malajzia"
@@ -4355,16 +4309,12 @@ msgstr "Nigéria"
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: lang.pm:367
-#: mirror.pm:29
-#: timezone.pm:245
+#: lang.pm:367 mirror.pm:29 timezone.pm:245
 #, c-format
 msgid "Netherlands"
 msgstr "Hollandia"
 
-#: lang.pm:368
-#: mirror.pm:31
-#: timezone.pm:246
+#: lang.pm:368 mirror.pm:31 timezone.pm:246
 #, c-format
 msgid "Norway"
 msgstr "Norvégia"
@@ -4384,9 +4334,7 @@ msgstr "Nauru"
 msgid "Niue"
 msgstr "Niue"
 
-#: lang.pm:372
-#: mirror.pm:30
-#: timezone.pm:268
+#: lang.pm:372 mirror.pm:30 timezone.pm:268
 #, c-format
 msgid "New Zealand"
 msgstr "Új-Zéland"
@@ -4416,8 +4364,7 @@ msgstr "Francia Polinézia"
 msgid "Papua New Guinea"
 msgstr "Pápua Új-Guinea"
 
-#: lang.pm:378
-#: timezone.pm:221
+#: lang.pm:378 timezone.pm:221
 #, c-format
 msgid "Philippines"
 msgstr "Fülöp-szigetek"
@@ -4427,9 +4374,7 @@ msgstr "Fülöp-szigetek"
 msgid "Pakistan"
 msgstr "Pakisztán"
 
-#: lang.pm:380
-#: mirror.pm:32
-#: timezone.pm:247
+#: lang.pm:380 mirror.pm:32 timezone.pm:247
 #, c-format
 msgid "Poland"
 msgstr "Lengyelország"
@@ -4454,9 +4399,7 @@ msgstr "Puerto Rico"
 msgid "Palestine"
 msgstr "Palesztina"
 
-#: lang.pm:385
-#: mirror.pm:33
-#: timezone.pm:248
+#: lang.pm:385 mirror.pm:33 timezone.pm:248
 #, c-format
 msgid "Portugal"
 msgstr "Portugália"
@@ -4481,14 +4424,12 @@ msgstr "Qatar"
 msgid "Reunion"
 msgstr "Réunion"
 
-#: lang.pm:390
-#: timezone.pm:249
+#: lang.pm:390 timezone.pm:249
 #, c-format
 msgid "Romania"
 msgstr "Románia"
 
-#: lang.pm:391
-#: mirror.pm:34
+#: lang.pm:391 mirror.pm:34
 #, c-format
 msgid "Russia"
 msgstr "Oroszország"
@@ -4518,15 +4459,12 @@ msgstr "Seychelles"
 msgid "Sudan"
 msgstr "Szudán"
 
-#: lang.pm:397
-#: mirror.pm:38
-#: timezone.pm:254
+#: lang.pm:397 mirror.pm:38 timezone.pm:254
 #, c-format
 msgid "Sweden"
 msgstr "Svédország"
 
-#: lang.pm:398
-#: timezone.pm:222
+#: lang.pm:398 timezone.pm:222
 #, c-format
 msgid "Singapore"
 msgstr "Szingapúr"
@@ -4536,8 +4474,7 @@ msgstr "Szingapúr"
 msgid "Saint Helena"
 msgstr "Saint Helena"
 
-#: lang.pm:400
-#: timezone.pm:252
+#: lang.pm:400 timezone.pm:252
 #, c-format
 msgid "Slovenia"
 msgstr "Szlovénia"
@@ -4547,9 +4484,7 @@ msgstr "Szlovénia"
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "Svalbard és Jan Mayen-szigetek"
 
-#: lang.pm:402
-#: mirror.pm:35
-#: timezone.pm:251
+#: lang.pm:402 mirror.pm:35 timezone.pm:251
 #, c-format
 msgid "Slovakia"
 msgstr "Szlovákia"
@@ -4620,9 +4555,7 @@ msgstr "Déli francia területek"
 msgid "Togo"
 msgstr "Togo"
 
-#: lang.pm:416
-#: mirror.pm:41
-#: timezone.pm:224
+#: lang.pm:416 mirror.pm:41 timezone.pm:224
 #, c-format
 msgid "Thailand"
 msgstr "Thaiföld"
@@ -4657,8 +4590,7 @@ msgstr "Tunézia"
 msgid "Tonga"
 msgstr "Tonga"
 
-#: lang.pm:423
-#: timezone.pm:225
+#: lang.pm:423 timezone.pm:225
 #, c-format
 msgid "Turkey"
 msgstr "Törökország"
@@ -4673,21 +4605,17 @@ msgstr "Trinidad és Tobago"
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: lang.pm:426
-#: mirror.pm:40
-#: timezone.pm:223
+#: lang.pm:426 mirror.pm:40 timezone.pm:223
 #, c-format
 msgid "Taiwan"
 msgstr "Tajvan"
 
-#: lang.pm:427
-#: timezone.pm:208
+#: lang.pm:427 timezone.pm:208
 #, c-format
 msgid "Tanzania"
 msgstr "Tanzánia"
 
-#: lang.pm:428
-#: timezone.pm:256
+#: lang.pm:428 timezone.pm:256
 #, c-format
 msgid "Ukraine"
 msgstr "Ukrajna"
@@ -4702,9 +4630,7 @@ msgstr "Uganda"
 msgid "United States Minor Outlying Islands"
 msgstr "Amerikai Egyesült Államok - kisebb külső szigetek"
 
-#: lang.pm:431
-#: mirror.pm:42
-#: timezone.pm:264
+#: lang.pm:431 mirror.pm:42 timezone.pm:264
 #, c-format
 msgid "United States"
 msgstr "Amerikai Egyesült Államok"
@@ -4774,9 +4700,7 @@ msgstr "Jemen"
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: lang.pm:445
-#: mirror.pm:36
-#: timezone.pm:207
+#: lang.pm:445 mirror.pm:36 timezone.pm:207
 #, c-format
 msgid "South Africa"
 msgstr "Dél-Afrika"
@@ -4799,7 +4723,9 @@ msgstr "Üdvözöljük - %s"
 #: lvm.pm:84
 #, c-format
 msgid "Moving used physical extents to other physical volumes failed"
-msgstr "Nem sikerült áthelyezni a használatban levő fizikai kiterjedéseket más fizikai kötetekre"
+msgstr ""
+"Nem sikerült áthelyezni a használatban levő fizikai kiterjedéseket más "
+"fizikai kötetekre"
 
 #: lvm.pm:141
 #, c-format
@@ -4814,254 +4740,392 @@ msgstr "Először törölje az összes logikai kötetet\n"
 #: lvm.pm:184
 #, c-format
 msgid "The bootloader can't handle /boot on multiple physical volumes"
-msgstr "A rendszerbetöltő nem képes olyan /boot fájlrendszert kezelni, amely több fizikai köteten helyezkedik el"
+msgstr ""
+"A rendszerbetöltő nem képes olyan /boot fájlrendszert kezelni, amely több "
+"fizikai köteten helyezkedik el"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Mandriva Linux distribution \n"
-"shall be called the \"Software Products\" hereafter. The Software Products include, but are not \n"
-"restricted to, the set of programs, methods, rules and documentation related to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
+"shall be called the \"Software Products\" hereafter. The Software Products "
+"include, but are not \n"
+"restricted to, the set of programs, methods, rules and documentation related "
+"to the operating \n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
-"Please read this document carefully. This document is a license agreement between you and  \n"
+"Please read this document carefully. This document is a license agreement "
+"between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you explicitly \n"
-"accept and fully agree to conform to the terms and conditions of this License. \n"
-"If you disagree with any portion of the License, you are not allowed to install, duplicate or use \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
+"accept and fully agree to conform to the terms and conditions of this "
+"License. \n"
+"If you disagree with any portion of the License, you are not allowed to "
+"install, duplicate or use \n"
 "the Software Products. \n"
-"Any attempt to install, duplicate or use the Software Products in a manner which does not comply \n"
-"with the terms and conditions of this License is void and will terminate your rights under this \n"
-"License. Upon termination of the License,  you must immediately destroy all copies of the \n"
+"Any attempt to install, duplicate or use the Software Products in a manner "
+"which does not comply \n"
+"with the terms and conditions of this License is void and will terminate "
+"your rights under this \n"
+"License. Upon termination of the License,  you must immediately destroy all "
+"copies of the \n"
 "Software Products.\n"
 "\n"
 "\n"
 "2. Limited Warranty\n"
 "\n"
-"The Software Products and attached documentation are provided \"as is\", with no warranty, to the \n"
+"The Software Products and attached documentation are provided \"as is\", "
+"with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or occurrence of such \n"
-"damages.\n"
-"\n"
-"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME COUNTRIES\n"
-"\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever (including without \n"
-"limitation damages for loss of business, interruption of business, financial loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential loss) arising out \n"
-"of the possession and use of software components or arising out of  downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some countries by local laws.\n"
-"This limited liability applies to, but is not restricted to, the strong cryptography components \n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
+"\n"
+"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
+"COUNTRIES\n"
+"\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
+"This limited liability applies to, but is not restricted to, the strong "
+"cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
-"The Software Products consist of components created by different persons or entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please read carefully the terms \n"
-"and conditions of the license agreement for each component before using any component. Any question \n"
-"on a component license should be addressed to the component author and not to Mandriva.\n"
-"The programs developed by Mandriva S.A. are governed by the GPL License. Documentation written \n"
-"by Mandriva S.A. is governed by a specific license. Please refer to the documentation for \n"
+"The Software Products consist of components created by different persons or "
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
+"Documentation written \n"
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
+"documentation for \n"
 "further details.\n"
 "\n"
 "\n"
 "4. Intellectual Property Rights\n"
 "\n"
-"All rights to the components of the Software Products belong to their respective authors and are \n"
-"protected by intellectual property and copyright laws applicable to software programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, as a whole or in \n"
-"parts, by all means and for all purposes.\n"
-"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of Mandriva S.A.  \n"
+"All rights to the components of the Software Products belong to their "
+"respective authors and are \n"
+"protected by intellectual property and copyright laws applicable to software "
+"programs.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
 "\n"
-"If any portion of this agreement is held void, illegal or inapplicable by a court judgment, this \n"
-"portion is excluded from this contract. You remain bound by the other applicable sections of the \n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
 "agreement.\n"
-"The terms and conditions of this License are governed by the Laws of France.\n"
-"All disputes on the terms of this license will preferably be settled out of court. As a last \n"
-"resort, the dispute will be referred to the appropriate Courts of Law of Paris - France.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
 "For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Bevezetés\n"
 "\n"
-"A továbbiakban az operációs rendszerre és a Mandriva Linux disztribúcióban elérhető\n"
-"különféle komponensekre \"Szoftvertermékek\" néven hivatkozunk. A Szoftvertermékek körébe - nem\n"
-"kizárólagosan - beletartoznak az operációs rendszerhez és a Mandriva Linux disztribúció\n"
-"különféle komponenseihez kapcsolódó programok, módszerek, szabályok és dokumentáció.\n"
+"A továbbiakban az operációs rendszerre és a Mandriva Linux disztribúcióban "
+"elérhető\n"
+"különféle komponensekre \"Szoftvertermékek\" néven hivatkozunk. A "
+"Szoftvertermékek körébe - nem\n"
+"kizárólagosan - beletartoznak az operációs rendszerhez és a Mandriva Linux "
+"disztribúció\n"
+"különféle komponenseihez kapcsolódó programok, módszerek, szabályok és "
+"dokumentáció.\n"
 "\n"
 "\n"
 "1. Licencegyezmény\n"
 "\n"
-"Kérjük, olvassa el jelen dokumentumot figyelmesen. Ezen dokumentum egy, a Szoftvertermékekre\n"
+"Kérjük, olvassa el jelen dokumentumot figyelmesen. Ezen dokumentum egy, a "
+"Szoftvertermékekre\n"
 "vonatkozó licencegyezmény Ön és a Mandriva S.A. között.\n"
-"Ha a Szoftvertermékeket bármiféle módon telepíti, sokszorosítja vagy felhasználja,\n"
-"azzal Ön elfogadja jelen licenc kikötéseit és feltételeit, továbbá beleegyezik abba, hogy\n"
+"Ha a Szoftvertermékeket bármiféle módon telepíti, sokszorosítja vagy "
+"felhasználja,\n"
+"azzal Ön elfogadja jelen licenc kikötéseit és feltételeit, továbbá "
+"beleegyezik abba, hogy\n"
 "azoknak teljes mértékben megfelel.\n"
-"Ha Ön a Licenc bármely részével nem ért egyet, akkor az Ön számára nem engedélyezett a\n"
+"Ha Ön a Licenc bármely részével nem ért egyet, akkor az Ön számára nem "
+"engedélyezett a\n"
 "Szoftvertermékek telepítése, sokszorosítása illetve felhasználása.\n"
-"Bármely olyan kísérlet, amely a Szoftvertermékeknek a jelen licenc kikötéseitől és feltételeitől\n"
-"eltérően való telepítésére, sokszorosítására illetve felhasználására irányul, érvénytelenítő\n"
-"jellegű, és megvonja az Önnek ezen licenc által adott jogokat. A licencjogok megszűnését\n"
-"követően Önnek azonnali hatállyal meg kell semmisítenie a Szoftvertermékek összes, Ön által\n"
+"Bármely olyan kísérlet, amely a Szoftvertermékeknek a jelen licenc "
+"kikötéseitől és feltételeitől\n"
+"eltérően való telepítésére, sokszorosítására illetve felhasználására "
+"irányul, érvénytelenítő\n"
+"jellegű, és megvonja az Önnek ezen licenc által adott jogokat. A licencjogok "
+"megszűnését\n"
+"követően Önnek azonnali hatállyal meg kell semmisítenie a Szoftvertermékek "
+"összes, Ön által\n"
 "birtokolt példányát.\n"
 "\n"
 "\n"
 "2. Korlátozott garancia\n"
 "\n"
-"A Szoftvertermékek és az azokhoz tartozó dokumentáció \"olyan amilyen\" állapotban állnak\n"
-"rendelkezésre. Garancia nincsen azokra - a törvények által engedélyezett mértékben.\n"
-"A Mandriva S.A. - a törvények által engedélyezett mértékben - semmilyen körülmények\n"
-"között sem vonható felelősségre a Szoftvertermékek használatából vagy használhatatlanságából\n"
-"származó speciális, előre nem látott, közvetlen vagy közvetett károkért (korlátozás nélkül\n"
-"beleértve a következőket: üzleti veszteség, üzleti tevékenység megszakadása, pénzügyi\n"
-"veszteség, jogi díjak illetve bírósági ítéletből származó büntetés, vagy bármilyen\n"
-"származékos veszteség); még abban az esetben sem, ha a Mandriva S.A. tájékoztatva lett\n"
+"A Szoftvertermékek és az azokhoz tartozó dokumentáció \"olyan amilyen\" "
+"állapotban állnak\n"
+"rendelkezésre. Garancia nincsen azokra - a törvények által engedélyezett "
+"mértékben.\n"
+"A Mandriva S.A. - a törvények által engedélyezett mértékben - semmilyen "
+"körülmények\n"
+"között sem vonható felelősségre a Szoftvertermékek használatából vagy "
+"használhatatlanságából\n"
+"származó speciális, előre nem látott, közvetlen vagy közvetett károkért "
+"(korlátozás nélkül\n"
+"beleértve a következőket: üzleti veszteség, üzleti tevékenység megszakadása, "
+"pénzügyi\n"
+"veszteség, jogi díjak illetve bírósági ítéletből származó büntetés, vagy "
+"bármilyen\n"
+"származékos veszteség); még abban az esetben sem, ha a Mandriva S.A. "
+"tájékoztatva lett\n"
 "az ilyesféle károk bekövetkezésének lehetőségéről.\n"
 "\n"
-"KORLÁTOZOTT FELELŐSSÉG A BIZONYOS ORSZÁGOKBAN TILTOTT SZOFTVEREK BIRTOKLÁSÁVAL ILLETVE\n"
+"KORLÁTOZOTT FELELŐSSÉG A BIZONYOS ORSZÁGOKBAN TILTOTT SZOFTVEREK "
+"BIRTOKLÁSÁVAL ILLETVE\n"
 "HASZNÁLATÁVAL KAPCSOLATBAN\n"
 "\n"
-"A Mandriva S.A. és disztribútorai - a törvények által engedélyezett mértékben - semmilyen\n"
-"körülmények között sem vonhatók felelősségre az olyan - speciális, előre nem látott, közvetlen\n"
-"vagy közvetett - károkért (korlátozás nélkül beleértve a következőket: üzleti veszteség,\n"
-"üzleti tevékenység megszakadása, pénzügyi veszteség, jogi díjak illetve bírósági\n"
-"ítéletből származó büntetés, vagy bármilyen származékos veszteség), amely károk a\n"
-"szoftverkomponensek birtoklásából vagy használatából illetve a helyi törvények által\n"
-"tiltott vagy korlátozott szoftverkomponenseknek egy Mandriva Linux-címről való\n"
+"A Mandriva S.A. és disztribútorai - a törvények által engedélyezett "
+"mértékben - semmilyen\n"
+"körülmények között sem vonhatók felelősségre az olyan - speciális, előre nem "
+"látott, közvetlen\n"
+"vagy közvetett - károkért (korlátozás nélkül beleértve a következőket: "
+"üzleti veszteség,\n"
+"üzleti tevékenység megszakadása, pénzügyi veszteség, jogi díjak illetve "
+"bírósági\n"
+"ítéletből származó büntetés, vagy bármilyen származékos veszteség), amely "
+"károk a\n"
+"szoftverkomponensek birtoklásából vagy használatából illetve a helyi "
+"törvények által\n"
+"tiltott vagy korlátozott szoftverkomponenseknek egy Mandriva Linux-címről "
+"való\n"
 "letöltéséből származnak.\n"
-"Ezen korlátozott felelősség vonatkozik többek közt a Szoftvertermékekben levő titkosító\n"
+"Ezen korlátozott felelősség vonatkozik többek közt a Szoftvertermékekben "
+"levő titkosító\n"
 "komponensekre is.\n"
 "\n"
 "\n"
 "3. A GPL és az ahhoz kapcsolódó licencek\n"
 "\n"
-"A Szoftvertermékek különböző személyek és intézmények által készített komponensekből állnak.\n"
-"A legtöbb komponensre a GNU General Public Licence (GNU Általános Nyilvános Licenc; a\n"
+"A Szoftvertermékek különböző személyek és intézmények által készített "
+"komponensekből állnak.\n"
+"A legtöbb komponensre a GNU General Public Licence (GNU Általános Nyilvános "
+"Licenc; a\n"
 "továbbiakban: GPL) és hasonló licencek kikötései és feltételei vonatkoznak.\n"
-"Ezen licencek java része lehetővé teszi a megfelelő komponensek használatát, sokszorosítását,\n"
-"módosítását illetve terjesztését. Bármely komponens használata előtt olvassa el figyelmesen\n"
-"a komponensre vonatkozó licenc kikötéseit és feltételeit. Egy komponens licencére vonatkozó\n"
-"kérdést nem a Mandriva céghez, hanem az adott komponens szerzőjéhez kell irányítani.\n"
-"A Mandriva S.A. által fejlesztett programok a GPL licenc hatálya alá tartoznak.\n"
-"A Mandriva S.A. által írt dokumentációs anyagokra egy speciális licenc vonatkozik.\n"
+"Ezen licencek java része lehetővé teszi a megfelelő komponensek használatát, "
+"sokszorosítását,\n"
+"módosítását illetve terjesztését. Bármely komponens használata előtt olvassa "
+"el figyelmesen\n"
+"a komponensre vonatkozó licenc kikötéseit és feltételeit. Egy komponens "
+"licencére vonatkozó\n"
+"kérdést nem a Mandriva céghez, hanem az adott komponens szerzőjéhez kell "
+"irányítani.\n"
+"A Mandriva S.A. által fejlesztett programok a GPL licenc hatálya alá "
+"tartoznak.\n"
+"A Mandriva S.A. által írt dokumentációs anyagokra egy speciális licenc "
+"vonatkozik.\n"
 "További részletek a dokumentációban.\n"
 "\n"
 "\n"
 "4. Szellemi tulajdonra vonatkozó jogok\n"
 "\n"
-"A Szoftvertermékek komponenseire vonatkozó összes jog az adott komponensek szerzőit illeti meg,\n"
-"és a szoftverekre vonatkozó szellemi tulajdoni illetve szerzői jogi (copyright) törvények\n"
+"A Szoftvertermékek komponenseire vonatkozó összes jog az adott komponensek "
+"szerzőit illeti meg,\n"
+"és a szoftverekre vonatkozó szellemi tulajdoni illetve szerzői jogi "
+"(copyright) törvények\n"
 "védelme alatt áll.\n"
-"A Mandriva S.A. fenntartja a jogot arra, hogy módosítsa illetve átalakítsa a\n"
-"Szoftvertermékeket - teljes egészében vagy részben, bármilyen módon illetve bármilyen célra.\n"
-"A \"Mandriva\", a \"Mandriva Linux\" és az azokhoz tartozó logók a Mandriva S.A. védjegyei.\n"
+"A Mandriva S.A. fenntartja a jogot arra, hogy módosítsa illetve átalakítsa "
+"a\n"
+"Szoftvertermékeket - teljes egészében vagy részben, bármilyen módon illetve "
+"bármilyen célra.\n"
+"A \"Mandriva\", a \"Mandriva Linux\" és az azokhoz tartozó logók a Mandriva "
+"S.A. védjegyei.\n"
 "\n"
 "\n"
 "5. Vonatkozó törvények\n"
 "\n"
-"Ha jelen egyezmény bármely része bírósági ítélet alapján semmisnek, törvénytelennek vagy\n"
-"alkalmazhatatlannak van nyilvánítva, akkor azon rész jelen szerződésből kizárásra kerül.\n"
-"Az egyezmény többi - alkalmazható - részét Önnek továbbra is be kell tartania.\n"
-"Jelen licenc kikötései és feltételei Franciaország törvényeinek hatálya alá tartoznak.\n"
-"A jelen licenc kikötéseivel kapcsolatos viták lezárásának legelőnyösebb módja egy\n"
-"bíróságon kívül történő megegyezés. Végső lehetőségként a vitás ügy a megfelelő\n"
+"Ha jelen egyezmény bármely része bírósági ítélet alapján semmisnek, "
+"törvénytelennek vagy\n"
+"alkalmazhatatlannak van nyilvánítva, akkor azon rész jelen szerződésből "
+"kizárásra kerül.\n"
+"Az egyezmény többi - alkalmazható - részét Önnek továbbra is be kell "
+"tartania.\n"
+"Jelen licenc kikötései és feltételei Franciaország törvényeinek hatálya alá "
+"tartoznak.\n"
+"A jelen licenc kikötéseivel kapcsolatos viták lezárásának legelőnyösebb "
+"módja egy\n"
+"bíróságon kívül történő megegyezés. Végső lehetőségként a vitás ügy a "
+"megfelelő\n"
 "párizsi (Franciaország) bíróságra kerül.\n"
-"Ha jelen dokumentummal kapcsolatban kérdése van, vegye fel a kapcsolatot a Mandriva S.A.\n"
+"Ha jelen dokumentummal kapcsolatban kérdése van, vegye fel a kapcsolatot a "
+"Mandriva S.A.\n"
 "céggel.\n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
-"Software included may be covered by patents in your country. For example, the\n"
+"Software included may be covered by patents in your country. For example, "
+"the\n"
 "MP3 decoders included may require a licence for further usage (see\n"
-"http://www.mp3licensing.com for more details). If you are unsure if a patent\n"
+"http://www.mp3licensing.com for more details). If you are unsure if a "
+"patent\n"
 "may be applicable to you, check your local laws."
 msgstr ""
-"Figyelmeztetés: A szabad szoftver nem feltétlenül szabadalommentes; bizonyos\n"
+"Figyelmeztetés: A szabad szoftver nem feltétlenül szabadalommentes; "
+"bizonyos\n"
 "komponensekre esetleg vonatkozhatnak szabadalmak az Ön országában. Például\n"
 "az MP3-dekódolók használata esetén szükség lehet licencre (információ:\n"
 "http://www.mp3licensing.com). Ha nem biztos abban, hogy egy bizonyos\n"
 "szabadalom vonatkozik-e az Ön esetére, akkor vizsgálja meg az Ön országában\n"
 "érvényes törvényeket."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
+#: messages.pm:123
 #, c-format
 msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Figyelmeztetés\n"
-"\n"
-"Olvassa el alaposan az alábbi licencfeltételeket. Ha valamelyik részt nem\n"
-"fogadja el, akkor nem kezdheti el a telepítést a következő CD-ről. Ha a\n"
-"\"Nem fogadom el\" lehetőséget választja, akkor a telepítést ezen adathordozó\n"
-"kihagyásával kell folytatnia.\n"
-"\n"
-"\n"
-"A következő CD-n található néhány szoftverkomponens nem a GPL\n"
-"(vagy más hasonló) licenc alá tartozik. Mindegyik ilyen komponens\n"
-"saját, egyéni licencegyezménnyel rendelkezik.\n"
-"Olvassa el és fogadja el ezeket a licencfeltételeket a komponens\n"
-"használatba vétele vagy továbbadása előtt.\n"
-"Ezek a feltételek általában nem engedélyezik a komponens továbbadását,\n"
-"lemásolását (kivéve biztonsági másolatként), forgalomba hozását,\n"
-"visszafejtését, gépi kódú kilistázását, visszafordítását és módosítását.\n"
-"Bármelyik feltétel be nem tartása esetén a licenc érvényét veszti.\n"
-"Ha a licencegyezmény külön nem engedélyez többet, akkor a telepítés\n"
-"csak egy rendszerre engedélyezett, és a komponens nem használható\n"
-"közösen, a hálózaton. Ha pontosabb információra van szüksége,\n"
-"lépjen kapcsolatba a komponens forgalmazójával vagy készítőjével.\n"
-"A komponensek átadása, róluk másolat készítése harmadik fél részére\n"
-"általában nem engedélyezett (beleértve a dokumentációt is).\n"
-"\n"
-"\n"
-"A következő CD-n található komponensek minden joga azok szerzőit illeti\n"
-"meg, és a szoftvertermékekre vonatkozó szellemi és szerzői jogi\n"
-"törvények érvényesek rájuk.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -5071,7 +5135,8 @@ msgid ""
 "Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of Mandriva Linux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5198,9 +5263,11 @@ msgstr "Melyik %s meghajtóprogramot próbáljam meg?"
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without them. Would you like to specify\n"
+"properly, although it normally works fine without them. Would you like to "
+"specify\n"
 "extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it should\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
 "not cause any damage."
 msgstr ""
 "Bizonyos esetekben a(z) %s meghajtóprogramnak további paraméterekre van\n"
@@ -5242,7 +5309,8 @@ msgstr "A kiterjesztett (extended) partíció nem támogatott ezen a platformon"
 #, c-format
 msgid ""
 "You have a hole in your partition table but I can not use it.\n"
-"The only solution is to move your primary partitions to have the hole next to the extended partitions."
+"The only solution is to move your primary partitions to have the hole next "
+"to the extended partitions."
 msgstr ""
 "A partíciós táblában van egy üres tartomány, de nem használható.\n"
 "Az egyetlen megoldás az elsődleges partíciók áthelyezése úgy, hogy\n"
@@ -5253,16 +5321,15 @@ msgstr ""
 msgid ""
 "Something bad is happening on your 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."
+"It means writing anything on the disk will end up with random, corrupted "
+"data."
 msgstr ""
 "Valamilyen probléma van a meghajtóval. \n"
 "Az adatintegritási teszt végrehajtása nem sikerült. \n"
 "Ez azt jelenti, hogy a lemezre való írás tönkreteheti a meghajtó \n"
 "adattartalmát."
 
-#: pkgs.pm:228
-#: pkgs.pm:231
-#: pkgs.pm:240
+#: pkgs.pm:228 pkgs.pm:231 pkgs.pm:240
 #, c-format
 msgid "Unused packages removal"
 msgstr "Nem használt csomagok eltávolítása"
@@ -5279,22 +5346,26 @@ msgstr "Nem használt lokalizációs csomagok keresése..."
 
 #: pkgs.pm:241
 #, c-format
-msgid "We have detected that some packages are not needed for your system configuration."
-msgstr "Olyan csomagok találhatóak a rendszerben, amelyek nem szükségesek a teljes értékű működéshez."
+msgid ""
+"We have detected that some packages are not needed for your system "
+"configuration."
+msgstr ""
+"Olyan csomagok találhatóak a rendszerben, amelyek nem szükségesek a teljes "
+"értékű működéshez."
 
 #: pkgs.pm:242
 #, c-format
 msgid "We will remove the following packages, unless you choose otherwise:"
-msgstr "Az alábbi csomagok - amennyiben kijelöltek maradnak, - eltávolításra kerülnek:"
+msgstr ""
+"Az alábbi csomagok - amennyiben kijelöltek maradnak, - eltávolításra "
+"kerülnek:"
 
-#: pkgs.pm:245
-#: pkgs.pm:246
+#: pkgs.pm:245 pkgs.pm:246
 #, c-format
 msgid "Unused hardware support"
 msgstr "Nem használt hardvertámogatás"
 
-#: pkgs.pm:249
-#: pkgs.pm:250
+#: pkgs.pm:249 pkgs.pm:250
 #, c-format
 msgid "Unused localization"
 msgstr "Nem használt lokalizáció"
@@ -5322,7 +5393,8 @@ msgstr "Nem sikerült létrehozni /usr/share/sane/%s nevű linket."
 #: scanner.pm:113
 #, c-format
 msgid "Could not copy firmware file %s to /usr/share/sane/firmware!"
-msgstr "Nem sikerült a(z) %s firmware fájlt átmásolni ide: /usr/share/sane/firmware"
+msgstr ""
+"Nem sikerült a(z) %s firmware fájlt átmásolni ide: /usr/share/sane/firmware"
 
 #: scanner.pm:120
 #, c-format
@@ -5337,7 +5409,8 @@ msgstr "ScannerDrake"
 #: scanner.pm:201
 #, c-format
 msgid "Could not install the packages needed to share your scanner(s)."
-msgstr "Nem sikerült telepíteni a lapolvasó(k) megosztásához szükséges csomagokat."
+msgstr ""
+"Nem sikerült telepíteni a lapolvasó(k) megosztásához szükséges csomagokat."
 
 #: scanner.pm:202
 #, c-format
@@ -5374,7 +5447,8 @@ msgid ""
 "\n"
 "Else only /etc/issue is allowed."
 msgstr ""
-"\"Mind\" beállítás esetén létezhet /etc/issue és /etc/issue.net nevű fájl is.\n"
+"\"Mind\" beállítás esetén létezhet /etc/issue és /etc/issue.net nevű fájl "
+"is.\n"
 "\n"
 "\"Egyik sem\" beállítás esetén egyik \"issue\" fájl sem létezhet.\n"
 "\n"
@@ -5397,8 +5471,11 @@ msgstr "Közvetlen rendszergazdai bejelentkezés engedélyezése"
 
 #: security/help.pm:33
 #, c-format
-msgid "Allow the list of users on the system on display managers (kdm and gdm)."
-msgstr "A felhasználólista megjelenítésének engedélyezése a bejelentkezéskezelőkben (KDM és GDM)"
+msgid ""
+"Allow the list of users on the system on display managers (kdm and gdm)."
+msgstr ""
+"A felhasználólista megjelenítésének engedélyezése a bejelentkezéskezelőkben "
+"(KDM és GDM)"
 
 #: security/help.pm:35
 #, c-format
@@ -5447,17 +5524,20 @@ msgstr ""
 msgid ""
 "Authorize:\n"
 "\n"
-"- all services controlled by tcp_wrappers (see hosts.deny(5) man page) if set to \"ALL\",\n"
+"- all services controlled by tcp_wrappers (see hosts.deny(5) man page) if "
+"set to \"ALL\",\n"
 "\n"
 "- only local ones if set to \"Local\"\n"
 "\n"
 "- none if set to \"None\".\n"
 "\n"
-"To authorize the services you need, use /etc/hosts.allow (see hosts.allow(5))."
+"To authorize the services you need, use /etc/hosts.allow (see hosts.allow"
+"(5))."
 msgstr ""
 "Engedélyezés a következők számára:\n"
 "\n"
-"- \"Mind\" beállítás esetén: a tcp_wrappers által vezérelt összes szolgáltatás\n"
+"- \"Mind\" beállítás esetén: a tcp_wrappers által vezérelt összes "
+"szolgáltatás\n"
 "(információ a hosts.deny(5) leírásban (\"man\"))\n"
 "\n"
 "- \"Helyi\" beállítás esetén: csak a helyiek\n"
@@ -5525,7 +5605,9 @@ msgstr "Biztonsági figyelmeztetések:"
 #: security/help.pm:82
 #, c-format
 msgid "Enable IP spoofing protection."
-msgstr "Az 'IP spoofing' (más gép IP-címének használata forráscímként) elleni védelem bekapcsolása"
+msgstr ""
+"Az 'IP spoofing' (más gép IP-címének használata forráscímként) elleni "
+"védelem bekapcsolása"
 
 #: security/help.pm:84
 #, c-format
@@ -5544,8 +5626,13 @@ msgstr "Az msec óránkénti biztonsági ellenőrzéseinek bekapcsolása"
 
 #: security/help.pm:90
 #, c-format
-msgid "Enable su only from members of the wheel group. If set to no, allows su from any user."
-msgstr "Az \"su\" parancs használata csak a \"wheel\" nevű csoport tagjainak számára legyen lehetséges. Ha ki van kapcsolva, akkor bármely felhasználó használhatja az \"su\" parancsot."
+msgid ""
+"Enable su only from members of the wheel group. If set to no, allows su from "
+"any user."
+msgstr ""
+"Az \"su\" parancs használata csak a \"wheel\" nevű csoport tagjainak számára "
+"legyen lehetséges. Ha ki van kapcsolva, akkor bármely felhasználó "
+"használhatja az \"su\" parancsot."
 
 #: security/help.pm:92
 #, c-format
@@ -5555,7 +5642,9 @@ msgstr "Jelszó használata a felhasználók azonosításához"
 #: security/help.pm:94
 #, c-format
 msgid "Activate ethernet cards promiscuity check."
-msgstr "Az Ethernet kártyák 'promiscuous' (minden csomagot megtartó) üzemmódjának ellenőrzésének bekapcsolása"
+msgstr ""
+"Az Ethernet kártyák 'promiscuous' (minden csomagot megtartó) üzemmódjának "
+"ellenőrzésének bekapcsolása"
 
 #: security/help.pm:96
 #, c-format
@@ -5570,7 +5659,8 @@ msgstr "Az sulogin(8) engedélyezése egyfelhasználós szinten"
 #: security/help.pm:100
 #, c-format
 msgid "Add the name as an exception to the handling of password aging by msec."
-msgstr "Az adott név felvétele az msec féle jelszóelévülés-kezelés alóli kivételként"
+msgstr ""
+"Az adott név felvétele az msec féle jelszóelévülés-kezelés alóli kivételként"
 
 #: security/help.pm:102
 #, c-format
@@ -5588,7 +5678,9 @@ msgstr ""
 
 #: security/help.pm:106
 #, c-format
-msgid "Set the password minimum length and minimum number of digit and minimum number of capitalized letters."
+msgid ""
+"Set the password minimum length and minimum number of digit and minimum "
+"number of capitalized letters."
 msgstr ""
 "A minimális jelszóhossz és a számjegyek illetve a nagybetűk minimális\n"
 "számának beállítása"
@@ -5646,7 +5738,8 @@ msgstr "Ha igenre van állítva: a napi biztonsági ellenőrzések végrehajtás
 #: security/help.pm:120
 #, c-format
 msgid "if set to yes, check additions/removals of sgid files."
-msgstr "Ha igenre van állítva: SGID-s fájlok létrehozásának/törlésének ellenőrzése"
+msgstr ""
+"Ha igenre van állítva: SGID-s fájlok létrehozásának/törlésének ellenőrzése"
 
 #: security/help.pm:121
 #, c-format
@@ -5658,12 +5751,15 @@ msgstr ""
 #: security/help.pm:122
 #, c-format
 msgid "if set to yes, verify checksum of the suid/sgid files."
-msgstr "Ha igenre van állítva: az SUID/SGID-os fájlok ellenőrzőösszegének ellenőrzése"
+msgstr ""
+"Ha igenre van állítva: az SUID/SGID-os fájlok ellenőrzőösszegének ellenőrzése"
 
 #: security/help.pm:123
 #, c-format
 msgid "if set to yes, check additions/removals of suid root files."
-msgstr "Ha igenre van állítva: 'SUID root'-os fájlok létrehozásának/törlésének ellenőrzése"
+msgstr ""
+"Ha igenre van állítva: 'SUID root'-os fájlok létrehozásának/törlésének "
+"ellenőrzése"
 
 #: security/help.pm:124
 #, c-format
@@ -5673,7 +5769,8 @@ msgstr "Ha igenre van állítva: figyelmeztetés a tulajdonos nélküli fájlokr
 #: security/help.pm:125
 #, c-format
 msgid "if set to yes, check files/directories writable by everybody."
-msgstr "Ha igenre van állítva: a mindenki által írható fájlok/könyvtárak ellenőrzése"
+msgstr ""
+"Ha igenre van állítva: a mindenki által írható fájlok/könyvtárak ellenőrzése"
 
 #: security/help.pm:126
 #, c-format
@@ -5682,7 +5779,8 @@ msgstr "Ha igenre van állítva: chkrootkit ellenőrzések elvégzése"
 
 #: security/help.pm:127
 #, c-format
-msgid "if set, send the mail report to this email address else send it to root."
+msgid ""
+"if set, send the mail report to this email address else send it to root."
 msgstr ""
 "Ha be van állítva: a jelentés ezen email címre való küldése; máskülönben a\n"
 "rendszergazdának"
@@ -5705,7 +5803,8 @@ msgstr "Ha igenre van állítva: ellenőrzések elvégzése az RPM adatbázison"
 #: security/help.pm:131
 #, c-format
 msgid "if set to yes, report check result to syslog."
-msgstr "Ha igenre van állítva: az ellenőrzés eredményének írása a rendszernaplóba"
+msgstr ""
+"Ha igenre van állítva: az ellenőrzés eredményének írása a rendszernaplóba"
 
 #: security/help.pm:132
 #, c-format
@@ -5781,7 +5880,9 @@ msgstr ""
 #: security/l10n.pm:20
 #, c-format
 msgid "Export display when passing from root to the other users"
-msgstr "A képernyő exportálása a rendszergazdai azonosítóról egy másikra való átlépéskor"
+msgstr ""
+"A képernyő exportálása a rendszergazdai azonosítóról egy másikra való "
+"átlépéskor"
 
 #: security/l10n.pm:21
 #, c-format
@@ -5824,7 +5925,8 @@ msgstr ""
 #, c-format
 msgid "Enable IP spoofing protection"
 msgstr ""
-"Az 'IP spoofing' (más gép IP címének használata forráscímként) elleni védelem\n"
+"Az 'IP spoofing' (más gép IP címének használata forráscímként) elleni "
+"védelem\n"
 "bekapcsolása"
 
 #: security/l10n.pm:29
@@ -5845,7 +5947,9 @@ msgstr "Az msec óránkénti biztonsági ellenőrzéseinek bekapcsolása"
 #: security/l10n.pm:32
 #, c-format
 msgid "Enable su only from the wheel group members"
-msgstr "Az \"su\" parancs használata csak a \"wheel\" nevű csoport tagjainak számára legyen lehetséges."
+msgstr ""
+"Az \"su\" parancs használata csak a \"wheel\" nevű csoport tagjainak számára "
+"legyen lehetséges."
 
 #: security/l10n.pm:33
 #, c-format
@@ -5877,7 +5981,9 @@ msgstr "Nincs jelszóelévülés:"
 #: security/l10n.pm:38
 #, c-format
 msgid "Set password expiration and account inactivation delays"
-msgstr "A jelszavak lejáratához és az azonosítók deaktiválásához tartozó várakozási idők beállítása"
+msgstr ""
+"A jelszavak lejáratához és az azonosítók deaktiválásához tartozó várakozási "
+"idők beállítása"
 
 #: security/l10n.pm:39
 #, c-format
@@ -5887,7 +5993,8 @@ msgstr "A jelszótörténeti lista mérete"
 #: security/l10n.pm:40
 #, c-format
 msgid "Password minimum length and number of digits and upcase letters"
-msgstr "A minimális jelszóhossz és a számjegyek illetve a nagybetűk minimális száma"
+msgstr ""
+"A minimális jelszóhossz és a számjegyek illetve a nagybetűk minimális száma"
 
 #: security/l10n.pm:41
 #, c-format
@@ -6046,32 +6153,46 @@ msgid ""
 msgstr ""
 "Ezt a szintet csak körültekintéssel használja.\n"
 "Egyszerűbbé teszi a rendszer használatát, de így az sebezhetőbb is lesz:\n"
-"ne válassza ezt a szintet, ha a gép hálózatba van kötve, vagy az internethez\n"
+"ne válassza ezt a szintet, ha a gép hálózatba van kötve, vagy az "
+"internethez\n"
 "csatlakozik. A hozzáférés nincs jelszóval védve."
 
 #: security/level.pm:44
 #, c-format
-msgid "Passwords are now enabled, but use as a networked computer is still not recommended."
+msgid ""
+"Passwords are now enabled, but use as a networked computer is still not "
+"recommended."
 msgstr ""
 "A jelszavak be vannak kapcsolva, de hálózatra kapcsolódó gép esetén\n"
 "ez a konfiguráció még mindig nem ajánlott."
 
 #: security/level.pm:45
 #, c-format
-msgid "This is the standard security recommended for a computer that will be used to connect to the Internet as a client."
-msgstr "Ez a szabványos biztonsági szint, amely az internetre (kliensként) csatlakozó gépek esetén javasolt."
+msgid ""
+"This is the standard security recommended for a computer that will be used "
+"to connect to the Internet as a client."
+msgstr ""
+"Ez a szabványos biztonsági szint, amely az internetre (kliensként) "
+"csatlakozó gépek esetén javasolt."
 
 #: security/level.pm:46
 #, c-format
-msgid "There are already some restrictions, and more automatic checks are run every night."
-msgstr "Már vannak bizonyos megszorítások, és több automatikus ellenőrzés fut éjszakánként."
+msgid ""
+"There are already some restrictions, and more automatic checks are run every "
+"night."
+msgstr ""
+"Már vannak bizonyos megszorítások, és több automatikus ellenőrzés fut "
+"éjszakánként."
 
 #: security/level.pm:47
 #, c-format
 msgid ""
-"With this security level, the use of this system as a server becomes possible.\n"
-"The security is now high enough to use the system as a server which can accept\n"
-"connections from many clients. Note: if your machine is only a client on the Internet, you should choose a lower level."
+"With this security level, the use of this system as a server becomes "
+"possible.\n"
+"The security is now high enough to use the system as a server which can "
+"accept\n"
+"connections from many clients. Note: if your machine is only a client on the "
+"Internet, you should choose a lower level."
 msgstr ""
 "Ezzel a biztonsági szinttel már használhatja a gépét kiszolgálóként.\n"
 "Ez a biztonsági szint elég magas ahhoz, hogy a rendszer sok, hálózaton\n"
@@ -6080,7 +6201,9 @@ msgstr ""
 
 #: security/level.pm:50
 #, c-format
-msgid "This is similar to the previous level, but the system is entirely closed and security features are at their maximum."
+msgid ""
+"This is similar to the previous level, but the system is entirely closed and "
+"security features are at their maximum."
 msgstr ""
 "Az előző szinthez hasonló, de itt a rendszer teljesen zárt.\n"
 "Ez a legbiztonságosabb szint."
@@ -6149,7 +6272,8 @@ msgstr ""
 #, c-format
 msgid ""
 "cron is a standard UNIX program that runs user-specified programs\n"
-"at periodic scheduled times. vixie cron adds a number of features to the basic\n"
+"at periodic scheduled times. vixie cron adds a number of features to the "
+"basic\n"
 "UNIX cron, including better security and more powerful configuration options."
 msgstr ""
 "A cron a szabványos parancsütemező program a UNIX operációs rendszereken.\n"
@@ -6159,7 +6283,8 @@ msgstr ""
 
 #: services.pm:28
 #, c-format
-msgid "Common UNIX Printing System (CUPS) is an advanced printer spooling system"
+msgid ""
+"Common UNIX Printing System (CUPS) is an advanced printer spooling system"
 msgstr "A CUPS (Common UNIX Printing System) egy fejlett nyomtatási rendszer"
 
 #: services.pm:29
@@ -6170,17 +6295,20 @@ msgstr "Elindítja a grafikus bejelentkezéskezelőt"
 #: services.pm:30
 #, c-format
 msgid ""
-"FAM is a file monitoring daemon. It is used to get reports when files change.\n"
+"FAM is a file monitoring daemon. It is used to get reports when files "
+"change.\n"
 "It is used by GNOME and KDE"
 msgstr ""
-"A FAM egy fájlfigyelő szolgáltatás, amely értesítést küld a fájlok változásakor.\n"
+"A FAM egy fájlfigyelő szolgáltatás, amely értesítést küld a fájlok "
+"változásakor.\n"
 "A GNOME és a KDE is használja."
 
 #: services.pm:32
 #, c-format
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
-"Midnight Commander. It also allows mouse-based console cut-and-paste operations,\n"
+"Midnight Commander. It also allows mouse-based console cut-and-paste "
+"operations,\n"
 "and includes support for pop-up menus on the console."
 msgstr ""
 "A GPM egértámogatást biztosít a szöveg alapú (konzolos) linuxos\n"
@@ -6204,7 +6332,8 @@ msgstr ""
 
 #: services.pm:38
 #, c-format
-msgid "Apache is a World Wide Web server. It is used to serve HTML files and CGI."
+msgid ""
+"Apache is a World Wide Web server. It is used to serve HTML files and CGI."
 msgstr ""
 "Az Apache egy WWW kiszolgáló. HTML fájlokat és CGI-t tesz elérhetővé\n"
 "a hálózaton keresztül."
@@ -6213,8 +6342,10 @@ msgstr ""
 #, c-format
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
-"variety of other internet services as needed. It is responsible for starting\n"
-"many services, including telnet, ftp, rsh, and rlogin. Disabling inetd disables\n"
+"variety of other internet services as needed. It is responsible for "
+"starting\n"
+"many services, including telnet, ftp, rsh, and rlogin. Disabling inetd "
+"disables\n"
 "all of the services it is responsible for."
 msgstr ""
 "Az \"internet szuperszerver szolgáltatás\" (inetd) felelős sok hálózati\n"
@@ -6254,7 +6385,9 @@ msgstr ""
 #: services.pm:50
 #, c-format
 msgid "Automatic detection and configuration of hardware at boot."
-msgstr "A hardvereszközök automatikus felderítése és beállítása a rendszer indulásakor."
+msgstr ""
+"A hardvereszközök automatikus felderítése és beállítása a rendszer "
+"indulásakor."
 
 #: services.pm:51
 #, c-format
@@ -6286,14 +6419,18 @@ msgstr ""
 
 #: services.pm:57
 #, c-format
-msgid "DBUS is a daemon which broadcasts notifications of system events and other messages"
+msgid ""
+"DBUS is a daemon which broadcasts notifications of system events and other "
+"messages"
 msgstr ""
 "A DBUS szolgáltatás értesítéseket küld rendszereseményekről, továbbá egyéb\n"
 "üzeneteket közvetít."
 
 #: services.pm:58
 #, c-format
-msgid "named (BIND) is a Domain Name Server (DNS) that is used to resolve host names to IP addresses."
+msgid ""
+"named (BIND) is a Domain Name Server (DNS) that is used to resolve host "
+"names to IP addresses."
 msgstr ""
 "A named (BIND) egy DNS, azaz tartománynév kiszolgáló, ennek segítségével\n"
 "feleltetik meg a gépek az IP címeket és a gépneveket."
@@ -6340,7 +6477,8 @@ msgstr ""
 #: services.pm:68
 #, c-format
 msgid "Synchronizes system time using the Network Time Protocol (NTP)"
-msgstr "Szinkronizálja a rendszeridőt az NTP (Network Time Protocol) használatával."
+msgstr ""
+"Szinkronizálja a rendszeridőt az NTP (Network Time Protocol) használatával."
 
 #: services.pm:69
 #, c-format
@@ -6360,7 +6498,8 @@ msgstr "Az OKI 4w és az azzal kompatibilis windowsos nyomtatók támogatása."
 #, c-format
 msgid ""
 "PCMCIA support is usually to support things like ethernet and\n"
-"modems in laptops.  It will not get started unless configured so it is safe to have\n"
+"modems in laptops.  It will not get started unless configured so it is safe "
+"to have\n"
 "it installed on machines that do not need it."
 msgstr ""
 "A PCMCIA támogatásra általában azoknak a laptop használóknak van\n"
@@ -6372,7 +6511,8 @@ msgstr ""
 #, c-format
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
-"protocols such as NFS and NIS. The portmap server must be running on machines\n"
+"protocols such as NFS and NIS. The portmap server must be running on "
+"machines\n"
 "which act as servers for protocols which make use of the RPC mechanism."
 msgstr ""
 "A portmapper kezeli az RPC kapcsolatokat - ezekre többek között az\n"
@@ -6382,7 +6522,9 @@ msgstr ""
 
 #: services.pm:78
 #, c-format
-msgid "Postfix is a Mail Transport Agent, which is the program that moves mail from one machine to another."
+msgid ""
+"Postfix is a Mail Transport Agent, which is the program that moves mail from "
+"one machine to another."
 msgstr ""
 "A Postfix egy levéltovábbító (MTA) program, amely a leveleket továbbítja\n"
 "a különböző gépek között."
@@ -6449,13 +6591,20 @@ msgstr ""
 
 #: services.pm:92
 #, c-format
-msgid "SANE (Scanner Access Now Easy) enables to access scanners, video cameras, ..."
-msgstr "A SANE (Scanner Access Now Easy) hozzáférést biztosít lapolvasókhoz, videokamerákhoz és egyéb eszközökhöz."
+msgid ""
+"SANE (Scanner Access Now Easy) enables to access scanners, video cameras, ..."
+msgstr ""
+"A SANE (Scanner Access Now Easy) hozzáférést biztosít lapolvasókhoz, "
+"videokamerákhoz és egyéb eszközökhöz."
 
 #: services.pm:93
 #, c-format
-msgid "The SMB/CIFS protocol enables to share access to files & printers and also integrates with a Windows Server domain"
-msgstr "Az SMB/CIFS protokoll lehetővé teszi fájlok és nyomtatók megosztását, továbbá képes integrálódni windowsos kiszolgálók tartományaiba."
+msgid ""
+"The SMB/CIFS protocol enables to share access to files & printers and also "
+"integrates with a Windows Server domain"
+msgstr ""
+"Az SMB/CIFS protokoll lehetővé teszi fájlok és nyomtatók megosztását, "
+"továbbá képes integrálódni windowsos kiszolgálók tartományaiba."
 
 #: services.pm:94
 #, c-format
@@ -6464,8 +6613,12 @@ msgstr "A gép hangrendszerének elindítása"
 
 #: services.pm:95
 #, c-format
-msgid "Secure Shell is a network protocol that allows data to be exchanged over a secure channel between two computers"
-msgstr "Az SSH (Secure Shell) hálózati protokoll biztonságos csatornán való adatcserét tesz lehetővé két számítógép közt."
+msgid ""
+"Secure Shell is a network protocol that allows data to be exchanged over a "
+"secure channel between two computers"
+msgstr ""
+"Az SSH (Secure Shell) hálózati protokoll biztonságos csatornán való "
+"adatcserét tesz lehetővé két számítógép közt."
 
 #: services.pm:96
 #, c-format
@@ -6521,8 +6674,7 @@ msgstr "Távoli adminisztráció"
 msgid "Database Server"
 msgstr "Adatbázis kiszolgáló"
 
-#: services.pm:153
-#: services.pm:189
+#: services.pm:153 services.pm:189
 #, c-format
 msgid "Services"
 msgstr "Szolgáltatások"
@@ -6561,8 +6713,7 @@ msgstr ""
 "Nem érhető el további információ\n"
 "erről a szolgáltatásról."
 
-#: services.pm:221
-#: ugtk2.pm:923
+#: services.pm:221 ugtk2.pm:923
 #, c-format
 msgid "Info"
 msgstr "Információ"
@@ -6602,7 +6753,8 @@ msgid ""
 "\n"
 "You should have received a copy of the GNU General Public License\n"
 "along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
+"USA.\n"
 msgstr ""
 "Ez a program szabad szoftver; terjeszthető és/vagy módosítható\n"
 "a Free Software Foundation által publikált GNU General Public\n"
@@ -6627,7 +6779,8 @@ msgid ""
 "--default             : save default directories.\n"
 "--debug               : show all debug messages.\n"
 "--show-conf           : list of files or directories to backup.\n"
-"--config-info         : explain configuration file options (for non-X users).\n"
+"--config-info         : explain configuration file options (for non-X "
+"users).\n"
 "--daemon              : use daemon configuration. \n"
 "--help                : show this message.\n"
 "--version             : show version number.\n"
@@ -6735,9 +6888,12 @@ msgid ""
 "--start          : start MTS\n"
 "--stop           : stop MTS\n"
 "--adduser        : add an existing system user to MTS (requires username)\n"
-"--deluser        : delete an existing system user from MTS (requires username)\n"
-"--addclient      : add a client machine to MTS (requires MAC address, IP, nbi image name)\n"
-"--delclient      : delete a client machine from MTS (requires MAC address, IP, nbi image name)"
+"--deluser        : delete an existing system user from MTS (requires "
+"username)\n"
+"--addclient      : add a client machine to MTS (requires MAC address, IP, "
+"nbi image name)\n"
+"--delclient      : delete a client machine from MTS (requires MAC address, "
+"IP, nbi image name)"
 msgstr ""
 "[OPCIÓK]...\n"
 "A Mandriva Linux terminálkiszolgáló (MTS) beállítása\n"
@@ -6791,9 +6947,11 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTION]...\n"
-"  --no-confirmation      do not ask first confirmation question in Mandriva Update mode\n"
+"  --no-confirmation      do not ask first confirmation question in Mandriva "
+"Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
-"  --changelog-first      display changelog before filelist in the description window\n"
+"  --changelog-first      display changelog before filelist in the "
+"description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[OPCIÓ]...\n"
@@ -6807,8 +6965,12 @@ msgstr ""
 
 #: standalone.pm:117
 #, c-format
-msgid "[--manual] [--device=dev] [--update-sane=sane_source_dir] [--update-usbtable] [--dynamic=dev]"
-msgstr "[--manual] [--device=eszköz] [--update-sane=sane_forráskönyvtár] [--update-usbtable] [--dynamic=eszköz]"
+msgid ""
+"[--manual] [--device=dev] [--update-sane=sane_source_dir] [--update-"
+"usbtable] [--dynamic=dev]"
+msgstr ""
+"[--manual] [--device=eszköz] [--update-sane=sane_forráskönyvtár] [--update-"
+"usbtable] [--dynamic=eszköz]"
 
 #: standalone.pm:118
 #, c-format
@@ -6825,13 +6987,14 @@ msgstr ""
 #, c-format
 msgid ""
 "\n"
-"Usage: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--testing] [-v|--version] "
+"Usage: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
+"testing] [-v|--version] "
 msgstr ""
 "\n"
-"Használat: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--testing] [-v|--version] "
+"Használat: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
+"testing] [-v|--version] "
 
-#: timezone.pm:161
-#: timezone.pm:162
+#: timezone.pm:161 timezone.pm:162
 #, c-format
 msgid "All servers"
 msgstr "Az összes kiszolgáló"
@@ -6930,19 +7093,87 @@ msgstr ""
 msgid "Installation failed"
 msgstr "A telepítés hibával ért véget."
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Figyelmeztetés\n"
+#~ "\n"
+#~ "Olvassa el alaposan az alábbi licencfeltételeket. Ha valamelyik részt "
+#~ "nem\n"
+#~ "fogadja el, akkor nem kezdheti el a telepítést a következő CD-ről. Ha a\n"
+#~ "\"Nem fogadom el\" lehetőséget választja, akkor a telepítést ezen "
+#~ "adathordozó\n"
+#~ "kihagyásával kell folytatnia.\n"
+#~ "\n"
+#~ "\n"
+#~ "A következő CD-n található néhány szoftverkomponens nem a GPL\n"
+#~ "(vagy más hasonló) licenc alá tartozik. Mindegyik ilyen komponens\n"
+#~ "saját, egyéni licencegyezménnyel rendelkezik.\n"
+#~ "Olvassa el és fogadja el ezeket a licencfeltételeket a komponens\n"
+#~ "használatba vétele vagy továbbadása előtt.\n"
+#~ "Ezek a feltételek általában nem engedélyezik a komponens továbbadását,\n"
+#~ "lemásolását (kivéve biztonsági másolatként), forgalomba hozását,\n"
+#~ "visszafejtését, gépi kódú kilistázását, visszafordítását és módosítását.\n"
+#~ "Bármelyik feltétel be nem tartása esetén a licenc érvényét veszti.\n"
+#~ "Ha a licencegyezmény külön nem engedélyez többet, akkor a telepítés\n"
+#~ "csak egy rendszerre engedélyezett, és a komponens nem használható\n"
+#~ "közösen, a hálózaton. Ha pontosabb információra van szüksége,\n"
+#~ "lépjen kapcsolatba a komponens forgalmazójával vagy készítőjével.\n"
+#~ "A komponensek átadása, róluk másolat készítése harmadik fél részére\n"
+#~ "általában nem engedélyezett (beleértve a dokumentációt is).\n"
+#~ "\n"
+#~ "\n"
+#~ "A következő CD-n található komponensek minden joga azok szerzőit illeti\n"
+#~ "meg, és a szoftvertermékekre vonatkozó szellemi és szerzői jogi\n"
+#~ "törvények érvényesek rájuk.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "A libsafe használata kiszolgálókhoz"
+
 #~ msgid ""
 #~ "A library which defends against buffer overflow and format string attacks."
 #~ msgstr ""
 #~ "Könyvtár, amely védelmet nyújt a puffertúlcsordulásos és a "
 #~ "formátumsztringes támadások ellen."
+
 #~ msgid "LILO/grub Installation"
 #~ msgstr "A LILO/GRUB telepítése"
+
 #~ msgid "Precise RAM size if needed (found %d MB)"
 #~ msgstr "RAM méret, ha szükséges (felismert: %d MB)"
+
 #~ msgid "Give the ram size in MB"
 #~ msgstr "A fizikai memória mérete MB-ban"
+
 #~ msgid ""
 #~ "If you plan to use aboot, be careful to leave a free space (2048 sectors "
 #~ "is enough)\n"
@@ -6950,52 +7181,73 @@ msgstr "A telepítés hibával ért véget."
 #~ msgstr ""
 #~ "Ha az aboot-ot fogja használni, először ellenőrizze, hogy maradt-e elég\n"
 #~ "hely (legalább 2048 szektor) a lemez elején"
+
 #~ msgid "Security level"
 #~ msgstr "Biztonsági szint"
+
 #~ msgid "Expand Tree"
 #~ msgstr "A fa kibontása"
+
 #~ msgid "Collapse Tree"
 #~ msgstr "A fa összecsukása"
+
 #~ msgid "Toggle between flat and group sorted"
 #~ msgstr "Váltás sima és csoportok szerint rendezett nézet között"
+
 #~ msgid "Choose action"
 #~ msgstr "Válasszon"
+
 #~ msgid "Active Directory with SFU"
 #~ msgstr "Active Directory SFU-val"
+
 #~ msgid "Active Directory with Winbind"
 #~ msgstr "Active Directory Winbinddal"
+
 #~ msgid "Use information stored in local files for all authentication"
 #~ msgstr ""
 #~ "Helyi fájlokban levő információk használata minden "
 #~ "felhasználóazonosításhoz"
+
 #~ msgid "Active Directory with SFU:"
 #~ msgstr "Active Directory SFU-val:"
+
 #~ msgid "Active Directory with Winbind:"
 #~ msgstr "Active Directory Winbinddal:"
+
 #~ msgid ""
 #~ "Winbind allows the system to authenticate users in a Windows Active "
 #~ "Directory Server."
 #~ msgstr ""
 #~ "A Winbind lehetővé teszi a rendszer számára, hogy felhasználókat "
 #~ "azonosítson egy windowsos Active Directory-kiszolgálón."
+
 #~ msgid "Authentication LDAP"
 #~ msgstr "LDAP-alapú azonosítás"
+
 #~ msgid "TLS"
 #~ msgstr "TLS"
+
 #~ msgid "SSL"
 #~ msgstr "SSL"
+
 #~ msgid "security layout (SASL/Kerberos)"
 #~ msgstr "biztonsági rendszer (SASL/Kerberos)"
+
 #~ msgid "Authentication Active Directory"
 #~ msgstr "Azonosítás - Active Directory"
+
 #~ msgid "LDAP users database"
 #~ msgstr "LDAP-felhasználók adatbázisa"
+
 #~ msgid "LDAP user allowed to browse the Active Directory"
 #~ msgstr "Az LDAP-felhasználó böngészheti az Active Directoryt"
+
 #~ msgid "Password for user"
 #~ msgstr "A felhasználó jelszava"
+
 #~ msgid "Authentication NIS"
 #~ msgstr "NIS-alapú azonosítás"
+
 #~ msgid ""
 #~ "For this to work for a W2K PDC, you will probably need to have the admin "
 #~ "run: C:\\>net localgroup \"Pre-Windows 2000 Compatible Access\" everyone /"
@@ -7024,32 +7276,43 @@ msgstr "A telepítés hibával ért véget."
 #~ "adminisztrátori név illetve jelszó használatával.\n"
 #~ "A 'wbinfo -t' parancs használatával letesztelhető, hogy a hozzáférés "
 #~ "(illetve a létrehozott gépazonosító) működik-e."
+
 #~ msgid "Authentication Windows Domain"
 #~ msgstr "Hitelesítési Windows-tartomány"
+
 #~ msgid "Undo"
 #~ msgstr "Visszavonás"
+
 #~ msgid "Save partition table"
 #~ msgstr "A partíciós tábla mentése"
+
 #~ msgid "Restore partition table"
 #~ msgstr "Partíciós tábla visszatöltése"
+
 #~ msgid ""
 #~ "The backup partition table has not the same size\n"
 #~ "Still continue?"
 #~ msgstr ""
 #~ "A partíciós tábla két példányának mérete eltér.\n"
 #~ "Mégis kívánja folytatni a műveletet?"
+
 #~ msgid "Info: "
 #~ msgstr "Információ: "
+
 #~ msgid "Unknown driver"
 #~ msgstr "Ismeretlen meghajtó"
+
 #~ msgid "Error: The \"%s\" driver for your sound card is unlisted"
 #~ msgstr "Hiba: a hangkártya meghajtója (%s) nem elérhető"
+
 #~ msgid "Error reading file %s"
 #~ msgstr "Hiba a(z) %s fájl olvasása közben"
+
 #~ msgid "Restoring from file %s failed: %s"
 #~ msgstr "A(z) %s fájlból való visszaállítás sikertelen: %s"
+
 #~ msgid "Bad backup file"
 #~ msgstr "Hibás mentésfájl"
+
 #~ msgid "Error writing to file %s"
 #~ msgstr "Hiba a(z) %s fájl írása közben"
-
diff --git a/perl-install/share/po/id.po b/perl-install/share/po/id.po
index 3c094e11d..3ba50ad31 100644
--- a/perl-install/share/po/id.po
+++ b/perl-install/share/po/id.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX 0.1\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2007-10-27 19:26+0700\n"
 "Last-Translator: Willy Sudiarto Raharjo <willysr@gmail.com>\n"
 "Language-Team: Indonesia <mdk-id@yahoogroups.com>\n"
@@ -1427,18 +1427,14 @@ msgstr "Pilih partisi lain"
 msgid "Choose a partition"
 msgstr "Pilih partisi"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Ubah ke modus normal"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Ubah ke modus ahli"
+msgid "More"
+msgstr "Selebihnya"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Konfirmasi"
@@ -1489,13 +1485,17 @@ msgstr "Hapus semua"
 msgid "Auto allocate"
 msgstr "Alokasi otomatis"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Selebihnya"
+msgid "Toggle to normal mode"
+msgstr "Ubah ke modus normal"
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Ubah ke modus ahli"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Info hard drive"
@@ -1549,7 +1549,12 @@ msgstr "Tambahkan ke RAID"
 msgid "Add to LVM"
 msgstr "Tambahkan ke LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ID Pengguna"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Hapus"
@@ -1564,7 +1569,12 @@ msgstr "Hapus dari RAID"
 msgid "Remove from LVM"
 msgstr "Hapus dari LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Hapus dari LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Ganti RAID"
@@ -1737,7 +1747,27 @@ msgstr ""
 "Untuk memastikan integritas data setelah ukuran partisi berubah,\n"
 "pengujian sistem file akan dilakukan pada boot berikut dalam Windows®"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Kunci enkripsi sistem file"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Pilih kunci enkripsi sistem file Anda"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Kunci enkripsi"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Pilih RAID yang ada untuk ditambahkan ke"
@@ -1852,7 +1882,12 @@ msgstr "Anda harus reboot agar perubahan tabel partisi dapat berlaku"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Tabel partisi pada drive %s akan ditulis ke disk"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Memformat partisi %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Setelah memformat partisi %s semua data pada partisi ini akan hilang"
@@ -1990,7 +2025,27 @@ msgstr "Telah termount\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Kunci enkripsi"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2093,12 +2148,7 @@ msgstr "Tipe tabel partisi: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "pada kanal %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Kunci enkripsi sistem file"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Pilih kunci enkripsi sistem file Anda"
@@ -2113,12 +2163,7 @@ msgstr "Kunci enkripsi ini terlalu mudah (harus paling tidak %d karakter)"
 msgid "The encryption keys do not match"
 msgstr "Kunci enkripsi tidak sesuai"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Kunci enkripsi"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Kunci enkripsi (lagi)"
@@ -2233,11 +2278,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Anda harus memiliki partisi FAT yang dimount pada /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Memformat partisi %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4672,7 +4712,7 @@ msgstr "Bootloader tidak bisa menangani /boot pada beberapa volume fisik"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4682,7 +4722,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4690,8 +4733,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4711,52 +4754,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4770,9 +4818,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4910,7 +4958,55 @@ msgstr ""
 "Paris - France.\n"
 "For any question on this document, please contact Mandriva S.A.  \n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4928,67 +5024,55 @@ msgstr ""
 "Jika Anda tidak yakin apakan paten berlaku pada Anda, periksa hukum lokal\n"
 "Anda."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Peringatan\n"
-"\n"
-"Harap membaca semua ketentuan di bawah. Bila Anda tidak setuju dengan\n"
-"salah satu bagiannya, Anda tidak diijinkan menginstal media CD\n"
-"berikutnya. Silakan tekan 'Tolak' untuk melanjutkan installasi tanpa\n"
-"menggunakan media ini.\n"
-"\n"
-"\n"
-"Beberapa komponen yang ada di media CD berikutnya tidak diatur dalam\n"
-"lisensi GPL atau perjanjian sejenis. Komponen-komponen tersebut \n"
-"diatur dalam ketentuan dan kondisi dalam lisensi yang bersangkutan.\n"
-"Baca dengan hati-hati dan penuhi setiap lisensi sebelum Anda\n"
-"menggunakan atau mendistribusikan ulang komponen tersebut.\n"
-"Model lisensi tersebut akan melarang proses transfer, duplikasi\n"
-"(kecuali untuk alasan backup), distribusi ulang, rekayasa ulang,\n"
-"de-assembly, de-kompilasi, atau modifikasi komponen tersebut.\n"
-"Setiap pelanggaran pada perjanjian akan segera mengakhiri hak-hak\n"
-"Anda dalam lisensi tersebut, Anda tidak dapat menginstall program\n"
-"ini pada lebih dari satu sistem atau menggunakannya pada jaringan.\n"
-"Bila Anda masih ragu, silakan hubungi langsung distributor atau\n"
-"editor komponen ini. Anda dilarang mentransfer komponen ini ke pihak\n"
-"ketiga atau menyalinnya, termasuk dokumentasi.\n"
-"\n"
-"\n"
-"Semua hak pada komponen di media CD berikutnya dimiliki oleh pembuat\n"
-"masing-masing dan dilindungi oleh hukum hak cipta dan hak intelektual\n"
-"yang berlaku untuk program komputer.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6883,6 +6967,66 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Installasi gagal"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Peringatan\n"
+#~ "\n"
+#~ "Harap membaca semua ketentuan di bawah. Bila Anda tidak setuju dengan\n"
+#~ "salah satu bagiannya, Anda tidak diijinkan menginstal media CD\n"
+#~ "berikutnya. Silakan tekan 'Tolak' untuk melanjutkan installasi tanpa\n"
+#~ "menggunakan media ini.\n"
+#~ "\n"
+#~ "\n"
+#~ "Beberapa komponen yang ada di media CD berikutnya tidak diatur dalam\n"
+#~ "lisensi GPL atau perjanjian sejenis. Komponen-komponen tersebut \n"
+#~ "diatur dalam ketentuan dan kondisi dalam lisensi yang bersangkutan.\n"
+#~ "Baca dengan hati-hati dan penuhi setiap lisensi sebelum Anda\n"
+#~ "menggunakan atau mendistribusikan ulang komponen tersebut.\n"
+#~ "Model lisensi tersebut akan melarang proses transfer, duplikasi\n"
+#~ "(kecuali untuk alasan backup), distribusi ulang, rekayasa ulang,\n"
+#~ "de-assembly, de-kompilasi, atau modifikasi komponen tersebut.\n"
+#~ "Setiap pelanggaran pada perjanjian akan segera mengakhiri hak-hak\n"
+#~ "Anda dalam lisensi tersebut, Anda tidak dapat menginstall program\n"
+#~ "ini pada lebih dari satu sistem atau menggunakannya pada jaringan.\n"
+#~ "Bila Anda masih ragu, silakan hubungi langsung distributor atau\n"
+#~ "editor komponen ini. Anda dilarang mentransfer komponen ini ke pihak\n"
+#~ "ketiga atau menyalinnya, termasuk dokumentasi.\n"
+#~ "\n"
+#~ "\n"
+#~ "Semua hak pada komponen di media CD berikutnya dimiliki oleh pembuat\n"
+#~ "masing-masing dan dilindungi oleh hukum hak cipta dan hak intelektual\n"
+#~ "yang berlaku untuk program komputer.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Gunakan libsafe untuk server"
 
diff --git a/perl-install/share/po/is.po b/perl-install/share/po/is.po
index c73ddab5a..86cdb8e5c 100644
--- a/perl-install/share/po/is.po
+++ b/perl-install/share/po/is.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libDrakX\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-02-18 17:31+0000\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -1416,18 +1416,14 @@ msgstr "Veldu aðra disksneið"
 msgid "Choose a partition"
 msgstr "Veldu disksneið"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Fara í venjulegan ham"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Fara í snillingsham"
+msgid "More"
+msgstr "Meira"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Staðfesting"
@@ -1479,13 +1475,17 @@ msgstr "Hreinsa allt"
 msgid "Auto allocate"
 msgstr "Ráðstafa skjálfkrafa"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Meira"
+msgid "Toggle to normal mode"
+msgstr "Fara í venjulegan ham"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Fara í snillingsham"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Sýna upplýsingar um disk"
@@ -1539,7 +1539,12 @@ msgstr "Bæta við RAID"
 msgid "Add to LVM"
 msgstr "Bæta við LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "UID notanda"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Eyða"
@@ -1554,7 +1559,12 @@ msgstr "Taka úr RAID"
 msgid "Remove from LVM"
 msgstr "Taka úr LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Taka úr LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Breyta RAID"
@@ -1726,7 +1736,27 @@ msgstr ""
 "Til að staðfesta að gögn séu í lagi eftir að disksneiðum hefur verið \n"
 "breytt verður að keyra diskaprófun þegar þú ræsir Windows(tm) næst"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Dulritunarlykill skráakerfis"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Veldu dulritunarlykil fyrir skráakerfið"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Dulritunarlykill"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Veldu RAID sem til er fyrir til að bæta við"
@@ -1840,7 +1870,12 @@ msgstr "Þú þarft að endurræsa áður en breytingar taka gildi"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Disksneiðatafla drifs %s mun verða skrifuð á disk"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Forsníð disksneið %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1980,7 +2015,27 @@ msgstr "Tengdur\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Dulritunarlykill"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2084,12 +2139,7 @@ msgstr "Tegund disksneiðartöflu: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "á gagnabraut %d auðk. %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Dulritunarlykill skráakerfis"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Veldu dulritunarlykil fyrir skráakerfið"
@@ -2104,12 +2154,7 @@ msgstr "Þetta lykilorð er of einfalt (verður að vera minnst %d stafa langt)"
 msgid "The encryption keys do not match"
 msgstr "Dulritunarlyklarnir eru mismunandi"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Dulritunarlykill"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Dulritunarlykill (aftur)"
@@ -2224,11 +2269,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Þú verður að hafa FAT disksneið tengda í /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Forsníð disksneið %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4652,7 +4692,7 @@ msgstr "Ræsistjórinn getur ekki unnið með /boot sem spannar marga diska"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4662,7 +4702,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4670,8 +4713,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4691,52 +4734,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4750,9 +4798,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4875,7 +4923,55 @@ msgstr ""
 "dómstóla í París - Frakklandi.\n"
 "Öllum spurningum um þennann samning ætti að vera beint til Mandriva S.A.  \n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4893,68 +4989,55 @@ msgstr ""
 "(sjá nánar á http://www.mp3licensing.com) ef þú ert ekki viss\n"
 "um einkaleyfi athugaðu þá hjá einkaleyfisstofu landsins."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Aðvörun\n"
-"\n"
-"Vinsamlega lestu vandlega skilmálana hér að neðan. Ef þú ert ekki\n"
-"sátt(ur) við einhvern hluta þess þá mátt þú ekki setja inn næsta\n"
-"geisladisk. Ýttu á 'Neita' til að halda áfram uppsetningu á þess að\n"
-"nota þennan miðil.\n"
-"\n"
-"\n"
-"Sumt af þeim hugbúnaði sem er á næsta geisladiski er ekki dreift\n"
-"samkvæmt GPL eða sambærilegum leyfum. Hver og einn af þessum\n"
-"hugbúnaði er með sína eigin notkunarskilmála. Vinsamlega lestu\n"
-"þá vandlega og samþykktu þá sérstöku skilmála áður en þú notar\n"
-"eða dreifir umræddum hugbúnaði.\n"
-"Þessi leyfi munu almennt takmarka flutning, afritun (nema til geymslu),\n"
-"endurdreifingu, rannsókn á vinnslu kerfis, afkóðun, afþýðingu eða\n"
-"breytingu á hugbúnaðinum. Allar vanefndir á þessum skilmálum munu\n"
-"sjálfkrafa binda endi á leyfi þitt til að nota hugbúnaðinn. Nema "
-"sérstaklega\n"
-"sé tekið fram mátt þú ekki setja hugbúnaðinn upp á fleiri en einni vél,\n"
-"eða breyta þannig að hann sé nothæfur á netkerfi. Ef í vafa vinsamlega\n"
-"hafðu samband við dreifingaraðila eða höfund hugbúnaðarins.\n"
-"Flutningur til þriðja aðila eða afritun af þessum hugbúnaði eða\n"
-"handbókum er venjulega ekki leyfður.\n"
-"\n"
-"\n"
-"Allur réttur hugbúnaðar á næsta geisladiski er í höndum höfunda\n"
-"hvers hugbúnaðar fyrir sig og er varin af höfundarréttarlögum\n"
-"og lögum um hugbúnað.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6837,6 +6920,67 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Innsetning mistókst"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Aðvörun\n"
+#~ "\n"
+#~ "Vinsamlega lestu vandlega skilmálana hér að neðan. Ef þú ert ekki\n"
+#~ "sátt(ur) við einhvern hluta þess þá mátt þú ekki setja inn næsta\n"
+#~ "geisladisk. Ýttu á 'Neita' til að halda áfram uppsetningu á þess að\n"
+#~ "nota þennan miðil.\n"
+#~ "\n"
+#~ "\n"
+#~ "Sumt af þeim hugbúnaði sem er á næsta geisladiski er ekki dreift\n"
+#~ "samkvæmt GPL eða sambærilegum leyfum. Hver og einn af þessum\n"
+#~ "hugbúnaði er með sína eigin notkunarskilmála. Vinsamlega lestu\n"
+#~ "þá vandlega og samþykktu þá sérstöku skilmála áður en þú notar\n"
+#~ "eða dreifir umræddum hugbúnaði.\n"
+#~ "Þessi leyfi munu almennt takmarka flutning, afritun (nema til geymslu),\n"
+#~ "endurdreifingu, rannsókn á vinnslu kerfis, afkóðun, afþýðingu eða\n"
+#~ "breytingu á hugbúnaðinum. Allar vanefndir á þessum skilmálum munu\n"
+#~ "sjálfkrafa binda endi á leyfi þitt til að nota hugbúnaðinn. Nema "
+#~ "sérstaklega\n"
+#~ "sé tekið fram mátt þú ekki setja hugbúnaðinn upp á fleiri en einni vél,\n"
+#~ "eða breyta þannig að hann sé nothæfur á netkerfi. Ef í vafa vinsamlega\n"
+#~ "hafðu samband við dreifingaraðila eða höfund hugbúnaðarins.\n"
+#~ "Flutningur til þriðja aðila eða afritun af þessum hugbúnaði eða\n"
+#~ "handbókum er venjulega ekki leyfður.\n"
+#~ "\n"
+#~ "\n"
+#~ "Allur réttur hugbúnaðar á næsta geisladiski er í höndum höfunda\n"
+#~ "hvers hugbúnaðar fyrir sig og er varin af höfundarréttarlögum\n"
+#~ "og lögum um hugbúnað.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Nota libsafe fyrir þjónustur"
 
diff --git a/perl-install/share/po/it.po b/perl-install/share/po/it.po
index 88f166439..4866cf403 100644
--- a/perl-install/share/po/it.po
+++ b/perl-install/share/po/it.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-03-21 00:07+0100\n"
 "Last-Translator: Andrea Celli <andrea.celli@libero.it>\n"
 "Language-Team: Italian <timl@freelists.org>\n"
@@ -1421,18 +1421,14 @@ msgstr "Scegliere un'altra partizione"
 msgid "Choose a partition"
 msgstr "Scegli una partizione"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Passare a modo normale"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Passare a modo esperto"
+msgid "More"
+msgstr "Ancora"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Conferma"
@@ -1485,13 +1481,17 @@ msgstr "Azzerare tutto"
 msgid "Auto allocate"
 msgstr "Partizionare automaticamente"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Ancora"
+msgid "Toggle to normal mode"
+msgstr "Passare a modo normale"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Passare a modo esperto"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Informazioni sul disco fisso"
@@ -1545,7 +1545,12 @@ msgstr "Aggiungi a RAID"
 msgid "Add to LVM"
 msgstr "Aggiungi a LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ID utente"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Cancella"
@@ -1560,7 +1565,12 @@ msgstr "Rimuovi da RAID"
 msgid "Remove from LVM"
 msgstr "Rimuovi da LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Rimuovi da LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Modifica RAID"
@@ -1737,7 +1747,27 @@ msgstr ""
 "saranno eseguiti dei controlli sul filesystem al prossimo riavvio di Windows"
 "(TM)"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Chiave di cifratura del filesystem"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Scegliere la chiave di cifratura del filesystem"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Chiave di cifratura"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Scegli un RAID esistente a cui aggiungere"
@@ -1853,7 +1883,12 @@ msgstr ""
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "La tabella delle partizioni di %s sta per essere scritta su disco"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formattazione della partizione %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1993,7 +2028,27 @@ msgstr "Montato\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Chiave di cifratura"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2097,12 +2152,7 @@ msgstr "Tipo tabella delle partizioni: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "sul canale %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Chiave di cifratura del filesystem"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Scegliere la chiave di cifratura del filesystem"
@@ -2119,12 +2169,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Le chiavi di cifratura non corrispondono"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Chiave di cifratura"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Chiave di cifratura (conferma)"
@@ -2240,11 +2285,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Occorre una partizione FAT montata su /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formattazione della partizione %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4682,7 +4722,7 @@ msgstr "Il bootloader non può gestire una /boot ripartita su più volumi fisici
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4692,7 +4732,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4700,8 +4743,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4721,52 +4764,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4780,9 +4828,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4898,7 +4946,55 @@ msgstr ""
 "all'attenzione del Tribunale competente di Parigi - Francia. Per qualsiasi "
 "domanda riguardo questo documento, per favore si contatti Mandriva S.A.\n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4917,70 +5013,55 @@ msgstr ""
 "essere entrato nel campo di applicazione di un brevetto, verifica\n"
 "attentamente la tua legislazione nazionale."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
 "\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
 "\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Attenzione\n"
-"\n"
-"Per favore leggi con attenzione il documento che segue.\n"
-"Se non sei d'accordo con una sua qualsiasi parte, non puoi installare il CD\n"
-"successivo. Premi \"Rifiuta\" per continuare l'installazione senza di esso.\n"
-"\n"
-"\n"
-"Alcune componenti software contenuti nel CD successivo non sono\n"
-"soggette alla licenza GPL o a licenze simili. Ciascuna di tali componenti\n"
-"è pertanto soggetta ai termini e alle condizioni della propria\n"
-"licenza specifica. Per favore leggi con attenzione e attieniti alle "
-"relative\n"
-"licenze specifiche prima di usare o ridistribuire tali\n"
-"componenti software. Tali licenze in genere proibiscono\n"
-"il trasferimento, la duplicazione (eccetto che per scopi di backup),\n"
-"la ridistribuzione, il reverse engineering, il deassemblaggio,\n"
-"la decompilazione o la modifica della componente in questione.\n"
-"Qualunque infrazione del contratto porterà alla immediata cancellazione\n"
-"dei tuoi diritti per quanto riguarda la specifica licenza.\n"
-"A meno che la licenza specifica non ti accordi tale diritti,\n"
-"in genere non potrai installare i programmi su più di un computer,\n"
-"o adattarlo in modo che possa essere usato su una rete. In caso di\n"
-"dubbio, per favore contatta direttamente il distributore\n"
-"o il curatore della componente. Il trasferimento a terzi o la copia di tali\n"
-"componenti, documentazione inclusa, è in genere proibito.\n"
-"\n"
-"\n"
-"Tutti i diritti relativi alle componenti del CD successivo appartengono ai\n"
-"loro rispettivi autori e sono protetti dalle leggi relative alla proprietà\n"
-"intellettuale e al copyright applicabili ai programmi software.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6903,6 +6984,75 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Install. non riuscita"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Attenzione\n"
+#~ "\n"
+#~ "Per favore leggi con attenzione il documento che segue.\n"
+#~ "Se non sei d'accordo con una sua qualsiasi parte, non puoi installare il "
+#~ "CD\n"
+#~ "successivo. Premi \"Rifiuta\" per continuare l'installazione senza di "
+#~ "esso.\n"
+#~ "\n"
+#~ "\n"
+#~ "Alcune componenti software contenuti nel CD successivo non sono\n"
+#~ "soggette alla licenza GPL o a licenze simili. Ciascuna di tali "
+#~ "componenti\n"
+#~ "è pertanto soggetta ai termini e alle condizioni della propria\n"
+#~ "licenza specifica. Per favore leggi con attenzione e attieniti alle "
+#~ "relative\n"
+#~ "licenze specifiche prima di usare o ridistribuire tali\n"
+#~ "componenti software. Tali licenze in genere proibiscono\n"
+#~ "il trasferimento, la duplicazione (eccetto che per scopi di backup),\n"
+#~ "la ridistribuzione, il reverse engineering, il deassemblaggio,\n"
+#~ "la decompilazione o la modifica della componente in questione.\n"
+#~ "Qualunque infrazione del contratto porterà alla immediata cancellazione\n"
+#~ "dei tuoi diritti per quanto riguarda la specifica licenza.\n"
+#~ "A meno che la licenza specifica non ti accordi tale diritti,\n"
+#~ "in genere non potrai installare i programmi su più di un computer,\n"
+#~ "o adattarlo in modo che possa essere usato su una rete. In caso di\n"
+#~ "dubbio, per favore contatta direttamente il distributore\n"
+#~ "o il curatore della componente. Il trasferimento a terzi o la copia di "
+#~ "tali\n"
+#~ "componenti, documentazione inclusa, è in genere proibito.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tutti i diritti relativi alle componenti del CD successivo appartengono "
+#~ "ai\n"
+#~ "loro rispettivi autori e sono protetti dalle leggi relative alla "
+#~ "proprietà\n"
+#~ "intellettuale e al copyright applicabili ai programmi software.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Usare libsafe per i server"
 
diff --git a/perl-install/share/po/ja.po b/perl-install/share/po/ja.po
index 632518758..f27ed0643 100644
--- a/perl-install/share/po/ja.po
+++ b/perl-install/share/po/ja.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libDrakX-ja\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-09-06 20:20+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <cooker-i18n@mandrivalinux.org>\n"
@@ -1411,18 +1411,14 @@ msgstr "別のパーティションを選択"
 msgid "Choose a partition"
 msgstr "パーティションを選択"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "標準モードに切り替え"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "エキスパートモードに切り替え"
+msgid "More"
+msgstr "詳細"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "確認"
@@ -1473,13 +1469,17 @@ msgstr "すべてをクリア"
 msgid "Auto allocate"
 msgstr "自動割り当て"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "詳細"
+msgid "Toggle to normal mode"
+msgstr "標準モードに切り替え"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "エキスパートモードに切り替え"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "ハードドライブの情報"
@@ -1533,7 +1533,12 @@ msgstr "RAID に追加"
 msgid "Add to LVM"
 msgstr "LVM に追加"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ユーザ ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "削除"
@@ -1548,7 +1553,12 @@ msgstr "RAID から削除"
 msgid "Remove from LVM"
 msgstr "LVM から削除"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "LVM から削除"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "RAID を変更"
@@ -1723,7 +1733,27 @@ msgstr ""
 "パーティションリサイズ後のデータの完全性を確認するため、次回の\n"
 "Microsoft Windows® 起動時にファイルシステムチェックが実行されます。"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "ファイルシステムの暗号鍵"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "ファイルシステムの暗号鍵を選んでください"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "暗号鍵"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "追加する RAID を選んでください"
@@ -1838,7 +1868,12 @@ msgstr "変更を反映させるには再起動してください"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "ドライブ %s のパーティションテーブルをディスクに書き込みます"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "パーティション %s をフォーマット中"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1978,7 +2013,27 @@ msgstr "マウント済み\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "暗号鍵"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2082,12 +2137,7 @@ msgstr "パーティションテーブルの種類: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "on channel %d ID %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "ファイルシステムの暗号鍵"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "ファイルシステムの暗号鍵を選んでください"
@@ -2102,12 +2152,7 @@ msgstr "この暗号鍵は簡単すぎます (最低でも %d 文字以上にし
 msgid "The encryption keys do not match"
 msgstr "暗号鍵が一致しません"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "暗号鍵"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "暗号鍵 (再入力)"
@@ -2221,11 +2266,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "/boot/efi にマウントされた FAT パーティションが必要です"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "パーティション %s をフォーマット中"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4645,7 +4685,7 @@ msgstr "ブートローダは複数の物理ボリューム上の /boot を扱�
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4655,7 +4695,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4663,8 +4706,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4684,52 +4727,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4743,9 +4791,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4845,7 +4893,55 @@ msgstr ""
 "場合は最後の手段としてパリ (フランス共和国) の適切な法廷に持ち込みます。\n"
 "この文書に関し不明な点があれば、Mandriva S.A. までご連絡ください。\n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4863,63 +4959,55 @@ msgstr ""
 "(詳しくは http://www.mp3licensing.com をご覧ください) 特許が適用\n"
 "されるかどうか不明な場合は、お住いの国の法律をご確認ください。"
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"警告\n"
-"\n"
-"以下の条項をよくお読みください。少しでも同意できない部分がある\n"
-"場合は、次の CD からのインストールは許可されません。このメディア\n"
-"を使わずにインストールを続ける場合は「拒否する」を選んでください。\n"
-"\n"
-"\n"
-"次の CD に含まれるコンポーネントの中には GPL ライセンスまたは類似\n"
-"のライセンスに準拠しないものがあります。その場合は、それぞれの使用\n"
-"許諾契約に準拠します。該当するコンポーネントを使用または再配布する\n"
-"前に、それぞれの使用許諾契約をよくお読みください。\n"
-"一般的には、転送・バックアップ目的以外の複製・再配布・改悪・分解・\n"
-"再編集・変更はすべて使用許諾契約によって禁じられています。規約に違反\n"
-"すると、使用許諾契約に基づき直ちに使用する権利が失われます。また、\n"
-"使用許諾契約に明記されていない限り、プログラムを複数のシステムにイン\n"
-"ストールすることやネットワーク経由で他のマシンから使用できるように\n"
-"改変することも禁じられています。不明な場合は、プログラムの配布者ま\n"
-"たは編集者にお問い合わせください。ドキュメントを含めそのようなプロ\n"
-"グラムを第三者に転送したりコピーすることは通常禁じられています。\n"
-"\n"
-"\n"
-"次の CD に含まれるコンポーネントのすべての権利はそれぞれの作者に帰属し\n"
-"ソフトウェアに適用される知的財産法・著作権法によって保護されています。\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6799,6 +6887,62 @@ msgstr ""
 msgid "Installation failed"
 msgstr "インストール失敗"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "警告\n"
+#~ "\n"
+#~ "以下の条項をよくお読みください。少しでも同意できない部分がある\n"
+#~ "場合は、次の CD からのインストールは許可されません。このメディア\n"
+#~ "を使わずにインストールを続ける場合は「拒否する」を選んでください。\n"
+#~ "\n"
+#~ "\n"
+#~ "次の CD に含まれるコンポーネントの中には GPL ライセンスまたは類似\n"
+#~ "のライセンスに準拠しないものがあります。その場合は、それぞれの使用\n"
+#~ "許諾契約に準拠します。該当するコンポーネントを使用または再配布する\n"
+#~ "前に、それぞれの使用許諾契約をよくお読みください。\n"
+#~ "一般的には、転送・バックアップ目的以外の複製・再配布・改悪・分解・\n"
+#~ "再編集・変更はすべて使用許諾契約によって禁じられています。規約に違反\n"
+#~ "すると、使用許諾契約に基づき直ちに使用する権利が失われます。また、\n"
+#~ "使用許諾契約に明記されていない限り、プログラムを複数のシステムにイン\n"
+#~ "ストールすることやネットワーク経由で他のマシンから使用できるように\n"
+#~ "改変することも禁じられています。不明な場合は、プログラムの配布者ま\n"
+#~ "たは編集者にお問い合わせください。ドキュメントを含めそのようなプロ\n"
+#~ "グラムを第三者に転送したりコピーすることは通常禁じられています。\n"
+#~ "\n"
+#~ "\n"
+#~ "次の CD に含まれるコンポーネントのすべての権利はそれぞれの作者に帰属し\n"
+#~ "ソフトウェアに適用される知的財産法・著作権法によって保護されています。\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "サーバに libsafe を使う"
 
diff --git a/perl-install/share/po/ko.po b/perl-install/share/po/ko.po
index 47e4e87a9..ac27094a7 100644
--- a/perl-install/share/po/ko.po
+++ b/perl-install/share/po/ko.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2007-09-26 20:12+0200\n"
 "Last-Translator: Jaegeum Cze <baedaron@hanafos.com>\n"
 "Language-Team: Korean <beadaron@hanafos.com>\n"
@@ -1404,18 +1404,14 @@ msgstr "다른 파티션 선택"
 msgid "Choose a partition"
 msgstr "파티션 선택"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "일반 모드로 전환"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "전문가 모드로 전환"
+msgid "More"
+msgstr "추가 옵션"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "확인"
@@ -1466,13 +1462,17 @@ msgstr "모두 삭제"
 msgid "Auto allocate"
 msgstr "자동 할당"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "추가 옵션"
+msgid "Toggle to normal mode"
+msgstr "일반 모드로 전환"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "전문가 모드로 전환"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "하드 디스크 정보"
@@ -1526,7 +1526,12 @@ msgstr "RAID에 추가"
 msgid "Add to LVM"
 msgstr "LVM에 추가"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "사용자 ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "삭제"
@@ -1541,7 +1546,12 @@ msgstr "RAID로부터 제거"
 msgid "Remove from LVM"
 msgstr "LVM으로부터 제거"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "LVM으로부터 제거"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "RAID 수정"
@@ -1712,7 +1722,27 @@ msgstr ""
 "파티션 크기를 조정한 후 데이터의 무결성을 확인하기 위해\n"
 "파일시스템 점검은 Microsoft Windows®로 다음번 부팅할때 작동될 것입니다."
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "파일시스템 암호화 키"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "파일 시스템 암호화 키 선택"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "암호화 키"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "추가할 기존 RAID를 선택하세요."
@@ -1826,7 +1856,12 @@ msgstr "변경된것을 적용하기 위해선 리부팅이 필요합니다."
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "%s 드라이브의 파티션 테이블을 저장합니다."
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "%s 파티션 포맷중"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "%s 파티션을 포맷하면, 모든 데이타를 잃게 됩니다."
@@ -1960,7 +1995,27 @@ msgstr "마운트 되었음\n"
 msgid "RAID %s\n"
 msgstr "레이드 장치 %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "암호화 키"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2063,12 +2118,7 @@ msgstr "파티션 테이블 유형: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "%d 버스상에서 ID %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "파일시스템 암호화 키"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "파일 시스템 암호화 키 선택"
@@ -2083,12 +2133,7 @@ msgstr "이 암호화 키는 너무 단순합니다.( 적어도 %d 글자는 넘
 msgid "The encryption keys do not match"
 msgstr "암호화 키가 일치하지 않습니다."
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "암호화 키"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "암호화 키 (확인)"
@@ -2203,11 +2248,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "「/boot/efi」에 마운트된 FAT 파티션이 있어야만 합니다."
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "%s 파티션 포맷중"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4563,7 +4603,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4571,8 +4614,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4592,52 +4635,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4651,9 +4699,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4674,7 +4722,55 @@ msgid ""
 "For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4686,38 +4782,54 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
+#: messages.pm:123
 #, c-format
 msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
 "\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
 "\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
 "\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
 "\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
diff --git a/perl-install/share/po/ky.po b/perl-install/share/po/ky.po
index 50b34ca92..28f0af1db 100644
--- a/perl-install/share/po/ky.po
+++ b/perl-install/share/po/ky.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-ky\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2005-04-20 20:27+0500\n"
 "Last-Translator: Nurlan Borubaev <nurlan@tamga.info>\n"
 "Language-Team: Kyrgyz\n"
@@ -1425,18 +1425,14 @@ msgstr "Башка бөлүм тандаңыз"
 msgid "Choose a partition"
 msgstr "Бөлүм тандаңыз"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Нормалдык режимге өтүү"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Эксперт режимине өтүү"
+msgid "More"
+msgstr "Көбүрөөк"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "Конфигурациялоо"
@@ -1487,13 +1483,17 @@ msgstr "Бардыгын тазалоо"
 msgid "Auto allocate"
 msgstr "Авто бөлүштүрүү"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Көбүрөөк"
+msgid "Toggle to normal mode"
+msgstr "Нормалдык режимге өтүү"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Эксперт режимине өтүү"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Таш диск жөнүндө маалымат"
@@ -1546,7 +1546,12 @@ msgstr "RAID'га кошуу"
 msgid "Add to LVM"
 msgstr "LVM'ге кошуу"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Колдонуучунун IDси"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Жоготуу"
@@ -1561,7 +1566,12 @@ msgstr "RAID'дан алып салуу"
 msgid "Remove from LVM"
 msgstr "LVM'ден алып салуу"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "LVM'ден алып салуу"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "RAID өзгөртүү"
@@ -1734,7 +1744,27 @@ msgstr ""
 "камсыздоо үчүн, Windows(TM) кийинки жүктөлгөндө\n"
 "файл системасын текшерүү ишке ашырылат"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Файл системасын шифрлөө ачкычы"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Файл системаңыздын шифрлөө ачкычын тандаңыз"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Шифрлөө ачкычы"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Кошуу үчүн бар RAID тандаңыз"
@@ -1849,7 +1879,12 @@ msgstr "Өзгөртүүлөр ишке кирши үчүн системаны �
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "%s түзүлүшү үчүн бөлүмдөр таблицасы дискке жазылат"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "%s бөлүмү форматталууда"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "%s бөлүмүн форматтагандан кийин, андагы бардык берилиштер жоголот"
@@ -1981,7 +2016,27 @@ msgstr "Бириктирилген\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Шифрлөө ачкычы"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2085,12 +2140,7 @@ msgstr "Бөлүмдөр таблицасынын тиби: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "%d каналында id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Файл системасын шифрлөө ачкычы"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Файл системаңыздын шифрлөө ачкычын тандаңыз"
@@ -2105,12 +2155,7 @@ msgstr "Бул шифрлөө ачкычы өтө эле жөнөкөй (кем�
 msgid "The encryption keys do not match"
 msgstr "Шифрлөө ачкычтары дал келишпейт"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Шифрлөө ачкычы"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Шифрлөө ачкычы (кайрадан)"
@@ -2226,11 +2271,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Сизде /boot/efi менен бириктирилген FAT бөлүмү болушу керек"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "%s бөлүмү форматталууда"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4638,7 +4678,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4646,8 +4689,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4667,52 +4710,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4726,9 +4774,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4749,7 +4797,55 @@ msgid ""
 "For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4761,38 +4857,54 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
+#: messages.pm:123
 #, c-format
 msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
 "\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
 "\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
 "\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
 "\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
diff --git a/perl-install/share/po/libDrakX.pot b/perl-install/share/po/libDrakX.pot
index 3b08a4aa0..ed46076de 100644
--- a/perl-install/share/po/libDrakX.pot
+++ b/perl-install/share/po/libDrakX.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1284,17 +1284,12 @@ msgstr ""
 msgid "Choose a partition"
 msgstr ""
 
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376 interactive/curses.pm:512
 #, c-format
-msgid "Toggle to normal mode"
-msgstr ""
-
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to expert mode"
+msgid "More"
 msgstr ""
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277 diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288 diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr ""
@@ -1342,12 +1337,17 @@ msgstr ""
 msgid "Auto allocate"
 msgstr ""
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352 interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
+msgid "Toggle to normal mode"
 msgstr ""
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr ""
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr ""
@@ -1397,7 +1397,12 @@ msgstr ""
 msgid "Add to LVM"
 msgstr ""
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, c-format
+msgid "Use"
+msgstr ""
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr ""
@@ -1412,7 +1417,12 @@ msgstr ""
 msgid "Remove from LVM"
 msgstr ""
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, c-format
+msgid "Remove from dm"
+msgstr ""
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr ""
@@ -1574,7 +1584,27 @@ msgid ""
 "filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr ""
+
+#: diskdrake/interactive.pm:827
+#, c-format
+msgid "Enter your filesystem encryption key"
+msgstr ""
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr ""
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr ""
@@ -1686,7 +1716,12 @@ msgstr ""
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr ""
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr ""
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1831,7 +1866,27 @@ msgid ""
 ""
 msgstr ""
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid "Encrypted"
+msgstr ""
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -1943,12 +1998,7 @@ msgid ""
 ""
 msgstr ""
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr ""
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr ""
@@ -1963,12 +2013,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr ""
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr ""
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr ""
@@ -2075,11 +2120,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr ""
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr ""
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4364,14 +4404,15 @@ msgid ""
 "The operating system and the different components available in the Mandriva Linux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and any applications \n"
+"distributed with these products provided by Mandriva's licensors or suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you explicitly \n"
+"By installing, duplicating or using any of the Software Products in any manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this License. \n"
 "If you disagree with any portion of the License, you are not allowed to install, duplicate or use \n"
 "the Software Products. \n"
@@ -4385,33 +4426,37 @@ msgid ""
 "\n"
 "The Software Products and attached documentation are provided \"as is\", with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever (including without \n"
-"limitation damages for loss of business, interruption of business, financial loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential loss) arising out \n"
-"of the possession and use of software components or arising out of  downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software components or \n"
+"arising out of  downloading software components from one of Mandriva Linux sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
-"The Software Products consist of components created by different persons or entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please read carefully the terms \n"
-"and conditions of the license agreement for each component before using any component. Any question \n"
-"on a component license should be addressed to the component author and not to Mandriva.\n"
+"The Software Products consist of components created by different persons or entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute the components which \n"
+"they cover. Please read carefully the terms and conditions of the license agreement for each component \n"
+"before using any component. Any question on a component license should be addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the documentation for \n"
 "further details.\n"
@@ -4421,8 +4466,8 @@ msgid ""
 "\n"
 "All rights to the components of the Software Products belong to their respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -4438,7 +4483,42 @@ msgid ""
 ""
 msgstr ""
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4448,39 +4528,35 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
+#: messages.pm:123
 #, c-format
 msgid ""
+"6. Additional provisions applicable to those Software Products provided by Google Inc. (\"Google Software\")\n"
 "\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
 "\n"
+"(b)  The Google Software is made available to you for your personal, non-commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google Software.\n"
 "\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
 "\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
-""
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
diff --git a/perl-install/share/po/lt.po b/perl-install/share/po/lt.po
index dc77b11c2..51f41bacc 100644
--- a/perl-install/share/po/lt.po
+++ b/perl-install/share/po/lt.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2000-12-23 13:50+0200\n"
 "Last-Translator: Mykolas Norvai­as <Myka@centras.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -1367,18 +1367,14 @@ msgstr "Sukurti naują skirsnį"
 msgid "Choose a partition"
 msgstr "Pasirink veiksmą"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Pakeisti į normalų režimą"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Pakeisti į eksperto režimą"
+msgid "More"
+msgstr "Dar"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "Nustatymai"
@@ -1428,13 +1424,17 @@ msgstr "Išvalyti viską"
 msgid "Auto allocate"
 msgstr "Automatinis suskirstymas"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Dar"
+msgid "Toggle to normal mode"
+msgstr "Pakeisti į normalų režimą"
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Pakeisti į eksperto režimą"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, fuzzy, c-format
 msgid "Hard drive information"
 msgstr "Pašto informaciją"
@@ -1488,7 +1488,12 @@ msgstr "Pridėti į RAID"
 msgid "Add to LVM"
 msgstr "Pridėti į LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Vartotojo ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Ištrinti"
@@ -1503,7 +1508,12 @@ msgstr "Pašalinti iš RAID"
 msgid "Remove from LVM"
 msgstr "Pašalinti iš LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Pašalinti iš LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Taisyti RAID"
@@ -1669,7 +1679,27 @@ msgid ""
 "filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, fuzzy, c-format
+msgid "Filesystem encryption key"
+msgstr "Bylų sistemos tipas: "
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Bylų sistemos tipas: "
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr ""
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Pasirink jau esantį RAID, prie kurio pridėti"
@@ -1781,7 +1811,12 @@ msgstr "Tau reikia perkrauti, kad pakeitimai būtų veiksmingi"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Įrenginio %s skirsnių lentelė bus įrašyta į diską"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Sužymimas skirsnis %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Sužymėjus skirsnį %s, visi duomenys jame bus prarasti"
@@ -1913,7 +1948,27 @@ msgstr "Primontuotas\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid "Encrypted"
+msgstr ""
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, fuzzy, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2015,12 +2070,7 @@ msgstr "Skirsnių lentelės tipas: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "ant magistralės %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, fuzzy, c-format
-msgid "Filesystem encryption key"
-msgstr "Bylų sistemos tipas: "
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr ""
@@ -2036,12 +2086,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Slaptažodžiai nesutampa"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr ""
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr ""
@@ -2154,11 +2199,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Tu privalai turėti swap skirsnį"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Sužymimas skirsnis %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4512,7 +4552,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4520,8 +4563,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4541,52 +4584,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4600,9 +4648,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4623,7 +4671,55 @@ msgid ""
 "For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4635,68 +4731,55 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
+#: messages.pm:123
 #, c-format
 msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
 "\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
 "\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
 "\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
 "\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Perspėjimas\n"
-"\n"
-"Prašau įdėmiai perskaityti šį susitarimą. Jeigu jūs nesutinkate nors\n"
-"su vienu kunktu jums neleidžiama naudoti šios laikmenos. Paspauskite "
-"'Atmetu', \n"
-"kad tęsti įdiegimą be šios laikmenos.\n"
-"\n"
-"\n"
-"Kaikurie CD esantys komponentai nėra pažymėti \n"
-"GPL Licenzija ar kažkuo panašiu. Tokiu atveju kiekvienas\n"
-"komponentas turi savo licenziją. \n"
-"Prašau pirmiau perskaityti ir sutikti su tomis licenzijomis prieš \n"
-"naudojant arba perduodant tuos komponentus. \n"
-"Tokios licenzijos bandrai sulaiko komponentų perdavimą, kopijavimą \n"
-"(išskyrus rezervinę kopiją), atvirkštinę inžineriją, \n"
-"de-assembly, de-compilation arba modifikavimą. \n"
-"Bet koks susitarimo laužymas atima iš jūsų visas šios licenzijos suteiktas\n"
-"teises. Jeigu jums speciali licenzija nesuteikia įpatinkų įgaliojimų\n"
-"jūs negalite įdiegti šių programų į daugiau negu vieną kompiuterį\n"
-"arba pritaikyti naudoti tinkle. Jei abejojate\n"
-"susisiekite tiesiai su gamintoju. \n"
-"Šių komponentų arba dokumentacijos  perdavimas trečioms šalims\n"
-"yra uždraustas.\n"
-"\n"
-"\n"
-"Visos CD diske esančių komponentų teisės priklauso gerbiamiems\n"
-"jų autoriams ir saugomos intelektualios nuosavybės teises\n"
-"saugančių įstatymų.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6409,6 +6492,68 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Įdiegimas nepavyko"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Perspėjimas\n"
+#~ "\n"
+#~ "Prašau įdėmiai perskaityti šį susitarimą. Jeigu jūs nesutinkate nors\n"
+#~ "su vienu kunktu jums neleidžiama naudoti šios laikmenos. Paspauskite "
+#~ "'Atmetu', \n"
+#~ "kad tęsti įdiegimą be šios laikmenos.\n"
+#~ "\n"
+#~ "\n"
+#~ "Kaikurie CD esantys komponentai nėra pažymėti \n"
+#~ "GPL Licenzija ar kažkuo panašiu. Tokiu atveju kiekvienas\n"
+#~ "komponentas turi savo licenziją. \n"
+#~ "Prašau pirmiau perskaityti ir sutikti su tomis licenzijomis prieš \n"
+#~ "naudojant arba perduodant tuos komponentus. \n"
+#~ "Tokios licenzijos bandrai sulaiko komponentų perdavimą, kopijavimą \n"
+#~ "(išskyrus rezervinę kopiją), atvirkštinę inžineriją, \n"
+#~ "de-assembly, de-compilation arba modifikavimą. \n"
+#~ "Bet koks susitarimo laužymas atima iš jūsų visas šios licenzijos "
+#~ "suteiktas\n"
+#~ "teises. Jeigu jums speciali licenzija nesuteikia įpatinkų įgaliojimų\n"
+#~ "jūs negalite įdiegti šių programų į daugiau negu vieną kompiuterį\n"
+#~ "arba pritaikyti naudoti tinkle. Jei abejojate\n"
+#~ "susisiekite tiesiai su gamintoju. \n"
+#~ "Šių komponentų arba dokumentacijos  perdavimas trečioms šalims\n"
+#~ "yra uždraustas.\n"
+#~ "\n"
+#~ "\n"
+#~ "Visos CD diske esančių komponentų teisės priklauso gerbiamiems\n"
+#~ "jų autoriams ir saugomos intelektualios nuosavybės teises\n"
+#~ "saugančių įstatymų.\n"
+
 #, fuzzy
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Pasirink serverio nuostatas"
diff --git a/perl-install/share/po/ltg.po b/perl-install/share/po/ltg.po
index 0c29a0a5d..d0d5f8c00 100644
--- a/perl-install/share/po/ltg.po
+++ b/perl-install/share/po/ltg.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2004-02-24 13:01+0200\n"
 "Last-Translator: Māris Laureckis <linux@latgola.lv>\n"
 "Language-Team: Latgalian <linux@latgola.lv>\n"
@@ -1391,18 +1391,14 @@ msgstr "Izavielejit cytu sadaļu"
 msgid "Choose a partition"
 msgstr "Izavielejit sadaļu"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Puorsaslēgt normalajā režimā"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Puorsaslēgt eksperta režimā"
+msgid "More"
+msgstr "Vairuok"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "Konfiguraceja"
@@ -1454,13 +1450,17 @@ msgstr "Vysu dzēst"
 msgid "Auto allocate"
 msgstr "Izvītuot automatiski"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Vairuok"
+msgid "Toggle to normal mode"
+msgstr "Puorsaslēgt normalajā režimā"
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Puorsaslēgt eksperta režimā"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Cītuo diska informaceja"
@@ -1514,7 +1514,12 @@ msgstr "Pīvīnuot pi RAID"
 msgid "Add to LVM"
 msgstr "Pīvīnuot pi LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Lītuotuoja ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Izdzēst"
@@ -1529,7 +1534,12 @@ msgstr "Izjimt nu RAID"
 msgid "Remove from LVM"
 msgstr "Izjimt nu LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Izjimt nu LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Maineit RAID"
@@ -1701,7 +1711,27 @@ msgid ""
 "filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Failsistemys šifreišonys atslāga"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Izavielejit jiusu failsistemys šifreišonys atslāgu"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Šifreišonys atslāga"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Nūruodit eksistejūšu RAID, kam pīvīnuot"
@@ -1813,7 +1843,12 @@ msgstr "Lai izmainis stuotūs spākā, jiusim ir juopuorstartej dators"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Īkuortys %s sadaļu tabula tiks īraksteita iz diska"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formateju sadaļu %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1946,7 +1981,27 @@ msgstr "Monteita\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Šifreišonys atslāga"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2050,12 +2105,7 @@ msgstr "sadaļu tabulys tips: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "uz šinas %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Failsistemys šifreišonys atslāga"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Izavielejit jiusu failsistemys šifreišonys atslāgu"
@@ -2071,12 +2121,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Šifreišonys atslāgys nasakreit"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Šifreišonys atslāga"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Šifreišonys atslāga (vēlreiz)"
@@ -2191,11 +2236,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Jiusim ir napīcīšoma /boot/efi monteita FAT sadaļa"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formateju sadaļu %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4579,7 +4619,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4587,8 +4630,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4608,52 +4651,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4667,9 +4715,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4690,7 +4738,55 @@ msgid ""
 "For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4702,71 +4798,55 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
+#: messages.pm:123
 #, c-format
 msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
 "\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
 "\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
 "\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
 "\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Breidynuojums\n"
-"\n"
-"Lyudzu ryupeigi izlosit zemļuok esūšūs nūsaciejumus. Ja jius napīkreitot "
-"kaidai\n"
-"tuos daļai, jius nadreikstit instalēt nu ituo CD. Nūspīdit 'Nūraideit', lai\n"
-"turpynuotu instaleišonu, naizmontojūt itū datu nesieju.\n"
-"\n"
-"\n"
-"Daži itymā CD datu nesiejā asūšī komponenti nav pakļauti GPL licencei voi\n"
-"leidzeigim leigumim. Kotra itaida komponenta izmontuošonu nūsoka atseviškis\n"
-"licencis nūteikumi i nūsaciejumi. Lyudzu ryupeigi tū izlosit i īvārojit\n"
-"tuos nūsaciejumus, pyrms izmontuot voi izplateit uzskaiteitūs komponentus.\n"
-"Ituos licencis puorsvorā aizlīgs jiusim puorsyuteit, dublēt (izjamūt "
-"rezervis\n"
-"kopeišonys nūlyukūs), izplateit tuoļuok, reversi uzbyuvēt, de-asamblēt,\n"
-"de-kompilēt voi modificēt itū komponentu. Jebkurs ituos vīnuošonuos "
-"puorkuopums\n"
-"jiusim automatiski atjims tīseibys, kū pīškeiruse attīceiguo licence. "
-"Izjamūt\n"
-"gadīņus, kod konkretuos licencis nūsaciejumi jiusim dūd šaidys tīseibys, "
-"jius\n"
-"parosti nadreikstot instalēt šaidu programmu iz vairuok, kai vīnys sistemys\n"
-"voi pīlāguot tū izmontuošonai teiklā. Ja šaubatēs, lyudzu sasazynojit ar\n"
-"komponenta izplateituoju voi redaktoru.\n"
-"Šaidu komponentu, tymā skaitā ari īkļautuos dokumentacejis, nūdūšona\n"
-"trešajom personom voi kopeišona parosti ir aizlīgta.\n"
-"\n"
-"\n"
-"Vysys nuokūšajā CD datu nesiejā īkļauto komponentu tīseibys pīder tū\n"
-"attīceigajim autorim, i tuos aizsargoj intelektualuo īpašuma i\n"
-"autortīseibu lykumi, kas atsatiec iz programmnūdrūšynuojumu.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6498,6 +6578,75 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Instalaceja naizadeve"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Breidynuojums\n"
+#~ "\n"
+#~ "Lyudzu ryupeigi izlosit zemļuok esūšūs nūsaciejumus. Ja jius napīkreitot "
+#~ "kaidai\n"
+#~ "tuos daļai, jius nadreikstit instalēt nu ituo CD. Nūspīdit 'Nūraideit', "
+#~ "lai\n"
+#~ "turpynuotu instaleišonu, naizmontojūt itū datu nesieju.\n"
+#~ "\n"
+#~ "\n"
+#~ "Daži itymā CD datu nesiejā asūšī komponenti nav pakļauti GPL licencei "
+#~ "voi\n"
+#~ "leidzeigim leigumim. Kotra itaida komponenta izmontuošonu nūsoka "
+#~ "atseviškis\n"
+#~ "licencis nūteikumi i nūsaciejumi. Lyudzu ryupeigi tū izlosit i īvārojit\n"
+#~ "tuos nūsaciejumus, pyrms izmontuot voi izplateit uzskaiteitūs "
+#~ "komponentus.\n"
+#~ "Ituos licencis puorsvorā aizlīgs jiusim puorsyuteit, dublēt (izjamūt "
+#~ "rezervis\n"
+#~ "kopeišonys nūlyukūs), izplateit tuoļuok, reversi uzbyuvēt, de-asamblēt,\n"
+#~ "de-kompilēt voi modificēt itū komponentu. Jebkurs ituos vīnuošonuos "
+#~ "puorkuopums\n"
+#~ "jiusim automatiski atjims tīseibys, kū pīškeiruse attīceiguo licence. "
+#~ "Izjamūt\n"
+#~ "gadīņus, kod konkretuos licencis nūsaciejumi jiusim dūd šaidys tīseibys, "
+#~ "jius\n"
+#~ "parosti nadreikstot instalēt šaidu programmu iz vairuok, kai vīnys "
+#~ "sistemys\n"
+#~ "voi pīlāguot tū izmontuošonai teiklā. Ja šaubatēs, lyudzu sasazynojit ar\n"
+#~ "komponenta izplateituoju voi redaktoru.\n"
+#~ "Šaidu komponentu, tymā skaitā ari īkļautuos dokumentacejis, nūdūšona\n"
+#~ "trešajom personom voi kopeišona parosti ir aizlīgta.\n"
+#~ "\n"
+#~ "\n"
+#~ "Vysys nuokūšajā CD datu nesiejā īkļauto komponentu tīseibys pīder tū\n"
+#~ "attīceigajim autorim, i tuos aizsargoj intelektualuo īpašuma i\n"
+#~ "autortīseibu lykumi, kas atsatiec iz programmnūdrūšynuojumu.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Lītuot libsafe prīkš serverim"
 
diff --git a/perl-install/share/po/lv.po b/perl-install/share/po/lv.po
index 779c53830..158ddab98 100644
--- a/perl-install/share/po/lv.po
+++ b/perl-install/share/po/lv.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2002-09-27 17:45+0200\n"
 "Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
 "Language-Team: Latvian <ll10nt@listes.murds.lv>\n"
@@ -1389,18 +1389,14 @@ msgstr "Izvēlieties citu sadaļu"
 msgid "Choose a partition"
 msgstr "Izvēlieties sadaļu"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Pārslēgt normālajā režīmā"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Pārslēgt eksperta režīmā"
+msgid "More"
+msgstr "Vairāk"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "Konfigurācija"
@@ -1448,13 +1444,17 @@ msgstr "Visu dzēst"
 msgid "Auto allocate"
 msgstr "Izvietot automātiski"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Vairāk"
+msgid "Toggle to normal mode"
+msgstr "Pārslēgt normālajā režīmā"
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Pārslēgt eksperta režīmā"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Cietā diska informācija"
@@ -1508,7 +1508,12 @@ msgstr "Pievienot pie RAID"
 msgid "Add to LVM"
 msgstr "Pievienot LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Lietotāja ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Izdzēst"
@@ -1523,7 +1528,12 @@ msgstr "Izslēgt no RAID"
 msgid "Remove from LVM"
 msgstr "Izņemt no LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Izņemt no LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Mainīt RAID"
@@ -1695,7 +1705,27 @@ msgid ""
 "filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Failsistēmas šifrēšanas atslēga"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Izvēlieties jūsu failsistēmas šifrēšanas atslēgu"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Šifrēšanas atslēga"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Norādiet eksistējošu RAID, kam pievienot"
@@ -1807,7 +1837,12 @@ msgstr "Lai izmaiņas stātos spēkā, jums ir jāpārstartē dators"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Iekārtas %s sadaļu tabula tiks ierakstīta uz diska"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formatēju sadaļu %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1940,7 +1975,27 @@ msgstr "Montēta\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Šifrēšanas atslēga"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2044,12 +2099,7 @@ msgstr "sadaļu tabulas tips: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "uz šinas %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Failsistēmas šifrēšanas atslēga"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Izvēlieties jūsu failsistēmas šifrēšanas atslēgu"
@@ -2064,12 +2114,7 @@ msgstr "Šifrēšanas atslēga ir pārāk vienkārša (jābūt vismaz %d simbolu
 msgid "The encryption keys do not match"
 msgstr "Šifrēšanas atslēgas nesakrīt"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Šifrēšanas atslēga"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Šifrēšanas atslēga (vēlreiz)"
@@ -2184,11 +2229,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Jums ir nepieciešama /boot/efi montēta FAT sadaļa"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formatēju sadaļu %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4570,7 +4610,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4578,8 +4621,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4599,52 +4642,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4658,9 +4706,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4681,7 +4729,55 @@ msgid ""
 "For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4693,66 +4789,55 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
+#: messages.pm:123
 #, c-format
 msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
 "\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
 "\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
 "\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
 "\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Brīdinājums\n"
-"\n"
-"Lūdzu rūpīgi izlasiet zemāk esošos nosacījumus. Ja jūs nepiekrītat kādai\n"
-"to daļai, jūs nedrīkstat instalēt no šī CD. Nospiediet 'Noraidīt', lai\n"
-"turpinātu instalēšanu, neizmantojot šo datu nesēju.\n"
-"\n"
-"\n"
-"Daži šajā CD datu nesējā esošie komponenti nav pakļauti GPL licencei vai\n"
-"līdzīgiem līgumiem. Katra šāda komponenta izmantošanu nosaka atsevišķas\n"
-"licences noteikumi un nosacījumi. Lūdzu rūpīgi to izlasiet un ievērojiet\n"
-"tās nosacījumus, pirms izmantot vai izplatīt uzskaitītos komponentus.\n"
-"Šīs licences pārsvarā aizliegs jums pārsūtīt, dublēt (izņemot rezerves\n"
-"kopēšanas nolūkus), izplatīt tālāk, reversi uzbūvēt, de-asamblēt,\n"
-"de-kompilēt vai modificēt šo kompomentu. Jebkurš šīs vienošanās pārkāpums\n"
-"jums automātiski atņems tiesības, ko piešķīrusi attiecīgā licence. Izņemot\n"
-"gadījumus, kad konkrētas licences nosacījumi jums dod šādas tiesības, jūs\n"
-"parasti nedrīkstat instalēt šādu programmu uz vairāk, kā vienas sistēmas\n"
-"vai pielāgot to izmantošanai tīklā. Ja šaubaties, lūdzu sazinieties ar\n"
-"komponenta izplatītāju vai redaktoru.\n"
-"Šādu komponentu, tajā skaitā arī iekļautās dokumentācijas, nodošana\n"
-"trešajām personām vai kopēšana parasti ir aizliegta.\n"
-"\n"
-"\n"
-"Visas nākamajā CD datu nesējā iekļauto komponentu tiesības pieder to\n"
-"attiecīgajiem autoriem, un tās aizsargā intelektuālā īpašuma un\n"
-"autortiesību likumi, kas attiecas uz programnodrošinājumu.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6472,6 +6557,68 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Instalēšana neizdevās"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Brīdinājums\n"
+#~ "\n"
+#~ "Lūdzu rūpīgi izlasiet zemāk esošos nosacījumus. Ja jūs nepiekrītat kādai\n"
+#~ "to daļai, jūs nedrīkstat instalēt no šī CD. Nospiediet 'Noraidīt', lai\n"
+#~ "turpinātu instalēšanu, neizmantojot šo datu nesēju.\n"
+#~ "\n"
+#~ "\n"
+#~ "Daži šajā CD datu nesējā esošie komponenti nav pakļauti GPL licencei vai\n"
+#~ "līdzīgiem līgumiem. Katra šāda komponenta izmantošanu nosaka atsevišķas\n"
+#~ "licences noteikumi un nosacījumi. Lūdzu rūpīgi to izlasiet un ievērojiet\n"
+#~ "tās nosacījumus, pirms izmantot vai izplatīt uzskaitītos komponentus.\n"
+#~ "Šīs licences pārsvarā aizliegs jums pārsūtīt, dublēt (izņemot rezerves\n"
+#~ "kopēšanas nolūkus), izplatīt tālāk, reversi uzbūvēt, de-asamblēt,\n"
+#~ "de-kompilēt vai modificēt šo kompomentu. Jebkurš šīs vienošanās "
+#~ "pārkāpums\n"
+#~ "jums automātiski atņems tiesības, ko piešķīrusi attiecīgā licence. "
+#~ "Izņemot\n"
+#~ "gadījumus, kad konkrētas licences nosacījumi jums dod šādas tiesības, "
+#~ "jūs\n"
+#~ "parasti nedrīkstat instalēt šādu programmu uz vairāk, kā vienas sistēmas\n"
+#~ "vai pielāgot to izmantošanai tīklā. Ja šaubaties, lūdzu sazinieties ar\n"
+#~ "komponenta izplatītāju vai redaktoru.\n"
+#~ "Šādu komponentu, tajā skaitā arī iekļautās dokumentācijas, nodošana\n"
+#~ "trešajām personām vai kopēšana parasti ir aizliegta.\n"
+#~ "\n"
+#~ "\n"
+#~ "Visas nākamajā CD datu nesējā iekļauto komponentu tiesības pieder to\n"
+#~ "attiecīgajiem autoriem, un tās aizsargā intelektuālā īpašuma un\n"
+#~ "autortiesību likumi, kas attiecas uz programnodrošinājumu.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Lietot libsafe priekš serveriem"
 
diff --git a/perl-install/share/po/mk.po b/perl-install/share/po/mk.po
index 13acea476..70b7145c9 100644
--- a/perl-install/share/po/mk.po
+++ b/perl-install/share/po/mk.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-mk\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2004-11-03 18:47+0100\n"
 "Last-Translator: Зоран Димовски <decata@mt.net.mk>\n"
 "Language-Team: Macedonian <mkde-l10n@lists.sourceforge.net>\n"
@@ -1404,18 +1404,14 @@ msgstr "Изберете друга партиција"
 msgid "Choose a partition"
 msgstr "Изберете партиција"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Префрлање во нормален режим"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Префрлање во експертски режим"
+msgid "More"
+msgstr "Повеќе"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Потврдување"
@@ -1466,13 +1462,17 @@ msgstr "Исчисти се"
 msgid "Auto allocate"
 msgstr "Авто-алоцирање"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Повеќе"
+msgid "Toggle to normal mode"
+msgstr "Префрлање во нормален режим"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Префрлање во експертски режим"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Информации за дискот"
@@ -1526,7 +1526,12 @@ msgstr "Додај на RAID"
 msgid "Add to LVM"
 msgstr "Додај на LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Кориснички ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Избриши"
@@ -1541,7 +1546,12 @@ msgstr "Отстрани од RAID"
 msgid "Remove from LVM"
 msgstr "Отстрани од LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Отстрани од LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Измени RAID"
@@ -1715,7 +1725,27 @@ msgid ""
 "filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Клуч за криптирање на фајлсистемот"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Изберете го клучот за криптирање на фајлсистемот"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Криптирачки клуч"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Изберете постоечки RAID на кој да се додаде"
@@ -1829,7 +1859,12 @@ msgstr ""
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Партициската табела на дискот %s ќе биде запишана на дискот"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Форматирање на партицијата %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1963,7 +1998,27 @@ msgstr "Монтирано\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Криптирачки клуч"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2067,12 +2122,7 @@ msgstr "Тип на партициска табела: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "на канал %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Клуч за криптирање на фајлсистемот"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Изберете го клучот за криптирање на фајлсистемот"
@@ -2088,12 +2138,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Криптирачките клучеви не се совпаѓаат"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Криптирачки клуч"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Криптирачки клуч (повторно)"
@@ -2206,11 +2251,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Мора да имате FAT партиција монтирана на /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Форматирање на партицијата %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4656,7 +4696,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4664,8 +4707,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4685,52 +4728,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4744,9 +4792,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4862,7 +4910,55 @@ msgstr ""
 "Париз - Франиција. За било какви прашања во врска со овој документ,\n"
 "контактирајте го Mandriva S.A.\n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4874,69 +4970,55 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Внимание\n"
-"\n"
-"Внимателно прочитајте ги следниве услови. Ако не се согласувате\n"
-"со било кој дел, не Ви е дозволено да инсталирате од следните цедиња.\n"
-"Притиснете \"Одбиј\" за да продолжите со инсталирање без овие медиуми.\n"
-"\n"
-"\n"
-"Некои компоненти на следниве цедиња не потпаѓаат под лиценцата GPL \n"
-"или некои слични договори. Секоја од таквите компоненти во таков\n"
-"случај потпаѓа под термините и условите на сопствената лиценца. \n"
-"Внимателно прочитајте ги и прифатете ги таквите специфични лиценци \n"
-"пред да ги користите или редистрибуирате овие компоненти. \n"
-"Општо земено, таквите лиценци забрануваат трансфер, копирање \n"
-"(освен во цел на бекап), редистрибуирање, обратно инжинерство (reverse\n"
-"engineering), дисасемблирање или модификација на компонентите.\n"
-"Секое прекршување на договорот автоматски ќе ги терминира Вашите\n"
-"права под конкретната лиценца. Освен ако специфичните лиценци Ви\n"
-"дозволуваат, обично не можете да ги инсталирате програмите на повеќе\n"
-"од еден систем, или да ги адаптирате да се користат мрежно. Ако сте\n"
-"во двоумење, контактирајте го дистрибутерот или уредникот на \n"
-"компонентата директно.\n"
-"Трансфер на трети лица или копирање на таквите компоненти, \n"
-"вклучувајќи ја документацијата, е обично забрането.\n"
-"\n"
-"\n"
-"Сите права на компонентите на следните цеде-медиуми припаѓаат\n"
-"на нивните соодветни автори и се заштите со законите за интелектуална\n"
-"сопственост и авторски права (copyright laws) што се применливи за\n"
-"софтверски програми.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6795,6 +6877,68 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Неуспешна инсталација"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Внимание\n"
+#~ "\n"
+#~ "Внимателно прочитајте ги следниве услови. Ако не се согласувате\n"
+#~ "со било кој дел, не Ви е дозволено да инсталирате од следните цедиња.\n"
+#~ "Притиснете \"Одбиј\" за да продолжите со инсталирање без овие медиуми.\n"
+#~ "\n"
+#~ "\n"
+#~ "Некои компоненти на следниве цедиња не потпаѓаат под лиценцата GPL \n"
+#~ "или некои слични договори. Секоја од таквите компоненти во таков\n"
+#~ "случај потпаѓа под термините и условите на сопствената лиценца. \n"
+#~ "Внимателно прочитајте ги и прифатете ги таквите специфични лиценци \n"
+#~ "пред да ги користите или редистрибуирате овие компоненти. \n"
+#~ "Општо земено, таквите лиценци забрануваат трансфер, копирање \n"
+#~ "(освен во цел на бекап), редистрибуирање, обратно инжинерство (reverse\n"
+#~ "engineering), дисасемблирање или модификација на компонентите.\n"
+#~ "Секое прекршување на договорот автоматски ќе ги терминира Вашите\n"
+#~ "права под конкретната лиценца. Освен ако специфичните лиценци Ви\n"
+#~ "дозволуваат, обично не можете да ги инсталирате програмите на повеќе\n"
+#~ "од еден систем, или да ги адаптирате да се користат мрежно. Ако сте\n"
+#~ "во двоумење, контактирајте го дистрибутерот или уредникот на \n"
+#~ "компонентата директно.\n"
+#~ "Трансфер на трети лица или копирање на таквите компоненти, \n"
+#~ "вклучувајќи ја документацијата, е обично забрането.\n"
+#~ "\n"
+#~ "\n"
+#~ "Сите права на компонентите на следните цеде-медиуми припаѓаат\n"
+#~ "на нивните соодветни автори и се заштите со законите за интелектуална\n"
+#~ "сопственост и авторски права (copyright laws) што се применливи за\n"
+#~ "софтверски програми.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Користење libsafe за сервери"
 
diff --git a/perl-install/share/po/mn.po b/perl-install/share/po/mn.po
index d6585939c..18d22a696 100644
--- a/perl-install/share/po/mn.po
+++ b/perl-install/share/po/mn.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2004-01-02 00:35+0100\n"
 "Last-Translator: Sanlig Badral <Badral@openmn.org>\n"
 "Language-Team: Mongolian <openmn-core@lists.sf.net>\n"
@@ -1352,18 +1352,14 @@ msgstr "Ондоо хуваалт сонго"
 msgid "Choose a partition"
 msgstr "Сонгох"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr ""
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Мэргэжилтний горимд шилжүүлэх"
+msgid "More"
+msgstr "Илүү"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "Тохиргоо"
@@ -1411,13 +1407,17 @@ msgstr "Устгах"
 msgid "Auto allocate"
 msgstr "Авто"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Илүү"
+msgid "Toggle to normal mode"
+msgstr ""
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Мэргэжилтний горимд шилжүүлэх"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Хатуу диск хөтлөгчийн мэдээлэл"
@@ -1469,7 +1469,12 @@ msgstr "RAID руу нэмэх"
 msgid "Add to LVM"
 msgstr "Нэмэх"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Хэрэглэгчийн ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Устгах"
@@ -1484,7 +1489,12 @@ msgstr "Устгах"
 msgid "Remove from LVM"
 msgstr "LVM-с устгах"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "LVM-с устгах"
+
+#: diskdrake/interactive.pm:412
 #, fuzzy, c-format
 msgid "Modify RAID"
 msgstr "Өөрчлөх"
@@ -1648,7 +1658,27 @@ msgid ""
 "filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr "тийш с Цонхнууд"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, fuzzy, c-format
+msgid "Filesystem encryption key"
+msgstr "Файлын систем"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Сонгох"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr ""
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Тийш нэмэхийн тулд одоо байгаа RAID-ийг сонгоно уу"
@@ -1760,7 +1790,12 @@ msgstr "Та хүснэгт"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "%s хөтлөгчийн хуваалтын хүснэгт нь одоо диск рүү бичигдэх болно"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr ""
+
+#: diskdrake/interactive.pm:1164
 #, fuzzy, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1894,7 +1929,27 @@ msgstr ""
 msgid "RAID %s\n"
 msgstr ""
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid "Encrypted"
+msgstr ""
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -1986,12 +2041,7 @@ msgstr "Хуваалтын хүснэгтийн төрөл: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "Нээх"
 
-#: diskdrake/interactive.pm:1295
-#, fuzzy, c-format
-msgid "Filesystem encryption key"
-msgstr "Файлын систем"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, fuzzy, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Сонгох"
@@ -2006,12 +2056,7 @@ msgstr "бол"
 msgid "The encryption keys do not match"
 msgstr ""
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr ""
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr ""
@@ -2122,11 +2167,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr ""
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr ""
-
 #: fs/format.pm:67
 #, fuzzy, c-format
 msgid "Creating and formatting file %s"
@@ -4441,7 +4481,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4449,8 +4492,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4470,52 +4513,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4529,9 +4577,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4552,7 +4600,55 @@ msgid ""
 "For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4564,41 +4660,55 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, fuzzy, c-format
+#: messages.pm:123
+#, c-format
 msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
 "\n"
-"Warning\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
 "\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
 "\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
 "\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"г вы вы CD г г ямх CD Бүрдэл хэсэг бол аас ямх ерөнхий г аас Бүрдэл хэсэг "
-"аас вы вы Томоор аас Бүрдэл хэсэг аас бол г г аас CD"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6265,6 +6375,41 @@ msgid "Installation failed"
 msgstr "Хэлбэр!"
 
 #, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "г вы вы CD г г ямх CD Бүрдэл хэсэг бол аас ямх ерөнхий г аас Бүрдэл хэсэг "
+#~ "аас вы вы Томоор аас Бүрдэл хэсэг аас бол г г аас CD"
+
+#, fuzzy
 #~ msgid "Precise RAM size if needed (found %d MB)"
 #~ msgstr "хэмжээ МБ"
 
diff --git a/perl-install/share/po/ms.po b/perl-install/share/po/ms.po
index 4f9b14936..318f07d3a 100644
--- a/perl-install/share/po/ms.po
+++ b/perl-install/share/po/ms.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libDrakX\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-05-04 13:34+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -1354,18 +1354,14 @@ msgstr "Pilih Warna Skrin"
 msgid "Choose a partition"
 msgstr "Maklumat petak"
 
-#: diskdrake/interactive.pm:259
-#, fuzzy, c-format
-msgid "Toggle to normal mode"
-msgstr "Selamat datang ke %s - Mod Menyelamat"
-
-#: diskdrake/interactive.pm:259
-#, fuzzy, c-format
-msgid "Toggle to expert mode"
-msgstr "/Mod pakar dalam _wizard"
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
+#, c-format
+msgid "More"
+msgstr "Lagi"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Pengesahan"
@@ -1413,13 +1409,17 @@ msgstr "P&adam Semua"
 msgid "Auto allocate"
 msgstr " Auto Kemaskini"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
-#, c-format
-msgid "More"
-msgstr "Lagi"
+#: diskdrake/interactive.pm:320
+#, fuzzy, c-format
+msgid "Toggle to normal mode"
+msgstr "Selamat datang ke %s - Mod Menyelamat"
+
+#: diskdrake/interactive.pm:320
+#, fuzzy, c-format
+msgid "Toggle to expert mode"
+msgstr "/Mod pakar dalam _wizard"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, fuzzy, c-format
 msgid "Hard drive information"
 msgstr "Maklumat Peranti Terlampir"
@@ -1471,7 +1471,12 @@ msgstr "Tambah kepada template"
 msgid "Add to LVM"
 msgstr "Tambah kepada template"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ID Pengguna"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Padam"
@@ -1486,7 +1491,12 @@ msgstr "Buang Ciri-ciri daripada Gaya"
 msgid "Remove from LVM"
 msgstr "Buang Ciri-ciri daripada Gaya"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Buang Ciri-ciri daripada Gaya"
+
+#: diskdrake/interactive.pm:412
 #, fuzzy, c-format
 msgid "Modify RAID"
 msgstr "Ubahsuai Gaya"
@@ -1650,7 +1660,27 @@ msgid ""
 "filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr "Kepada on Tetingkap"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, fuzzy, c-format
+msgid "Filesystem encryption key"
+msgstr "Gugusan Kunci OpenPGP"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Gugusan Kunci OpenPGP"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Kekunci enkripsi"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, fuzzy, c-format
 msgid "Choose an existing RAID to add to"
 msgstr ""
@@ -1766,7 +1796,12 @@ msgstr ""
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Partisyen"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, fuzzy, c-format
+msgid "Formatting partition %s"
+msgstr "Maklumat petak"
+
+#: diskdrake/interactive.pm:1164
 #, fuzzy, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "on"
@@ -1898,7 +1933,27 @@ msgstr "DVD Terlekap"
 msgid "RAID %s\n"
 msgstr "RAD"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Kekunci enkripsi"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, fuzzy, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -1990,12 +2045,7 @@ msgstr "Jenis Senarai Semasa"
 msgid "on channel %d id %d\n"
 msgstr "dikemaskini pada %(date)s"
 
-#: diskdrake/interactive.pm:1295
-#, fuzzy, c-format
-msgid "Filesystem encryption key"
-msgstr "Gugusan Kunci OpenPGP"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr ""
@@ -2010,12 +2060,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Katalaluan root tidak sepadan."
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Kekunci enkripsi"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, fuzzy, c-format
 msgid "Encryption key (again)"
 msgstr "Gugusan Kunci OpenPGP"
@@ -2128,11 +2173,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "terpasang dalam"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, fuzzy, c-format
-msgid "Formatting partition %s"
-msgstr "Maklumat petak"
-
 #: fs/format.pm:67
 #, fuzzy, c-format
 msgid "Creating and formatting file %s"
@@ -4442,7 +4482,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4450,8 +4493,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4471,52 +4514,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4530,9 +4578,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4557,7 +4605,55 @@ msgstr ""
 "dalam dan dan Umum dan A Dokumentasi A Kanan: dan dan A dalam dan dan A dan "
 "Perancis on keluar Perancis on A"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4569,39 +4665,55 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, fuzzy, c-format
+#: messages.pm:123
+#, c-format
 msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
 "\n"
-"Warning\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
 "\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
 "\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
 "\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
-msgstr "dalam dan dan dalam on on Masuk dan dan"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
+msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6222,6 +6334,39 @@ msgid "Installation failed"
 msgstr "Instalasi gagal"
 
 #, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr "dalam dan dan dalam on on Masuk dan dan"
+
+#, fuzzy
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Guna pembentukan glyph untuk Hebrew"
 
diff --git a/perl-install/share/po/mt.po b/perl-install/share/po/mt.po
index 4c3b38102..8bc20f6ec 100644
--- a/perl-install/share/po/mt.po
+++ b/perl-install/share/po/mt.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mt\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2004-10-04 18:45+0200\n"
 "Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
 "Language-Team: Maltese <mt@li.org>\n"
@@ -1417,18 +1417,14 @@ msgstr "Agħżel partizzjoni oħra"
 msgid "Choose a partition"
 msgstr "Agħżel partizzjoni"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Lura f'modalità normali"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Idħol f'modalità għal esperti"
+msgid "More"
+msgstr "Iżjed"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "Konfigurazzjoni"
@@ -1478,13 +1474,17 @@ msgstr "Neħħi kollox"
 msgid "Auto allocate"
 msgstr "Awto-allokazzjoni"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Iżjed"
+msgid "Toggle to normal mode"
+msgstr "Lura f'modalità normali"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Idħol f'modalità għal esperti"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Informazzjoni dwar il-ħard disk"
@@ -1538,7 +1538,12 @@ msgstr "Żid ma' RAID"
 msgid "Add to LVM"
 msgstr "Żid ma' LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ID tal-utent"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Ħassar"
@@ -1553,7 +1558,12 @@ msgstr "Neħħi mir-RAID"
 msgid "Remove from LVM"
 msgstr "Neħħi mill-LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Neħħi mill-LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Biddel RAID"
@@ -1732,7 +1742,27 @@ msgstr ""
 "(jiet),\n"
 "se jiġu ċċekkjati l-filesystems meta terġa' tibbutja l-Windows(TM)"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Ċavetta taċ-ċifrazzjoni tal-filesystem (password)"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Agħżel ċavetta għaċ-ċifrazzjoni tal-filesystem"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Ċavetta taċ-ċifrazzjoni"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Agħżel RAID eżistenti biex iżżid miegħu"
@@ -1844,7 +1874,12 @@ msgstr "Trid tirristartja sabiex il-bidliet ikollhom effett."
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "It-tabella tal-partizzjonijiet tad-diska %s se tinkiteb fuq id-diska."
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Qed nifformattja partizzjoni %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1977,7 +2012,27 @@ msgstr "Immuntat\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Ċavetta taċ-ċifrazzjoni"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2081,12 +2136,7 @@ msgstr "Tip ta' tabella tal-partizzjonijiet: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "fuq kanal %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Ċavetta taċ-ċifrazzjoni tal-filesystem (password)"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Agħżel ċavetta għaċ-ċifrazzjoni tal-filesystem"
@@ -2103,12 +2153,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Iċ-ċifrarji ma jaqblux"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Ċavetta taċ-ċifrazzjoni"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Ċavetta taċ-ċifrazzjoni (darb' oħra)"
@@ -2223,11 +2268,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Għandek bżonn partizzjoni FAT immuntata fuq /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Qed nifformattja partizzjoni %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4664,7 +4704,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4672,8 +4715,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4693,52 +4736,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4752,9 +4800,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4775,7 +4823,55 @@ msgid ""
 "For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4793,72 +4889,55 @@ msgstr ""
 "(ara http://www.mp3licensing.com għal dettalji). Jekk m'intix ċert jekk\n"
 "patent japplikax għalik, iċċekkja l-liġijiet lokali."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Twissija\n"
-"\n"
-"Jekk jogħġbok aqra sew it-termini ta' taħt. Jekk ma taqbilx ma xi parti,\n"
-"ma tistax tinstalla s-CD li jmiss. Agħfas \"Ma naċċettax\" biex tkompli \n"
-"l-installazzjoni minngħajr dan is-CD.\n"
-"\n"
-"\n"
-"Xi komponenti tas-CD li jmiss ma jaqgħux taħt il-liċenzja GPL jew liċenzji\n"
-"simili. Kull komponent simili għalhekk huwa kontrollat mit-termini u\n"
-"kundizzjonijiet tal-liċenzja speċifika tiegħu. Jekk jogħġbok aqra sew\n"
-"u segwi dawn il-liċenzji speċifiċi qabel tuża jew tiddistribwixxi dawn il-\n"
-"komponenti.\n"
-"Dawn il-liċenzji ġeneralment jipprojbixxu t-trasferiment, ikkupjar (ħlief \n"
-"bħala kopja tas-sigurtà), ridistribuzzjoni, \"reverse engineering\", "
-"diżassemblaġġ,\n"
-"dikompilazzjoni jew modifika ta' dawn il-komponenti. Ksur ta' dan\n"
-"il-qbil jittermina immedjatament id-drittijiet tiegħek taħt din il-"
-"liċenzja.\n"
-"Sakemm il-liċenzja ma tagħtikx dawn id-drittijiet, normalment ma tistax\n"
-"tinstalla dawn il-programmi fuq iżjed minn kompjuter wieħed, jew \n"
-"tadattahom biex jintużaw fuq network. Jekk għandek xi dubju, jekk \n"
-"jogħġbok ikkuntattja direttament lid-distributur jew editur tal-komponent.\n"
-"It-trasferiment lill terzi partijiet jew ikkupjar ta' dawn il-komponenti "
-"inkluż\n"
-"id-dokumentazzjoni normalment huwa miċħud.\n"
-"\n"
-"\n"
-"Id-drittijiet kollha tal-komponenti tas-CD li jmiss huma tal-awturi "
-"rispettivi u\n"
-"huma protetti minn liġijiet ta' propjetà intellettwali u copyright "
-"applikabbli\n"
-"għal programmi ta' softwer.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6679,6 +6758,75 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Installazzjoni falliet"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Twissija\n"
+#~ "\n"
+#~ "Jekk jogħġbok aqra sew it-termini ta' taħt. Jekk ma taqbilx ma xi parti,\n"
+#~ "ma tistax tinstalla s-CD li jmiss. Agħfas \"Ma naċċettax\" biex tkompli \n"
+#~ "l-installazzjoni minngħajr dan is-CD.\n"
+#~ "\n"
+#~ "\n"
+#~ "Xi komponenti tas-CD li jmiss ma jaqgħux taħt il-liċenzja GPL jew "
+#~ "liċenzji\n"
+#~ "simili. Kull komponent simili għalhekk huwa kontrollat mit-termini u\n"
+#~ "kundizzjonijiet tal-liċenzja speċifika tiegħu. Jekk jogħġbok aqra sew\n"
+#~ "u segwi dawn il-liċenzji speċifiċi qabel tuża jew tiddistribwixxi dawn "
+#~ "il-\n"
+#~ "komponenti.\n"
+#~ "Dawn il-liċenzji ġeneralment jipprojbixxu t-trasferiment, ikkupjar "
+#~ "(ħlief \n"
+#~ "bħala kopja tas-sigurtà), ridistribuzzjoni, \"reverse engineering\", "
+#~ "diżassemblaġġ,\n"
+#~ "dikompilazzjoni jew modifika ta' dawn il-komponenti. Ksur ta' dan\n"
+#~ "il-qbil jittermina immedjatament id-drittijiet tiegħek taħt din il-"
+#~ "liċenzja.\n"
+#~ "Sakemm il-liċenzja ma tagħtikx dawn id-drittijiet, normalment ma tistax\n"
+#~ "tinstalla dawn il-programmi fuq iżjed minn kompjuter wieħed, jew \n"
+#~ "tadattahom biex jintużaw fuq network. Jekk għandek xi dubju, jekk \n"
+#~ "jogħġbok ikkuntattja direttament lid-distributur jew editur tal-"
+#~ "komponent.\n"
+#~ "It-trasferiment lill terzi partijiet jew ikkupjar ta' dawn il-komponenti "
+#~ "inkluż\n"
+#~ "id-dokumentazzjoni normalment huwa miċħud.\n"
+#~ "\n"
+#~ "\n"
+#~ "Id-drittijiet kollha tal-komponenti tas-CD li jmiss huma tal-awturi "
+#~ "rispettivi u\n"
+#~ "huma protetti minn liġijiet ta' propjetà intellettwali u copyright "
+#~ "applikabbli\n"
+#~ "għal programmi ta' softwer.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Uża libsafe għas-servers"
 
diff --git a/perl-install/share/po/nb.po b/perl-install/share/po/nb.po
index 8be6c576b..bfc402f2f 100644
--- a/perl-install/share/po/nb.po
+++ b/perl-install/share/po/nb.po
@@ -16,7 +16,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2007-12-15 15:41+0100\n"
 "Last-Translator: Per Øyvind Karlsen <peroyvind@mandriva.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -1419,18 +1419,14 @@ msgstr "Velg en annen partisjon"
 msgid "Choose a partition"
 msgstr "Velg en partisjon"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Skift til normalmodus"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Skift til ekspertmodus"
+msgid "More"
+msgstr "Mer"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Bekreftelse"
@@ -1481,13 +1477,17 @@ msgstr "Fjern alle"
 msgid "Auto allocate"
 msgstr "Automatisk tildeling"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Mer"
+msgid "Toggle to normal mode"
+msgstr "Skift til normalmodus"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Skift til ekspertmodus"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Harddiskinformasjon"
@@ -1541,7 +1541,12 @@ msgstr "Legg til RAID"
 msgid "Add to LVM"
 msgstr "Legg til LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "BrukerID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Slett"
@@ -1556,7 +1561,12 @@ msgstr "Fjern fra RAID"
 msgid "Remove from LVM"
 msgstr "Fjern fra LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Fjern fra LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Modifiser RAID"
@@ -1731,7 +1741,27 @@ msgstr ""
 "For å sikre dataintegritet etter at partisjonen(e) har blitt endret, \n"
 "vil kontroll av filsystemene kjøres neste gang du starter Windows(TM)"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Krypteringsnøkkel for filsystem"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Velg ditt filsystems krypteringsnøkkel"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Krypteringsnøkkel"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Velg et eksisterende RAID for å legge til"
@@ -1845,7 +1875,12 @@ msgstr "Du må starte maskinen på nytt for at endringene skal tre i kraft"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Partisjonstabellen på disk %s blir nå skrevet til disk"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formaterer partisjon %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1985,7 +2020,27 @@ msgstr "Montert\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Krypteringsnøkkel"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2090,12 +2145,7 @@ msgstr "Type partisjonstabell: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "på kanal %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Krypteringsnøkkel for filsystem"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Velg ditt filsystems krypteringsnøkkel"
@@ -2110,12 +2160,7 @@ msgstr "Denne krypteringsnøkkelen er for enkel (må være minst %d tegn lang)"
 msgid "The encryption keys do not match"
 msgstr "Krypteringsnøklene stemmer ikke overens"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Krypteringsnøkkel"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Krypteringsnøkkel (igjen)"
@@ -2230,11 +2275,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Du må ha en FAT-partisjonen montert under /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formaterer partisjon %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4659,7 +4699,7 @@ msgstr "Oppstartslasteren kan ikke håndtere /boot på flere fysiske volum"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4669,7 +4709,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4677,8 +4720,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4698,52 +4741,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4757,9 +4805,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4894,7 +4942,55 @@ msgstr ""
 "spørsmål om dette dokumentet,\n"
 "kontakt Mandriva S.A. \n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4911,68 +5007,55 @@ msgstr ""
 "(se http://www.mp3licensing.com for flere detaljer). Er du usikker om\n"
 "en patent kan gjelde deg, sjekk dine lokale lover."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Advarsel\n"
-"\n"
-"Les nøye gjennom vilkårene nedenfor. Hvis du er uenig\n"
-"med noe som helst, så er du ikke tillatt å installere neste CD-media.\n"
-"Trykk 'Nekt' for å fortsette installasjonen uten å bruke disse mediene.\n"
-"\n"
-"\n"
-"Noen komponenter som følger med på neste CD-media følger\n"
-"ikke GPL-lisensen eller lignende avtaler. Hvert slikt komponent følger "
-"dermed\n"
-"andre vilkår og kondisjoner til deres egen spesifike lisens. \n"
-"Les nøye gjennom og rett deg etter slike spesifikke lisenser før\n"
-"du bruker eller distribuerer de videre. \n"
-"Slike lisenser vil generelt forhindre overføring, kopiering \n"
-"(foruten sikkerhetskopier), videre distribuering, reverse engineering, \n"
-"de-assembly, dekompilering eller endring på komponentet. \n"
-"Enhvert brudd på avtalen vil øyeblikkelig opphøre dine rettigheter under\n"
-"den spesifikke lisensen. Med mindre lisensens vilkår gir deg slike\n"
-"rettigheter, så kan du vanligvis ikke installere programmene på mere nn\n"
-"et system, eller tilpasse det til å brukes over nettverk. Hvis i tvil, \n"
-"kontakt distributøren eller opphavsmannen til komponentet. \n"
-"Overføring til tredjeparter eller kopiering av slike komponentert,\n"
-"inkludert dokumentasjonen er vanligvis forbudt.\n"
-"\n"
-"\n"
-"Alle rettigheter til komponentene på det neste CD-media hører til deres \n"
-"respektive opphavsmenn og er beskyttet av intellektuell eiendom og \n"
-"opphavsrettslover som gjelder programvare.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6877,6 +6960,67 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Installasjon mislyktes"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Advarsel\n"
+#~ "\n"
+#~ "Les nøye gjennom vilkårene nedenfor. Hvis du er uenig\n"
+#~ "med noe som helst, så er du ikke tillatt å installere neste CD-media.\n"
+#~ "Trykk 'Nekt' for å fortsette installasjonen uten å bruke disse mediene.\n"
+#~ "\n"
+#~ "\n"
+#~ "Noen komponenter som følger med på neste CD-media følger\n"
+#~ "ikke GPL-lisensen eller lignende avtaler. Hvert slikt komponent følger "
+#~ "dermed\n"
+#~ "andre vilkår og kondisjoner til deres egen spesifike lisens. \n"
+#~ "Les nøye gjennom og rett deg etter slike spesifikke lisenser før\n"
+#~ "du bruker eller distribuerer de videre. \n"
+#~ "Slike lisenser vil generelt forhindre overføring, kopiering \n"
+#~ "(foruten sikkerhetskopier), videre distribuering, reverse engineering, \n"
+#~ "de-assembly, dekompilering eller endring på komponentet. \n"
+#~ "Enhvert brudd på avtalen vil øyeblikkelig opphøre dine rettigheter under\n"
+#~ "den spesifikke lisensen. Med mindre lisensens vilkår gir deg slike\n"
+#~ "rettigheter, så kan du vanligvis ikke installere programmene på mere nn\n"
+#~ "et system, eller tilpasse det til å brukes over nettverk. Hvis i tvil, \n"
+#~ "kontakt distributøren eller opphavsmannen til komponentet. \n"
+#~ "Overføring til tredjeparter eller kopiering av slike komponentert,\n"
+#~ "inkludert dokumentasjonen er vanligvis forbudt.\n"
+#~ "\n"
+#~ "\n"
+#~ "Alle rettigheter til komponentene på det neste CD-media hører til deres \n"
+#~ "respektive opphavsmenn og er beskyttet av intellektuell eiendom og \n"
+#~ "opphavsrettslover som gjelder programvare.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Bruk libsafe for tjenere"
 
diff --git a/perl-install/share/po/nl.po b/perl-install/share/po/nl.po
index 013a2b64c..3a5c9e0b6 100644
--- a/perl-install/share/po/nl.po
+++ b/perl-install/share/po/nl.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libDrakX\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-09-10 23:31+0200\n"
 "Last-Translator: Rob Teng <mandrake.tips@free.fr>\n"
 "Language-Team: Nederlands\n"
@@ -1438,18 +1438,14 @@ msgstr "Kies een andere partitie"
 msgid "Choose a partition"
 msgstr "Kies een partitie"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Naar normale modus"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Naar expert-modus"
+msgid "More"
+msgstr "Meer"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Bevestiging"
@@ -1501,13 +1497,17 @@ msgstr "Alles wissen"
 msgid "Auto allocate"
 msgstr "Automatisch toewijzen"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Meer"
+msgid "Toggle to normal mode"
+msgstr "Naar normale modus"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Naar expert-modus"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Informatie over harde schijf"
@@ -1561,7 +1561,12 @@ msgstr "Toevoegen aan RAID"
 msgid "Add to LVM"
 msgstr "Toevoegen aan LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Gebruikers-ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Verwijderen"
@@ -1576,7 +1581,12 @@ msgstr "Verwijderen uit RAID"
 msgid "Remove from LVM"
 msgstr "Verwijderen uit LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Verwijderen uit LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "RAID aanpassen"
@@ -1754,7 +1764,27 @@ msgstr ""
 "te garanderen, zal het bestandssysteem worden gecontroleerd\n"
 "de volgende keer dat u Windows(TM) opstart"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Sleutel voor bestandssysteem-versleuteling"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Kies uw sleutel voor bestandssysteem-versleuteling"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Vercijferingssleutel"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Kies een bestaande RAID om aan toe te voegen"
@@ -1869,7 +1899,12 @@ msgstr "U zult moeten herstarten voordat de aanpassing van kracht wordt"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Partitietabel van schijf %s wordt weggeschreven!"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Bezig met formatteren van partitie %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -2009,7 +2044,27 @@ msgstr "Gekoppeld\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Vercijferingssleutel"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2114,12 +2169,7 @@ msgstr "Partitietabel-type: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "op kanaal %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Sleutel voor bestandssysteem-versleuteling"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Kies uw sleutel voor bestandssysteem-versleuteling"
@@ -2136,12 +2186,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "De versleuteling-sleutels kloppen niet met elkaar"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Vercijferingssleutel"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "versleutelings sleutel (nogmaals)"
@@ -2259,11 +2304,6 @@ msgstr ""
 "U dient een partitie met FAT-bestandssysteem gekoppeld te hebben aan /boot/"
 "efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Bezig met formatteren van partitie %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4710,7 +4750,7 @@ msgstr "De opstartlader kan niet omgaan met /boot op meerdere fysieke volumina"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4720,7 +4760,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4728,8 +4771,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4749,52 +4792,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4808,9 +4856,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4959,7 +5007,55 @@ msgstr ""
 "document op moeten halen\n"
 "en deze laten vertalen door een beëdigd vertaler.\n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4977,72 +5073,55 @@ msgstr ""
 "http://www.mp3licensing.com voor verdere details). Indien u onzeker bent\n"
 "of een patent op u toepasbaar is, raadpleeg dan uw lokale wetgeving."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Waarschuwing\n"
-"\n"
-"Leest u aandachtig de voorwaarden hieronder. Als u het niet eens bent \n"
-"met eender welk onderdeel, is het u niet toegestaan om de volgende \n"
-"CD-media te installeren. Klik op 'Weigeren' om de installatie voort te \n"
-"zetten zonder deze media te gebruiken.\n"
-"\n"
-"\n"
-"Sommige componenten die op de volgende CD-media staan staan niet \n"
-"onder de GPL-licentie of dergelijke overeenkomsten. Ieder van deze \n"
-"componenten valt onder de regels en voorwaarden van zijn eigen \n"
-"specifieke licentie. Leest u dergelijke licenties alstublieft aandachtig \n"
-"en ga ermee akkoord voordat u de genoemde componenten gebruikt \n"
-"of opnieuw distribueert. \n"
-"Dergelijke licenties zullen in het algemeen het overnemen, dupliceren \n"
-"(behalve voor reservekopie-doeleinden), herdistribueren, reverse \n"
-"engineering, de-assemblage, de-compilatie of aanpassing van het \n"
-"component voorkomen. Het doorbreken van deze overeenkomst zal \n"
-"onmiddelijk uw rechten onder de specifieke licentie opheffen. Tenzij \n"
-"de specifieke licentie u zulke rechten toekent, kunt u in het algemeen \n"
-"de programma's niet op meer dan één machine installeren, of hen \n"
-"aanpassen voor gebruik over een netwerk. Als u twijfelt, neem dan \n"
-"alstublieft rechtstreeks contact op met de distributeur van het \n"
-"component. \n"
-"Het doorgeven aan een derde partij of het kopiëren van dergelijke \n"
-"componenten is in het algemeen verboden.\n"
-"\n"
-"\n"
-"Alle rechten op de componenten van de volgende CD-media behoren \n"
-"aan hun respectievelijke auteurs en zijn beschermd door wetten met \n"
-"betrekking tot intellectueel eigendom en copyright van software- \n"
-"programma's. \n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6979,6 +7058,72 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Installatie mislukt"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Waarschuwing\n"
+#~ "\n"
+#~ "Leest u aandachtig de voorwaarden hieronder. Als u het niet eens bent \n"
+#~ "met eender welk onderdeel, is het u niet toegestaan om de volgende \n"
+#~ "CD-media te installeren. Klik op 'Weigeren' om de installatie voort te \n"
+#~ "zetten zonder deze media te gebruiken.\n"
+#~ "\n"
+#~ "\n"
+#~ "Sommige componenten die op de volgende CD-media staan staan niet \n"
+#~ "onder de GPL-licentie of dergelijke overeenkomsten. Ieder van deze \n"
+#~ "componenten valt onder de regels en voorwaarden van zijn eigen \n"
+#~ "specifieke licentie. Leest u dergelijke licenties alstublieft "
+#~ "aandachtig \n"
+#~ "en ga ermee akkoord voordat u de genoemde componenten gebruikt \n"
+#~ "of opnieuw distribueert. \n"
+#~ "Dergelijke licenties zullen in het algemeen het overnemen, dupliceren \n"
+#~ "(behalve voor reservekopie-doeleinden), herdistribueren, reverse \n"
+#~ "engineering, de-assemblage, de-compilatie of aanpassing van het \n"
+#~ "component voorkomen. Het doorbreken van deze overeenkomst zal \n"
+#~ "onmiddelijk uw rechten onder de specifieke licentie opheffen. Tenzij \n"
+#~ "de specifieke licentie u zulke rechten toekent, kunt u in het algemeen \n"
+#~ "de programma's niet op meer dan één machine installeren, of hen \n"
+#~ "aanpassen voor gebruik over een netwerk. Als u twijfelt, neem dan \n"
+#~ "alstublieft rechtstreeks contact op met de distributeur van het \n"
+#~ "component. \n"
+#~ "Het doorgeven aan een derde partij of het kopiëren van dergelijke \n"
+#~ "componenten is in het algemeen verboden.\n"
+#~ "\n"
+#~ "\n"
+#~ "Alle rechten op de componenten van de volgende CD-media behoren \n"
+#~ "aan hun respectievelijke auteurs en zijn beschermd door wetten met \n"
+#~ "betrekking tot intellectueel eigendom en copyright van software- \n"
+#~ "programma's. \n"
+
 #~ msgid "LILO/grub Installation"
 #~ msgstr "LILO/grub-installatie"
 
diff --git a/perl-install/share/po/nn.po b/perl-install/share/po/nn.po
index fb3b52a5d..01af05975 100644
--- a/perl-install/share/po/nn.po
+++ b/perl-install/share/po/nn.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libDrakX\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-09-17 18:49+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -205,7 +205,8 @@ msgstr "avgrens"
 
 #: any.pm:421
 #, c-format
-msgid "Option ``Restrict command line options'' is of no use without a password"
+msgid ""
+"Option ``Restrict command line options'' is of no use without a password"
 msgstr "Valet «Avgrens kommandolinjeval» er ubrukeleg utan passord"
 
 #: any.pm:423
@@ -394,8 +395,10 @@ msgstr "Skriv inn brukarnamn"
 
 #: any.pm:776
 #, c-format
-msgid "The user name must contain only lower cased letters, numbers, `-' and `_'"
-msgstr "Brukarnamnet kan berre innehelda små bokstavar, tala og teikna «-» og «_»"
+msgid ""
+"The user name must contain only lower cased letters, numbers, `-' and `_'"
+msgstr ""
+"Brukarnamnet kan berre innehelda små bokstavar, tala og teikna «-» og «_»"
 
 #: any.pm:777
 #, c-format
@@ -569,7 +572,6 @@ msgstr "Land/område"
 
 #: any.pm:1102
 #, c-format
-#| msgid "Please choose your country."
 msgid "Please choose your country"
 msgstr "Vel land"
 
@@ -648,7 +650,8 @@ msgstr ""
 
 #: any.pm:1222
 #, c-format
-msgid "You can export using NFS or SMB. Please select which you would like to use."
+msgid ""
+"You can export using NFS or SMB. Please select which you would like to use."
 msgstr "Du kan eksportera med NFS og SMB. Vel kven av dei du vil bruka."
 
 #: any.pm:1250
@@ -753,8 +756,10 @@ msgstr "Lokal fil:"
 
 #: authentication.pm:64
 #, c-format
-msgid "Use local for all authentication and information user tell in local file"
-msgstr "Bruk lokal for all autentisering og informasjon brukarar oppgjev i lokal fil"
+msgid ""
+"Use local for all authentication and information user tell in local file"
+msgstr ""
+"Bruk lokal for all autentisering og informasjon brukarar oppgjev i lokal fil"
 
 #: authentication.pm:65
 #, c-format
@@ -904,7 +909,8 @@ msgstr "Skuggebase"
 msgid ""
 "You have selected Kerberos 5 authentication. Please review the configuration "
 "options below "
-msgstr "Du har valt Kerberos 5-autentisering. Sjå gjennom oppsettvala nedanfor."
+msgstr ""
+"Du har valt Kerberos 5-autentisering. Sjå gjennom oppsettvala nedanfor."
 
 #: authentication.pm:135
 #, c-format
@@ -941,7 +947,8 @@ msgstr "Bruk LDAP for brukarinformasjon"
 msgid ""
 "You have selected Kerberos 5 for authentication, now you must choose the "
 "type of users information "
-msgstr "Du har valt Kerberos 5 for autentisering. No må velja type brukarinformasjon."
+msgstr ""
+"Du har valt Kerberos 5 for autentisering. No må velja type brukarinformasjon."
 
 #: authentication.pm:158
 #, c-format
@@ -970,7 +977,8 @@ msgstr "NIS-tenar"
 msgid ""
 "You have selected Windows Domain authentication. Please review the "
 "configuration options below "
-msgstr "Du har valt Windows-domene-autentisering. Sjå gjennom oppsettvala nedanfor."
+msgstr ""
+"Du har valt Windows-domene-autentisering. Sjå gjennom oppsettvala nedanfor."
 
 #: authentication.pm:207
 #, c-format
@@ -1084,7 +1092,8 @@ msgstr "Du kan ikkje installera oppstartslastaren på ein «%s»-partisjon\n"
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
-msgstr "Oppstartslastaren må oppdaterast, då partisjonane har fått ny rekkjefølgje"
+msgstr ""
+"Oppstartslastaren må oppdaterast, då partisjonane har fått ny rekkjefølgje"
 
 #: bootloader.pm:1977
 #, c-format
@@ -1400,18 +1409,14 @@ msgstr "Vel ein annan partisjon"
 msgid "Choose a partition"
 msgstr "Vel partisjon"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Skift til normalmodus"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Skift til ekspertmodus"
+msgid "More"
+msgstr "Meir"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Stadfesting"
@@ -1439,7 +1444,8 @@ msgstr "Vil du lagra endringar i «/etc/fstab»"
 #: diskdrake/interactive.pm:284 fs/partitioning_wizard.pm:250
 #, c-format
 msgid "You need to reboot for the partition table modifications to take place"
-msgstr "Du må starta på nytt for at endringane i partisjontabellen skal trå i kraft"
+msgstr ""
+"Du må starta på nytt for at endringane i partisjontabellen skal trå i kraft"
 
 #: diskdrake/interactive.pm:289
 #, c-format
@@ -1463,13 +1469,17 @@ msgstr "Fjern alle"
 msgid "Auto allocate"
 msgstr "Tildel automatisk"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Meir"
+msgid "Toggle to normal mode"
+msgstr "Skift til normalmodus"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Skift til ekspertmodus"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Harddiskinformasjon"
@@ -1523,7 +1533,12 @@ msgstr "Legg til i RAID"
 msgid "Add to LVM"
 msgstr "Legg til i LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Brukar-ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Slett"
@@ -1538,7 +1553,12 @@ msgstr "Fjern frå RAID"
 msgid "Remove from LVM"
 msgstr "Fjern frå LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Fjern frå LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Endra RAID"
@@ -1601,7 +1621,8 @@ msgstr "Vil du fjerna filmonteringsfila?"
 
 #: diskdrake/interactive.pm:532
 #, c-format
-msgid "After changing type of partition %s, all data on this partition will be lost"
+msgid ""
+"After changing type of partition %s, all data on this partition will be lost"
 msgstr ""
 "Når du har endra partisjonstypen til «%s» vil alle data på denne partisjonen "
 "vera tapt"
@@ -1679,7 +1700,8 @@ msgstr "Du bør ta reservekopi av alle data på denne partisjonen"
 #: diskdrake/interactive.pm:701
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
-msgstr "Når du har endra storleik på «%s» vil alle data på denne partisjonen vera tapt"
+msgstr ""
+"Når du har endra storleik på «%s» vil alle data på denne partisjonen vera tapt"
 
 #: diskdrake/interactive.pm:708
 #, c-format
@@ -1710,7 +1732,27 @@ msgstr ""
 "For å sikra dataintegritet på partisjonen/-ane\n"
 "vert det køyrt filsystemkontroll neste gongar du startar Windows™"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Krypteringsnøkkel for filsystem"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Vel krypteringsnøkkel for filsystemet"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Krypteringsnøkkel"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Vel ein eksisterande RAID å leggja til i"
@@ -1824,7 +1866,12 @@ msgstr "Du må starta på nytt for at endringane skal trå i kraft"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Partisjonstabellen til «%s» vert no lagra."
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formaterer partisjonen «%s»"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Når du har formatert «%s» vil alle data på denne partisjonen vera tapt"
@@ -1962,7 +2009,27 @@ msgstr "Montert\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Krypteringsnøkkel"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2066,12 +2133,7 @@ msgstr "Partisjonstabelltype: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "på kanal %d – id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Krypteringsnøkkel for filsystem"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Vel krypteringsnøkkel for filsystemet"
@@ -2086,12 +2148,7 @@ msgstr "Krypteringsnøkkelen er for enkel. Han må vera på minst %d teikn."
 msgid "The encryption keys do not match"
 msgstr "Krypteringsnøklane er ikkje like"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Krypteringsnøkkel"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Krypteringsnøkkel (på nytt)"
@@ -2136,7 +2193,8 @@ msgstr "Endå ein"
 
 #: diskdrake/smbnfs_gtk.pm:178
 #, c-format
-msgid "Please enter your username, password and domain name to access this host."
+msgid ""
+"Please enter your username, password and domain name to access this host."
 msgstr "Skriv inn brukarnamn, passord og domenenamn for verten."
 
 #: diskdrake/smbnfs_gtk.pm:180
@@ -2203,11 +2261,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Du må ha ein FAT-partisjon montert i «/boot/efi»"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formaterer partisjonen «%s»"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -3060,9 +3113,10 @@ msgstr "Lydoppsett"
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
 "sound card (%s)."
-msgstr "Her kan du velja ein annan OSS- eller ALSA-drivar for lydkortet ditt («%s»)."
+msgstr ""
+"Her kan du velja ein annan OSS- eller ALSA-drivar for lydkortet ditt («%s»)."
 
-#. -PO: here the first %s is either "OSS" or "ALSA",
+#. -PO: here the first %s is either "OSS" or "ALSA", 
 #. -PO: the second %s is the name of the current driver
 #. -PO: and the third %s is the name of the default driver
 #: harddrake/sound.pm:392
@@ -4617,7 +4671,7 @@ msgstr "Oppstartslastaren kan ikkje handtera «/boot» på fleire fysiske volum.
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4627,7 +4681,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4635,8 +4692,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4656,52 +4713,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4715,9 +4777,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4855,7 +4917,55 @@ msgstr ""
 "Paris – France.\n"
 "For any question on this document, please contact Mandriva S.A.  \n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4875,69 +4985,55 @@ msgstr ""
 "sikker på om ein patent gjeld deg, bør du sjekka dei lokale lovene der du "
 "bur."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Åtvaring\n"
-"\n"
-"Les nøye gjennom vilkåra nedanfor. Viss du er ueinig me vilkåra, \n"
-"eller delar av vilkåra, har du ikkje rett til å installera dei \n"
-"neste CD-media. Trykk «Ikkje godta» for å halda fram med installeringa \n"
-"utan å bruka desse media.\n"
-"\n"
-"\n"
-"Nokre av komponentane på dei neste CD-media ligg ikkje under GPL-lisensen \n"
-"eller liknande programvarelisensar. Kvar slik komponent følgjer sine \n"
-"eigne bruks- og installeringsvilkår. Du må lesa nøye gjennom og følgja \n"
-"desse lisensvilkåra før du tek i bruk eller vidareformidlar desse \n"
-"komponentane. Lisensane vil typisk forby overføring, kopiering (med \n"
-"unntak av reservekopiering), vidareformidling, «reverse engineering» \n"
-"(«omvend utvikling»), dekompilering eller endringar. \n"
-"\n"
-"Viss du ikkje følgjer lisensvilkåra, vil du automatisk og umiddelbart \n"
-"mista rettane gjevne av dei aktuelle lisensane. Med mindre lisensen \n"
-"spesifikt gjev deg rett til det, kan du ikkje installera programma på \n"
-"meir enn eitt system, eller bruka dei på eit nettverk. Om du er i tvil, \n"
-"kan du kontakta distributøren eller den ansvarlege for komponenten. \n"
-"Overføring til tredjepartar eller kopiering av komponentane, herunder \n"
-"eventuell dokumentasjon, er vanlegvis forbode.\n"
-"\n"
-"\n"
-"Alle rettane til komponentane på dei neste CD-media høyrer til deira \n"
-"respektive utviklarar, og er verna av lov om opphavsrett og andre "
-"relevante \n"
-"programvarelover.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -5220,7 +5316,8 @@ msgstr "Klarte ikkje installera pakkane for deling av skannar(ar)."
 #: scanner.pm:202
 #, c-format
 msgid "Your scanner(s) will not be available for non-root users."
-msgstr "Skannaren/-ane vil ikkje vera tilgjengeleg for andre brukarar enn «root»."
+msgstr ""
+"Skannaren/-ane vil ikkje vera tilgjengeleg for andre brukarar enn «root»."
 
 #: security/help.pm:11
 #, c-format
@@ -5275,7 +5372,8 @@ msgstr "Godta direkte «root»-innlogging."
 
 #: security/help.pm:33
 #, c-format
-msgid "Allow the list of users on the system on display managers (kdm and gdm)."
+msgid ""
+"Allow the list of users on the system on display managers (kdm and gdm)."
 msgstr "Godta vising av brukarar i innloggingshandsamarar (kdm og gdm)."
 
 #: security/help.pm:35
@@ -5472,7 +5570,8 @@ msgstr "Vel storleik på passordlogg for å hindra gjenbruk av passord."
 msgid ""
 "Set the password minimum length and minimum number of digit and minimum "
 "number of capitalized letters."
-msgstr "Vel minstelengd på passord og minimum tal på siffer og store bokstavar."
+msgstr ""
+"Vel minstelengd på passord og minimum tal på siffer og store bokstavar."
 
 #: security/help.pm:108
 #, c-format
@@ -5506,12 +5605,14 @@ msgstr ""
 #: security/help.pm:117
 #, c-format
 msgid "if set to yes, check permissions of files in the users' home."
-msgstr "Kontroller løyve til filer i heimemappe til brukarar viss sett til «ja»."
+msgstr ""
+"Kontroller løyve til filer i heimemappe til brukarar viss sett til «ja»."
 
 #: security/help.pm:118
 #, c-format
 msgid "if set to yes, check if the network devices are in promiscuous mode."
-msgstr "Kontroller om nettverksgrensesnitt er i promiskuitetsmodus viss sett til «ja»."
+msgstr ""
+"Kontroller om nettverksgrensesnitt er i promiskuitetsmodus viss sett til «ja»."
 
 #: security/help.pm:119
 #, c-format
@@ -5555,7 +5656,8 @@ msgstr "Køyr «chkrootkit»-kontrollar viss sett til «ja»."
 
 #: security/help.pm:127
 #, c-format
-msgid "if set, send the mail report to this email address else send it to root."
+msgid ""
+"if set, send the mail report to this email address else send it to root."
 msgstr "Send rapport på e-post til denne adressa, eller til «root» viss tom."
 
 #: security/help.pm:128
@@ -6024,7 +6126,8 @@ msgstr ""
 
 #: services.pm:28
 #, c-format
-msgid "Common UNIX Printing System (CUPS) is an advanced printer spooling system"
+msgid ""
+"Common UNIX Printing System (CUPS) is an advanced printer spooling system"
 msgstr "Common UNIX Printing System (CUPS) er eit avansert utskriftskøsystem."
 
 #: services.pm:29
@@ -6058,18 +6161,21 @@ msgstr ""
 #: services.pm:35
 #, c-format
 msgid "HAL is a daemon that collects and maintains information about hardware"
-msgstr "HAL er ei teneste som samlar inn og vedlikeheld informasjon om maskinvare."
+msgstr ""
+"HAL er ei teneste som samlar inn og vedlikeheld informasjon om maskinvare."
 
 #: services.pm:36
 #, c-format
 msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
-msgstr "HardDrake køyrer eit maskinvaresøk, og kan setja opp ny og endra maskinvare."
+msgstr ""
+"HardDrake køyrer eit maskinvaresøk, og kan setja opp ny og endra maskinvare."
 
 #: services.pm:38
 #, c-format
-msgid "Apache is a World Wide Web server. It is used to serve HTML files and CGI."
+msgid ""
+"Apache is a World Wide Web server. It is used to serve HTML files and CGI."
 msgstr "Apache er ein vevtenar."
 
 #: services.pm:39
@@ -6251,14 +6357,16 @@ msgstr ""
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that moves mail from "
 "one machine to another."
-msgstr "Postfix er eit program for overføring av elektronisk post mellom maskiner."
+msgstr ""
+"Postfix er eit program for overføring av elektronisk post mellom maskiner."
 
 #: services.pm:79
 #, c-format
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
-msgstr "Lagrar og gjenopprettar systementropigrunnlag for betre slumptalsgenerering."
+msgstr ""
+"Lagrar og gjenopprettar systementropigrunnlag for betre slumptalsgenerering."
 
 #: services.pm:81
 #, c-format
@@ -6310,7 +6418,8 @@ msgstr ""
 
 #: services.pm:92
 #, c-format
-msgid "SANE (Scanner Access Now Easy) enables to access scanners, video cameras, ..."
+msgid ""
+"SANE (Scanner Access Now Easy) enables to access scanners, video cameras, ..."
 msgstr ""
 "SANE (Scanner Access Now Easy) gjev tilgang til skannarar, filmkamera og "
 "liknande."
@@ -6808,6 +6917,69 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Feil ved installering."
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Åtvaring\n"
+#~ "\n"
+#~ "Les nøye gjennom vilkåra nedanfor. Viss du er ueinig me vilkåra, \n"
+#~ "eller delar av vilkåra, har du ikkje rett til å installera dei \n"
+#~ "neste CD-media. Trykk «Ikkje godta» for å halda fram med installeringa \n"
+#~ "utan å bruka desse media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Nokre av komponentane på dei neste CD-media ligg ikkje under GPL-"
+#~ "lisensen \n"
+#~ "eller liknande programvarelisensar. Kvar slik komponent følgjer sine \n"
+#~ "eigne bruks- og installeringsvilkår. Du må lesa nøye gjennom og følgja \n"
+#~ "desse lisensvilkåra før du tek i bruk eller vidareformidlar desse \n"
+#~ "komponentane. Lisensane vil typisk forby overføring, kopiering (med \n"
+#~ "unntak av reservekopiering), vidareformidling, «reverse engineering» \n"
+#~ "(«omvend utvikling»), dekompilering eller endringar. \n"
+#~ "\n"
+#~ "Viss du ikkje følgjer lisensvilkåra, vil du automatisk og umiddelbart \n"
+#~ "mista rettane gjevne av dei aktuelle lisensane. Med mindre lisensen \n"
+#~ "spesifikt gjev deg rett til det, kan du ikkje installera programma på \n"
+#~ "meir enn eitt system, eller bruka dei på eit nettverk. Om du er i tvil, \n"
+#~ "kan du kontakta distributøren eller den ansvarlege for komponenten. \n"
+#~ "Overføring til tredjepartar eller kopiering av komponentane, herunder \n"
+#~ "eventuell dokumentasjon, er vanlegvis forbode.\n"
+#~ "\n"
+#~ "\n"
+#~ "Alle rettane til komponentane på dei neste CD-media høyrer til deira \n"
+#~ "respektive utviklarar, og er verna av lov om opphavsrett og andre "
+#~ "relevante \n"
+#~ "programvarelover.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Bruk libsafe for tenarar"
 
@@ -7027,4 +7199,3 @@ msgstr "Feil ved installering."
 
 #~ msgid "Enable/Disable msec hourly security check."
 #~ msgstr "Slå på/av msec-basert tryggleikskontroll."
-
diff --git a/perl-install/share/po/pa_IN.po b/perl-install/share/po/pa_IN.po
index 93e1a41da..e48436117 100644
--- a/perl-install/share/po/pa_IN.po
+++ b/perl-install/share/po/pa_IN.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2005-03-27 17:55+0530\n"
 "Last-Translator: Jaswinder Singh Phulewala <jaswinderphulewala@yahoo.com>\n"
 "Language-Team: Punjabi <punlinux-i18n@lists.soruceforge.net>\n"
@@ -1403,18 +1403,14 @@ msgstr "ਹੋਰ ਭਾਗ ਵਰਤੋ"
 msgid "Choose a partition"
 msgstr "ਭਾਗ ਚੁਣੋ"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "ਸਧਾਰਨ ਵਿਧੀ ਤਬਦੀਲ ਕਰੋ"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "ਮਾਹਿਰ ਵਿਧੀ ਤਬਦੀਲ ਕਰੋ"
+msgid "More"
+msgstr "ਹੋਰ"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "ਸੰਰਚਨਾ"
@@ -1465,13 +1461,17 @@ msgstr "ਸਭ ਸਾਫ"
 msgid "Auto allocate"
 msgstr "ਸਵੈ ਜਾਰੀ"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "ਹੋਰ"
+msgid "Toggle to normal mode"
+msgstr "ਸਧਾਰਨ ਵਿਧੀ ਤਬਦੀਲ ਕਰੋ"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "ਮਾਹਿਰ ਵਿਧੀ ਤਬਦੀਲ ਕਰੋ"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "ਹਾਰਡ ਡਰਾਈਵ ਜਾਣਕਾਰੀ"
@@ -1523,7 +1523,12 @@ msgstr "RAID ਵਿੱਚ ਸ਼ਾਮਿਲ"
 msgid "Add to LVM"
 msgstr "LVM ਵਿੱਚ ਸ਼ਾਮਿਲ"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ਉਪਭੋਗੀ:"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "ਹਟਾਓ"
@@ -1538,7 +1543,12 @@ msgstr "RAID ਵਿੱਚੋਂ ਹਟਾਓ"
 msgid "Remove from LVM"
 msgstr "LVM ਵਿੱਚੋਂ ਹਟਾਓ"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "LVM ਵਿੱਚੋਂ ਹਟਾਓ"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "LVM ਤਬਦੀਲ"
@@ -1709,7 +1719,27 @@ msgstr ""
 "ਭਾਗ ਮੁੜ-ਅਕਾਰ ਤੋਂ ਬਾਅਦ ਡਾਟਾ ਇੱਕਸਾਰਤਾ ਜਾਂਚ ਲਈ, \n"
 "Windows(TM) ਵਿੱਚ ਤੁਹਾਡੀ ਅਗਲੀ ਬੂਟ ਦੌਰਾਨ ਫਾਇਲ ਸਿਸਟਮ ਜਾਂਚ ਚੱਲੇਗੀ"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "ਫਾਇਲ ਇਨਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀ"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "ਆਪਣੀ ਫਾਇਲ ਇਨਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀ ਚੁਣੋ"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "ਇਨਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀ "
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਮੌਜੂਦਾ RAID ਚੁਣੋ"
@@ -1821,7 +1851,12 @@ msgstr "ਤਬਦੀਲੀ ਲਾਗੂ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ �
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "ਡਰਾਈਵ %s ਦੀ ਭਾਗ ਸਾਰਣੀ ਡਿਸਕ ਤੇ ਲਿਖੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "ਭਾਗ %s ਫਾਰਮਿਟ ਹੋ ਰਿਹਾ ਹੈ"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "ਭਾਗ %s ਫਾਰਮਿਟ ਕਰਨ ਤੋਂ ਬਾਅਦ, ਇਸ ਭਾਗ ਤੇ ਸਾਰਾ ਡਾਟਾ ਗੁੰਮ ਹੋ ਜਾਵੇਗਾ"
@@ -1953,7 +1988,27 @@ msgstr "ਮਾਊਂਟ ਕੀਤੀ\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "ਇਨਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀ "
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2057,12 +2112,7 @@ msgstr "ਭਾਗ ਸਾਰਣੀ ਕਿਸਮ: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "ਚੈਨਲ %d id %d ਤੇ\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "ਫਾਇਲ ਇਨਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀ"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "ਆਪਣੀ ਫਾਇਲ ਇਨਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀ ਚੁਣੋ"
@@ -2077,12 +2127,7 @@ msgstr "ਇਹ ਇਨਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀ ਬਹੁਤ ਸੌ�
 msgid "The encryption keys do not match"
 msgstr "ਇਨਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀ ਮੇਲ ਨਹੀਂ ਖਾਂਦੀ"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "ਇਨਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀ "
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "ਇਨਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀ (ਫਿਰ)"
@@ -2195,11 +2240,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "ਤੁਹਾਡੇ ਕੋਲ /boot/efi ਵਿੱਚ ਮਾਊਂਟ ਕੀਤਾ FAT ਭਾਗ ਹੋਣਾ ਜਰੂਰੀ ਹੈ"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "ਭਾਗ %s ਫਾਰਮਿਟ ਹੋ ਰਿਹਾ ਹੈ"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4605,7 +4645,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4613,8 +4656,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4634,52 +4677,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4693,9 +4741,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4716,7 +4764,55 @@ msgid ""
 "For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4733,38 +4829,54 @@ msgstr ""
 "http://www.mp3licensing.com ਵੇਖੋ)। ਜੇ ਤੁਹਾਨੂੰ ਯਕੀਨ ਨਹੀਂ ਕਿ ਤੁਹਾਡਾ \n"
 "ਪੇਟਿੰਟ ਤੁਹਾਨੂੰ ਉਪਲੱਬਧ ਹੋ ਸਕਦਾ ਹੈ, ਆਪਣੇ ਲੋਕਲ ਨਿਯਮਾਂ ਦੀ ਜਾਂਚ ਕਰੋ।"
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
+#: messages.pm:123
 #, c-format
 msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
 "\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
 "\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
 "\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
 "\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
diff --git a/perl-install/share/po/pl.po b/perl-install/share/po/pl.po
index e52391dfc..db37bc15a 100644
--- a/perl-install/share/po/pl.po
+++ b/perl-install/share/po/pl.po
@@ -16,7 +16,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libDrakX\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-09-12 13:59+0200\n"
 "Last-Translator: Amazis.net sp. z o.o. - Tomasz Bednarski <tomasz."
 "bednarski@mandriva.pl>\n"
@@ -1446,18 +1446,14 @@ msgstr "Utwórz inną partycję"
 msgid "Choose a partition"
 msgstr "Wybierz partycję"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Przełącz na tryb standardowy"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Przełącz w tryb zaawansowany"
+msgid "More"
+msgstr "Więcej"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Potwierdzenie"
@@ -1511,13 +1507,17 @@ msgstr "Wyczyść wszystko"
 msgid "Auto allocate"
 msgstr "Rozmieść automatycznie"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Więcej"
+msgid "Toggle to normal mode"
+msgstr "Przełącz na tryb standardowy"
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Przełącz w tryb zaawansowany"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Informacje o twardym dysku"
@@ -1571,7 +1571,12 @@ msgstr "Dodaj do RAID"
 msgid "Add to LVM"
 msgstr "Dodaj do LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ID użytkownika"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Usuń"
@@ -1586,7 +1591,12 @@ msgstr "Usuń z RAID"
 msgid "Remove from LVM"
 msgstr "Usuń z LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Usuń z LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Modyfikuj RAID"
@@ -1760,7 +1770,27 @@ msgstr ""
 "podczas kolejnego uruchamiania systemu Windows(TM) zostanie\n"
 "uruchomione sprawdzanie systemu plików"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Klucz szyfrujący system plików"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Wybierz klucz szyfrujący system plików"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Klucz szyfrujący"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Wybierz istniejący RAID, aby dodać do niego"
@@ -1875,7 +1905,12 @@ msgstr "Należy ponownie uruchomić komputer przed uaktywnieniem zmian"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Tablica partycji napędu %s zostanie zapisana na dysk"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formatowanie partycji %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Po sformatowaniu, wszystkie dane na partycji %s zostaną utracone"
@@ -2013,7 +2048,27 @@ msgstr "Zamontowana\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Klucz szyfrujący"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2117,12 +2172,7 @@ msgstr "Typ tabeli partycji: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "na kanale %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Klucz szyfrujący system plików"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Wybierz klucz szyfrujący system plików"
@@ -2137,12 +2187,7 @@ msgstr "Ten klucz jest zbyt prosty (musi posiadać co najmniej %d znaków)"
 msgid "The encryption keys do not match"
 msgstr "Klucze szyfrujące nie zgadzają się"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Klucz szyfrujący"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Klucz szyfrujący (ponownie)"
@@ -2258,11 +2303,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Partycja FAT musi być zamontowana w /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formatowanie partycji %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4707,7 +4747,7 @@ msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4717,7 +4757,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4725,8 +4768,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4746,52 +4789,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4805,9 +4853,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4942,7 +4990,55 @@ msgstr ""
 "wyjaśnienia\n"
 "można skontaktować się z firmą Mandriva S.A.\n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4961,70 +5057,55 @@ msgstr ""
 "patent ma zastosowanie w odniesieniu do Ciebie, sprawdź prawo\n"
 "w swoim kraju."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Ostrzeżenie\n"
-"\n"
-"Proszę przeczytać uważnie poniższe zasady. Jeśli nie zgadzasz się\n"
-"z jakąkolwiek ich częścią, nie masz prawa do instalacji kolejnego\n"
-"nośnika CD. Naciśnij \"Odrzuć\" aby kontynuować instalację bez\n"
-"używania tego nośnika.\n"
-"\n"
-"\n"
-"Niektóre komponenty zawarte na następnym nośniku nie podlegają\n"
-"zasadom licencji GPL lub licencji pokrewnych. Każdy taki komponent\n"
-"podlega zasadom własnej licencji. Należy przeczytać uważnie\n"
-"licencję każdego komponentu przed jego rozpowszechnianiem lub\n"
-"instalacją.\n"
-"Takie licencje w ogólności ograniczają przesyłanie, kopiowanie\n"
-"(z wyjątkiem celów archiwizacyjnych), rozpowszechnianie,\n"
-"dezasemblację, dekompilację lub modyfikację.\n"
-"Jakiekolwiek naruszenie zasad licencyjnych natychmiast\n"
-"powoduje wygaśnięcie twoich praw do komponentu. Pomimo\n"
-"specyficznych dla danej licencji zasad, zazwyczaj nie można\n"
-"instalować programów, które im podlegają, na więcej niż jednym\n"
-"systemie, lub też adaptować go do wykorzystania w sieci.\n"
-"W razie wątpliwości należy skontaktować się z dystrybutorem lub\n"
-"autorem danego komponentu.\n"
-"Przesyłanie do osób trzecich lub kopiowanie takich komponentów\n"
-"włączając dokumentację jest zazwyczaj zabronione.\n"
-"\n"
-"\n"
-"Wszelkie prawa do komponentów zawartych na kolejnym nośniku CD\n"
-"należą do ich autorów i są chronione przez prawa autorskie\n"
-"dotyczące oprogramowania komputerowego.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6944,6 +7025,69 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Instalacja zakończyła się niepowodzeniem"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Ostrzeżenie\n"
+#~ "\n"
+#~ "Proszę przeczytać uważnie poniższe zasady. Jeśli nie zgadzasz się\n"
+#~ "z jakąkolwiek ich częścią, nie masz prawa do instalacji kolejnego\n"
+#~ "nośnika CD. Naciśnij \"Odrzuć\" aby kontynuować instalację bez\n"
+#~ "używania tego nośnika.\n"
+#~ "\n"
+#~ "\n"
+#~ "Niektóre komponenty zawarte na następnym nośniku nie podlegają\n"
+#~ "zasadom licencji GPL lub licencji pokrewnych. Każdy taki komponent\n"
+#~ "podlega zasadom własnej licencji. Należy przeczytać uważnie\n"
+#~ "licencję każdego komponentu przed jego rozpowszechnianiem lub\n"
+#~ "instalacją.\n"
+#~ "Takie licencje w ogólności ograniczają przesyłanie, kopiowanie\n"
+#~ "(z wyjątkiem celów archiwizacyjnych), rozpowszechnianie,\n"
+#~ "dezasemblację, dekompilację lub modyfikację.\n"
+#~ "Jakiekolwiek naruszenie zasad licencyjnych natychmiast\n"
+#~ "powoduje wygaśnięcie twoich praw do komponentu. Pomimo\n"
+#~ "specyficznych dla danej licencji zasad, zazwyczaj nie można\n"
+#~ "instalować programów, które im podlegają, na więcej niż jednym\n"
+#~ "systemie, lub też adaptować go do wykorzystania w sieci.\n"
+#~ "W razie wątpliwości należy skontaktować się z dystrybutorem lub\n"
+#~ "autorem danego komponentu.\n"
+#~ "Przesyłanie do osób trzecich lub kopiowanie takich komponentów\n"
+#~ "włączając dokumentację jest zazwyczaj zabronione.\n"
+#~ "\n"
+#~ "\n"
+#~ "Wszelkie prawa do komponentów zawartych na kolejnym nośniku CD\n"
+#~ "należą do ich autorów i są chronione przez prawa autorskie\n"
+#~ "dotyczące oprogramowania komputerowego.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Używaj libsafe dla serwerów"
 
diff --git a/perl-install/share/po/pt.po b/perl-install/share/po/pt.po
index 23fbb269e..cc66705b0 100644
--- a/perl-install/share/po/pt.po
+++ b/perl-install/share/po/pt.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-09-06 11:58+0100\n"
 "Last-Translator: Zé <ze@mandriva.org>\n"
 "Language-Team: Português <pt@li.org>\n"
@@ -1448,18 +1448,14 @@ msgstr "Escolha outra partição"
 msgid "Choose a partition"
 msgstr "Escolha uma partição"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Alternar para modo normal"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Alternar para modo avançado"
+msgid "More"
+msgstr "Mais"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Confirmação"
@@ -1512,13 +1508,17 @@ msgstr "Limpar tudo"
 msgid "Auto allocate"
 msgstr "Auto alocar"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Mais"
+msgid "Toggle to normal mode"
+msgstr "Alternar para modo normal"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Alternar para modo avançado"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Informação dos discos rígidos"
@@ -1572,7 +1572,12 @@ msgstr "Adicionar a RAID"
 msgid "Add to LVM"
 msgstr "Adicionar a LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ID do Utilizador"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Apagar"
@@ -1587,7 +1592,12 @@ msgstr "Remover de RAID"
 msgid "Remove from LVM"
 msgstr "Remover de LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Remover de LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Modificar RAID"
@@ -1764,7 +1774,27 @@ msgstr ""
 "a(s) partição(ões), as verificações do sistema de ficheiros irão ser\n"
 "executada no próximo arranque do Windows(TM)"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Chave de encriptação do sistema de ficheiros"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Escolha a sua chave de encriptação do sistema de ficheiros"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Chave de encriptação"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Escolha um RAID existente para adicionar"
@@ -1878,7 +1908,12 @@ msgstr "Precisa reiniciar antes que as modificações tenham efeito"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "A tabela de partições do dispositivo %s irá ser escrita no disco"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "A formatar a partição %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -2017,7 +2052,27 @@ msgstr "Montado\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Chave de encriptação"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2120,12 +2175,7 @@ msgstr "Tipo da tabela de partições: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "no canal %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Chave de encriptação do sistema de ficheiros"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Escolha a sua chave de encriptação do sistema de ficheiros"
@@ -2142,12 +2192,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "As chaves de encriptação não correspondem"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Chave de encriptação"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Chave de encriptação (novamente)"
@@ -2263,11 +2308,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Precisa ter uma partição FAT montada em /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "A formatar a partição %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4705,7 +4745,7 @@ msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4715,7 +4755,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4723,8 +4766,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4744,52 +4787,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4803,9 +4851,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4940,7 +4988,55 @@ msgstr ""
 "Para qualquer questão acerca deste documento, por favor contacte a Mandriva "
 "S.A.\n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4959,69 +5055,55 @@ msgstr ""
 "Se não tem a certeza que uma patente possa ser aplicada a si, veja as suas "
 "leis locais."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Aviso\n"
-"\n"
-"Por favor leia atentamente os termos abaixo. Se não concorda com,\n"
-"alguma porção, não lhe é permitido instalar o próxima média.\n"
-"Clique em 'Recusar' para continuara instalação sem usar esta média.\n"
-"\n"
-"\n"
-"Algumas componentes da próxima média não estão sob a licença GPL\n"
-"ou acordos similares. Cada componente é gerido pelos termos e\n"
-"condições da sua própria licença.\n"
-"Por favor leia atentamente e aja de acordo com estas licenças\n"
-"específicas antes de usar ou redistribuir os ditos componentes.\n"
-"Tais licenças irão no geral prevenir transferências, duplicação\n"
-"(excepto para propósitos de salvaguarda), redistribuição, engenharia "
-"reversa,\n"
-"desassemblar, de-compilar ou modificar componentes.\n"
-"Qualquer violação do acordo irá imediatamente revogar os seus direitos\n"
-"sob a licença indicada. A não ser que os termos da licença indicada\n"
-"lhe garantam tais direitos, normalmente não pode instalar os programas\n"
-"em mais que um sistema, ou adapte-a para ser usada numa rede. No caso\n"
-"de dúvida, por favor contacte directamente o distribuidor ou o editor do\n"
-"componente. A transferência para terceiros ou a cópia de tais componentes "
-"incluindo\n"
-"a documentação, é normalmente proibido.\n"
-"\n"
-"\n"
-"Todos os direitos para os componentes da próxima média pertencem\n"
-"aos seus respectivos autores e são protegidos pela propriedade intelectual\n"
-"e leis de direitos de autor aplicável aos programas.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6959,6 +7041,69 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Instalação falhada"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Aviso\n"
+#~ "\n"
+#~ "Por favor leia atentamente os termos abaixo. Se não concorda com,\n"
+#~ "alguma porção, não lhe é permitido instalar o próxima média.\n"
+#~ "Clique em 'Recusar' para continuara instalação sem usar esta média.\n"
+#~ "\n"
+#~ "\n"
+#~ "Algumas componentes da próxima média não estão sob a licença GPL\n"
+#~ "ou acordos similares. Cada componente é gerido pelos termos e\n"
+#~ "condições da sua própria licença.\n"
+#~ "Por favor leia atentamente e aja de acordo com estas licenças\n"
+#~ "específicas antes de usar ou redistribuir os ditos componentes.\n"
+#~ "Tais licenças irão no geral prevenir transferências, duplicação\n"
+#~ "(excepto para propósitos de salvaguarda), redistribuição, engenharia "
+#~ "reversa,\n"
+#~ "desassemblar, de-compilar ou modificar componentes.\n"
+#~ "Qualquer violação do acordo irá imediatamente revogar os seus direitos\n"
+#~ "sob a licença indicada. A não ser que os termos da licença indicada\n"
+#~ "lhe garantam tais direitos, normalmente não pode instalar os programas\n"
+#~ "em mais que um sistema, ou adapte-a para ser usada numa rede. No caso\n"
+#~ "de dúvida, por favor contacte directamente o distribuidor ou o editor do\n"
+#~ "componente. A transferência para terceiros ou a cópia de tais componentes "
+#~ "incluindo\n"
+#~ "a documentação, é normalmente proibido.\n"
+#~ "\n"
+#~ "\n"
+#~ "Todos os direitos para os componentes da próxima média pertencem\n"
+#~ "aos seus respectivos autores e são protegidos pela propriedade "
+#~ "intelectual\n"
+#~ "e leis de direitos de autor aplicável aos programas.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Usar libsafe para servidores"
 
diff --git a/perl-install/share/po/pt_BR.po b/perl-install/share/po/pt_BR.po
index f0b8f6e6a..e7807c9c3 100644
--- a/perl-install/share/po/pt_BR.po
+++ b/perl-install/share/po/pt_BR.po
@@ -18,7 +18,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-09-10 14:44-0300\n"
 "Last-Translator: Felipe Arruda <felipemiguel@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@mail.kde.org>\n"
@@ -1456,18 +1456,14 @@ msgstr "Escolha outra partição"
 msgid "Choose a partition"
 msgstr "Escolha uma partição"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Mudar para modo normal"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Mudar para modo expert"
+msgid "More"
+msgstr "Mais"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Confirmação"
@@ -1521,13 +1517,17 @@ msgstr "Limpar tudo"
 msgid "Auto allocate"
 msgstr "Alocar automaticamente"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Mais"
+msgid "Toggle to normal mode"
+msgstr "Mudar para modo normal"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Mudar para modo expert"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Informações do disco rígido"
@@ -1581,7 +1581,12 @@ msgstr "Adicionar ao RAID"
 msgid "Add to LVM"
 msgstr "Adicionar ao LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ID do Usuário"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Remover"
@@ -1596,7 +1601,12 @@ msgstr "Remover do RAID"
 msgid "Remove from LVM"
 msgstr "Remover do LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Remover do LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Modificar RAID"
@@ -1772,7 +1782,27 @@ msgstr ""
 "verificações no sistema de arquivos serão executadas quando o computador "
 "iniciar na próximo vez com o Windows(TM)"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Chave criptográfica do sistema de arquivos"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Escolha a sua chave criptográfica do sistema de arquivos"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Chave criptográfica"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Escolha um RAID existente para adicionar"
@@ -1886,7 +1916,12 @@ msgstr " Você precisará reiniciar para que as modificações tenham efeito"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "A tabela de partição do drive %s está para ser gravada no disco"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formatando partição %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -2025,7 +2060,27 @@ msgstr "Montado\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Chave criptográfica"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2129,12 +2184,7 @@ msgstr "Tipo da tabela de partição: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "no barramento %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Chave criptográfica do sistema de arquivos"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Escolha a sua chave criptográfica do sistema de arquivos"
@@ -2149,12 +2199,7 @@ msgstr "Essa chave é muito simples (deve ter ao menos %d caracteres)"
 msgid "The encryption keys do not match"
 msgstr "As chaves criptográficas não conferem"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Chave criptográfica"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Chave criptográfica (novamente)"
@@ -2269,11 +2314,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Você precisa ter uma partição FAT montada em /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formatando partição %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4715,7 +4755,7 @@ msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4725,7 +4765,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4733,8 +4776,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4754,52 +4797,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4813,9 +4861,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4946,7 +4994,55 @@ msgstr ""
 "Para qualquer pergunta sobre este documento, contate por favor a Mandriva S."
 "A.  \n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4964,73 +5060,55 @@ msgstr ""
 "detalhes). Se você não tem certeza se uma patente é aplicável em seu caso,\n"
 "verifique a legislação local."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
-msgstr ""
-"\n"
-"Aviso\n"
-"Favor ler atentamente os termos abaixo. Se você não concordar com qualquer\n"
-"trecho, você não está autorizado a instalar o próximo CD. Pressione "
-"'Recusar' \n"
-"para continuar a instalação sem utilizar esta mídia.\n"
-"\n"
-"\n"
-"Alguns componentes contidos na próxima mídia CD não estão licenciados\n"
-"sobre a GPL ou acordos similares. Cada componente deste está então "
-"licenciado\n"
-"sob termos e condições de sua própria licença.\n"
-"Por favor, leia atentamente e concorde com tais licenças específicas antes "
-"de \n"
-"usar ou redistribuir os componentes mencionados. \n"
-"Tais licenças irão, em geral, prevenir a transferência, duplicação (exceto \n"
-"para backup), redistribuição, engenharia reversa, desmontagem , "
-"decompilação \n"
-"ou modificação do componente. \n"
-"Qualquer quebra no acordo irá terminar imediatamente com seus direitos "
-"sobre \n"
-"a licença específica. A não ser que a licença específica lhe dê tais \n"
-"direitos, você provavelmente não poderá instalar os programas em mais \n"
-"de um sistema, ou adaptá-los para serem utilizados em uma rede. Em caso de "
-"dúvida, \n"
-"favor contatar diretamente o distribuidor ou editor do componente. \n"
-"A transferência para terceiros ou a cópia de tais componentes, incluindo \n"
-"a documentação, normalmente é proibida.\n"
-"\n"
-"\n"
-"Todos os direitos dos componentes na próxima mídia de CD pertencem aos "
-"seus \n"
-"respectivos autores e estão protegidos sob as leis de propriedade \n"
-"intelectual e direitos autorais, aplicáveis aos Softwares.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
+msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6977,6 +7055,75 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Falha na instalação"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Aviso\n"
+#~ "Favor ler atentamente os termos abaixo. Se você não concordar com "
+#~ "qualquer\n"
+#~ "trecho, você não está autorizado a instalar o próximo CD. Pressione "
+#~ "'Recusar' \n"
+#~ "para continuar a instalação sem utilizar esta mídia.\n"
+#~ "\n"
+#~ "\n"
+#~ "Alguns componentes contidos na próxima mídia CD não estão licenciados\n"
+#~ "sobre a GPL ou acordos similares. Cada componente deste está então "
+#~ "licenciado\n"
+#~ "sob termos e condições de sua própria licença.\n"
+#~ "Por favor, leia atentamente e concorde com tais licenças específicas "
+#~ "antes de \n"
+#~ "usar ou redistribuir os componentes mencionados. \n"
+#~ "Tais licenças irão, em geral, prevenir a transferência, duplicação "
+#~ "(exceto \n"
+#~ "para backup), redistribuição, engenharia reversa, desmontagem , "
+#~ "decompilação \n"
+#~ "ou modificação do componente. \n"
+#~ "Qualquer quebra no acordo irá terminar imediatamente com seus direitos "
+#~ "sobre \n"
+#~ "a licença específica. A não ser que a licença específica lhe dê tais \n"
+#~ "direitos, você provavelmente não poderá instalar os programas em mais \n"
+#~ "de um sistema, ou adaptá-los para serem utilizados em uma rede. Em caso "
+#~ "de dúvida, \n"
+#~ "favor contatar diretamente o distribuidor ou editor do componente. \n"
+#~ "A transferência para terceiros ou a cópia de tais componentes, "
+#~ "incluindo \n"
+#~ "a documentação, normalmente é proibida.\n"
+#~ "\n"
+#~ "\n"
+#~ "Todos os direitos dos componentes na próxima mídia de CD pertencem aos "
+#~ "seus \n"
+#~ "respectivos autores e estão protegidos sob as leis de propriedade \n"
+#~ "intelectual e direitos autorais, aplicáveis aos Softwares.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Usar lbsafe para servidores"
 
diff --git a/perl-install/share/po/ro.po b/perl-install/share/po/ro.po
index f2e44ac31..97a8ef705 100644
--- a/perl-install/share/po/ro.po
+++ b/perl-install/share/po/ro.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX 7.1\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-02-23 14:31+0200\n"
 "Last-Translator: Cosmin Humeniuc <cosmin@mandrivausers.ro>\n"
 "Language-Team: Romanian Translators for Free Software <rtfs-project@lists."
@@ -1393,18 +1393,14 @@ msgstr "Alegeţi o altă partiţie"
 msgid "Choose a partition"
 msgstr "Alegeţi o partiţie"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Trece în mod normal"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Trece în mod expert"
+msgid "More"
+msgstr "Mai multe"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Confirmare"
@@ -1453,13 +1449,17 @@ msgstr "Şterge tot"
 msgid "Auto allocate"
 msgstr "Auto alocare"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Mai multe"
+msgid "Toggle to normal mode"
+msgstr "Trece în mod normal"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Trece în mod expert"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Informaţii despre discurile fixe"
@@ -1513,7 +1513,12 @@ msgstr "Adaugă la RAID"
 msgid "Add to LVM"
 msgstr "Adaugă la LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ID utilizator"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Şterge"
@@ -1528,7 +1533,12 @@ msgstr "Şterge din RAID"
 msgid "Remove from LVM"
 msgstr "Şterge din LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Şterge din LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Modifică RAID"
@@ -1702,7 +1712,27 @@ msgid ""
 "filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Cheie criptare pt. sistemul de fişiere"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Selectaţi cheia de criptare pt. sistemul de fişiere"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Cheia de criptare"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Alegeţi un RAID existent la care să adăugaţi"
@@ -1815,7 +1845,12 @@ msgstr ""
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Tabelul de partiţii al perifericului %s va fi scris pe disc"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formatez partiţia %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1949,7 +1984,27 @@ msgstr "Montat\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Cheia de criptare"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2053,12 +2108,7 @@ msgstr "Tip tabelă de partiţii: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "pe canalul %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Cheie criptare pt. sistemul de fişiere"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Selectaţi cheia de criptare pt. sistemul de fişiere"
@@ -2074,12 +2124,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Cheile de criptare nu corespund"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Cheia de criptare"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Cheia de criptare (din nou)"
@@ -2195,11 +2240,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Trebuie să aveţi o partiţie FAT montată în /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formatez partiţia %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4561,7 +4601,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4569,8 +4612,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4590,52 +4633,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4649,9 +4697,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4672,7 +4720,55 @@ msgid ""
 "For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4684,38 +4780,54 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
+#: messages.pm:123
 #, c-format
 msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
 "\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
 "\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
 "\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
 "\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
diff --git a/perl-install/share/po/ru.po b/perl-install/share/po/ru.po
index c94e90554..36eeaa194 100644
--- a/perl-install/share/po/ru.po
+++ b/perl-install/share/po/ru.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-09-17 19:04+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -19,18 +19,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: any.pm:252
-#: any.pm:853
-#: diskdrake/interactive.pm:554
-#: diskdrake/interactive.pm:741
-#: diskdrake/interactive.pm:785
-#: diskdrake/interactive.pm:843
-#: diskdrake/interactive.pm:1133
-#: do_pkgs.pm:221
-#: do_pkgs.pm:267
-#: harddrake/sound.pm:285
-#: interactive.pm:584
-#: pkgs.pm:257
+#: any.pm:252 any.pm:853 diskdrake/interactive.pm:554
+#: diskdrake/interactive.pm:741 diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:843 diskdrake/interactive.pm:1133 do_pkgs.pm:221
+#: do_pkgs.pm:267 harddrake/sound.pm:285 interactive.pm:584 pkgs.pm:257
 #, c-format
 msgid "Please wait"
 msgstr "Подождите, пожалуйста"
@@ -44,14 +36,18 @@ msgstr "Выполняется установка начального загр�
 #, c-format
 msgid ""
 "LILO wants to assign a new Volume ID to drive %s.  However, changing\n"
-"the Volume ID of a Windows NT, 2000, or XP boot disk is a fatal Windows error.\n"
+"the Volume ID of a Windows NT, 2000, or XP boot disk is a fatal Windows "
+"error.\n"
 "This caution does not apply to Windows 95 or 98, or to NT data disks.\n"
 "\n"
 "Assign a new Volume ID?"
 msgstr ""
-"LILO желает прописать новый Volume ID для диска %s.  Примите к сведению, что\n"
-"изменение Volume ID для загрузочного диска Windows NT, 2000 или XP фатально для Windows.\n"
-"Это предупреждение не актуально для Windows 95, 98 или для дисков с данными NT.\n"
+"LILO желает прописать новый Volume ID для диска %s.  Примите к сведению, "
+"что\n"
+"изменение Volume ID для загрузочного диска Windows NT, 2000 или XP фатально "
+"для Windows.\n"
+"Это предупреждение не актуально для Windows 95, 98 или для дисков с данными "
+"NT.\n"
 "\n"
 "Назначить новый Volume ID?"
 
@@ -82,7 +78,8 @@ msgstr ""
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
-"This implies you already have a bootloader on the hard drive you boot (eg: System Commander).\n"
+"This implies you already have a bootloader on the hard drive you boot (eg: "
+"System Commander).\n"
 "\n"
 "On which drive are you booting?"
 msgstr ""
@@ -132,9 +129,7 @@ msgstr "Куда установить начальный загрузчик?"
 msgid "Boot Style Configuration"
 msgstr "Настройка стиля загрузки"
 
-#: any.pm:396
-#: any.pm:427
-#: any.pm:428
+#: any.pm:396 any.pm:427 any.pm:428
 #, c-format
 msgid "Bootloader main options"
 msgstr "Главные параметры начального загрузчика"
@@ -144,14 +139,12 @@ msgstr "Главные параметры начального загрузчи�
 msgid "Bootloader"
 msgstr "Начальный загрузчик"
 
-#: any.pm:401
-#: any.pm:431
+#: any.pm:401 any.pm:431
 #, c-format
 msgid "Bootloader to use"
 msgstr "Используемый начальный загрузчик"
 
-#: any.pm:403
-#: any.pm:433
+#: any.pm:403 any.pm:433
 #, c-format
 msgid "Boot device"
 msgstr "Загрузочное устройство"
@@ -181,24 +174,18 @@ msgstr "Включить APIC"
 msgid "Enable Local APIC"
 msgstr "Включить Local APIC"
 
-#: any.pm:411
-#: any.pm:797
-#: any.pm:812
-#: authentication.pm:239
+#: any.pm:411 any.pm:797 any.pm:812 authentication.pm:239
 #: diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Password"
 msgstr "Пароль"
 
-#: any.pm:413
-#: authentication.pm:250
+#: any.pm:413 authentication.pm:250
 #, c-format
 msgid "The passwords do not match"
 msgstr "Пароли не совпадают"
 
-#: any.pm:413
-#: authentication.pm:250
-#: diskdrake/interactive.pm:1300
+#: any.pm:413 authentication.pm:250 diskdrake/interactive.pm:1300
 #, c-format
 msgid "Please try again"
 msgstr "Попробуйте ещё раз"
@@ -208,10 +195,7 @@ msgstr "Попробуйте ещё раз"
 msgid "You can not use a password with %s"
 msgstr "Нельзя использовать пароль с %s"
 
-#: any.pm:417
-#: any.pm:799
-#: any.pm:814
-#: authentication.pm:240
+#: any.pm:417 any.pm:799 any.pm:814 authentication.pm:240
 #, c-format
 msgid "Password (again)"
 msgstr "Пароль (еще раз)"
@@ -228,8 +212,10 @@ msgstr "ограничить"
 
 #: any.pm:421
 #, c-format
-msgid "Option ``Restrict command line options'' is of no use without a password"
-msgstr "Опция ``Ограничить параметры командной строки'' не используется без пароля"
+msgid ""
+"Option ``Restrict command line options'' is of no use without a password"
+msgstr ""
+"Опция ``Ограничить параметры командной строки'' не используется без пароля"
 
 #: any.pm:423
 #, c-format
@@ -271,14 +257,12 @@ msgstr "ОС по умолчанию?"
 msgid "Image"
 msgstr "Образ"
 
-#: any.pm:506
-#: any.pm:519
+#: any.pm:506 any.pm:519
 #, c-format
 msgid "Root"
 msgstr "Root"
 
-#: any.pm:507
-#: any.pm:532
+#: any.pm:507 any.pm:532
 #, c-format
 msgid "Append"
 msgstr "Дополнение"
@@ -303,17 +287,12 @@ msgstr "Initrd"
 msgid "Network profile"
 msgstr "Сетевой профиль"
 
-#: any.pm:524
-#: any.pm:529
-#: any.pm:531
-#: diskdrake/interactive.pm:376
+#: any.pm:524 any.pm:529 any.pm:531 diskdrake/interactive.pm:376
 #, c-format
 msgid "Label"
 msgstr "Метка"
 
-#: any.pm:526
-#: any.pm:534
-#: harddrake/v4l.pm:438
+#: any.pm:526 any.pm:534 harddrake/v4l.pm:438
 #, c-format
 msgid "Default"
 msgstr "По умолчанию"
@@ -424,7 +403,8 @@ msgstr "Укажите имя пользователя, пожалуйста"
 
 #: any.pm:776
 #, c-format
-msgid "The user name must contain only lower cased letters, numbers, `-' and `_'"
+msgid ""
+"The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 "Имя пользователя должно содержать только буквы в нижнем регистре, \n"
 "цифры , `-' и `_'"
@@ -439,14 +419,12 @@ msgstr "Имя пользователя слишком длинное"
 msgid "This user name has already been added"
 msgstr "Это имя пользователя уже добавлено"
 
-#: any.pm:784
-#: any.pm:816
+#: any.pm:784 any.pm:816
 #, c-format
 msgid "User ID"
 msgstr "ID пользователя"
 
-#: any.pm:784
-#: any.pm:817
+#: any.pm:784 any.pm:817
 #, c-format
 msgid "Group ID"
 msgstr "ID группы"
@@ -466,8 +444,7 @@ msgstr "%s должно быть больше 500. Принять в любом
 msgid "User management"
 msgstr "Управление пользователями"
 
-#: any.pm:796
-#: authentication.pm:226
+#: any.pm:796 authentication.pm:226
 #, c-format
 msgid "Set administrator (root) password"
 msgstr "Установка пароля администратора (root)"
@@ -502,8 +479,7 @@ msgstr "Командный процессор"
 msgid "Please wait, adding media..."
 msgstr "Подождите. Добавляется источник..."
 
-#: any.pm:866
-#: security/l10n.pm:14
+#: any.pm:866 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "Автоматический вход"
@@ -511,7 +487,9 @@ msgstr "Автоматический вход"
 #: any.pm:867
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
-msgstr "Я могу настроить ваш компьютер на автоматический вход в систему одного пользователя."
+msgstr ""
+"Я могу настроить ваш компьютер на автоматический вход в систему одного "
+"пользователя."
 
 #: any.pm:868
 #, c-format
@@ -528,16 +506,12 @@ msgstr "Выберите пользователя по умолчанию:"
 msgid "Choose the window manager to run:"
 msgstr "Выберите запускаемый оконный менеджер:"
 
-#: any.pm:881
-#: any.pm:899
-#: any.pm:957
+#: any.pm:881 any.pm:899 any.pm:957
 #, c-format
 msgid "Release Notes"
 msgstr "Заметки о релизе"
 
-#: any.pm:906
-#: any.pm:1250
-#: interactive/gtk.pm:804
+#: any.pm:906 any.pm:1250 interactive/gtk.pm:804
 #, c-format
 msgid "Close"
 msgstr "Закрыть"
@@ -547,8 +521,7 @@ msgstr "Закрыть"
 msgid "License agreement"
 msgstr "Лицензионное соглашение"
 
-#: any.pm:945
-#: diskdrake/dav.pm:26
+#: any.pm:945 diskdrake/dav.pm:26
 #, c-format
 msgid "Quit"
 msgstr "Выход"
@@ -568,8 +541,7 @@ msgstr "Принять"
 msgid "Refuse"
 msgstr "Отказаться"
 
-#: any.pm:980
-#: any.pm:1045
+#: any.pm:980 any.pm:1045
 #, c-format
 msgid "Please choose a language to use"
 msgstr "Выберите используемый язык, пожалуйста"
@@ -590,8 +562,7 @@ msgstr ""
 msgid "Multi languages"
 msgstr "Многоязычность"
 
-#: any.pm:1023
-#: any.pm:1054
+#: any.pm:1023 any.pm:1054
 #, c-format
 msgid "Old compatibility (non UTF-8) encoding"
 msgstr "Кодировка для обратной совместимости (не UTF-8)"
@@ -626,9 +597,7 @@ msgstr "Здесь представлен полный список имеющи
 msgid "Other Countries"
 msgstr "Другие страны"
 
-#: any.pm:1105
-#: interactive.pm:484
-#: interactive/gtk.pm:426
+#: any.pm:1105 interactive.pm:484 interactive/gtk.pm:426
 #, c-format
 msgid "Advanced"
 msgstr "Дополнительно"
@@ -662,7 +631,8 @@ msgstr "Выборочно"
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
-"Allowing this will permit users to simply click on \"Share\" in konqueror and nautilus.\n"
+"Allowing this will permit users to simply click on \"Share\" in konqueror "
+"and nautilus.\n"
 "\n"
 "\"Custom\" permit a per-user granularity.\n"
 msgstr ""
@@ -673,18 +643,29 @@ msgstr ""
 
 #: any.pm:1211
 #, c-format
-msgid "NFS: the traditional Unix file sharing system, with less support on Mac and Windows."
-msgstr "NFS: традиционная для Unix система раздачи файлов, имеет слабую поддержку в Mac и Windows."
+msgid ""
+"NFS: the traditional Unix file sharing system, with less support on Mac and "
+"Windows."
+msgstr ""
+"NFS: традиционная для Unix система раздачи файлов, имеет слабую поддержку в "
+"Mac и Windows."
 
 #: any.pm:1214
 #, c-format
-msgid "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux systems."
-msgstr "SMB: система совместного использования файлов, используется в Windows, Mac OS X и в большинстве современных систем Linux."
+msgid ""
+"SMB: a file sharing system used by Windows, Mac OS X and many modern Linux "
+"systems."
+msgstr ""
+"SMB: система совместного использования файлов, используется в Windows, Mac "
+"OS X и в большинстве современных систем Linux."
 
 #: any.pm:1222
 #, c-format
-msgid "You can export using NFS or SMB. Please select which you would like to use."
-msgstr "Вы можете экспортировать при помощи NFS или SMB. Пожалуйста, выберите, который из них вы желаете использовать."
+msgid ""
+"You can export using NFS or SMB. Please select which you would like to use."
+msgstr ""
+"Вы можете экспортировать при помощи NFS или SMB. Пожалуйста, выберите, "
+"который из них вы желаете использовать."
 
 #: any.pm:1250
 #, c-format
@@ -720,8 +701,7 @@ msgstr "Часовой пояс"
 msgid "Which is your timezone?"
 msgstr "Какой у вас часовой пояс?"
 
-#: any.pm:1406
-#: any.pm:1408
+#: any.pm:1406 any.pm:1408
 #, c-format
 msgid "Date, Clock & Time Zone Settings"
 msgstr "Настройка даты, времени и часового пояса"
@@ -771,8 +751,7 @@ msgstr "NIS"
 msgid "Smart Card"
 msgstr "Смарт-карта"
 
-#: authentication.pm:29
-#: authentication.pm:205
+#: authentication.pm:29 authentication.pm:205
 #, c-format
 msgid "Windows Domain"
 msgstr "Домен Windows"
@@ -789,8 +768,11 @@ msgstr "Локальный файл:"
 
 #: authentication.pm:64
 #, c-format
-msgid "Use local for all authentication and information user tell in local file"
-msgstr "Аутентификация выполняется локально, сведения о пользователях заносится в локальный файл"
+msgid ""
+"Use local for all authentication and information user tell in local file"
+msgstr ""
+"Аутентификация выполняется локально, сведения о пользователях заносится в "
+"локальный файл"
 
 #: authentication.pm:65
 #, c-format
@@ -799,8 +781,13 @@ msgstr "LDAP:"
 
 #: authentication.pm:65
 #, c-format
-msgid "Tells your computer to use LDAP for some or all authentication. LDAP consolidates certain types of information within your organization."
-msgstr "Сообщает вашему компьютеру, что он должен использовать LDAP для всех или некоторых авторизаций. LDAP объединяет определенные типы информации внутри вашей организации."
+msgid ""
+"Tells your computer to use LDAP for some or all authentication. LDAP "
+"consolidates certain types of information within your organization."
+msgstr ""
+"Сообщает вашему компьютеру, что он должен использовать LDAP для всех или "
+"некоторых авторизаций. LDAP объединяет определенные типы информации внутри "
+"вашей организации."
 
 #: authentication.pm:66
 #, c-format
@@ -809,8 +796,12 @@ msgstr "NIS:"
 
 #: authentication.pm:66
 #, c-format
-msgid "Allows you to run a group of computers in the same Network Information Service domain with a common password and group file."
-msgstr "Позволяет группе компьютеров работать в одинаковом домене Network Information Service с общими файлами паролей и групп."
+msgid ""
+"Allows you to run a group of computers in the same Network Information "
+"Service domain with a common password and group file."
+msgstr ""
+"Позволяет группе компьютеров работать в одинаковом домене Network "
+"Information Service с общими файлами паролей и групп."
 
 #: authentication.pm:67
 #, c-format
@@ -819,8 +810,12 @@ msgstr "Домен Windows:"
 
 #: authentication.pm:67
 #, c-format
-msgid "Winbind allows the system to retrieve information and authenticate users in a Windows domain."
-msgstr "Winbind позволяет системе получать информацию и аутентифицировать пользователей в домене Windows."
+msgid ""
+"Winbind allows the system to retrieve information and authenticate users in "
+"a Windows domain."
+msgstr ""
+"Winbind позволяет системе получать информацию и аутентифицировать "
+"пользователей в домене Windows."
 
 #: authentication.pm:68
 #, c-format
@@ -832,20 +827,14 @@ msgstr "Kerberos 5 :"
 msgid "With Kerberos and Ldap for authentication in Active Directory Server "
 msgstr "С Kerberos и Ldap для аутентификации на сервере с Active Directory"
 
-#: authentication.pm:96
-#: authentication.pm:130
-#: authentication.pm:149
-#: authentication.pm:150
-#: authentication.pm:176
-#: authentication.pm:200
+#: authentication.pm:96 authentication.pm:130 authentication.pm:149
+#: authentication.pm:150 authentication.pm:176 authentication.pm:200
 #: authentication.pm:878
 #, c-format
 msgid " "
 msgstr " "
 
-#: authentication.pm:97
-#: authentication.pm:131
-#: authentication.pm:177
+#: authentication.pm:97 authentication.pm:131 authentication.pm:177
 #: authentication.pm:201
 #, c-format
 msgid "Welcome to the Authentication Wizard"
@@ -853,17 +842,17 @@ msgstr "Вас приветствует мастер настройки ауте
 
 #: authentication.pm:99
 #, c-format
-msgid "You have selected LDAP authentication. Please review the configuration options below "
+msgid ""
+"You have selected LDAP authentication. Please review the configuration "
+"options below "
 msgstr "Выбрана аутентификация типа LDAP. Проверьте конфигурационные параметры"
 
-#: authentication.pm:101
-#: authentication.pm:156
+#: authentication.pm:101 authentication.pm:156
 #, c-format
 msgid "LDAP Server"
 msgstr "LDAP-сервер"
 
-#: authentication.pm:102
-#: authentication.pm:157
+#: authentication.pm:102 authentication.pm:157
 #, c-format
 msgid "Base dn"
 msgstr "База DN"
@@ -873,46 +862,38 @@ msgstr "База DN"
 msgid "Fetch base Dn "
 msgstr "Получить базу DN"
 
-#: authentication.pm:105
-#: authentication.pm:160
+#: authentication.pm:105 authentication.pm:160
 #, c-format
 msgid "Use encrypt connection with TLS "
 msgstr "Использовать шифрованное соединение с TLS"
 
-#: authentication.pm:106
-#: authentication.pm:161
+#: authentication.pm:106 authentication.pm:161
 #, c-format
 msgid "Download CA Certificate "
 msgstr "Загрузить сертификат CA"
 
-#: authentication.pm:108
-#: authentication.pm:141
+#: authentication.pm:108 authentication.pm:141
 #, c-format
 msgid "Use Disconnect mode "
 msgstr "Использовать автономный режим"
 
-#: authentication.pm:109
-#: authentication.pm:162
+#: authentication.pm:109 authentication.pm:162
 #, c-format
 msgid "Use anonymous BIND "
 msgstr "Использовать анонимный BIND"
 
-#: authentication.pm:110
-#: authentication.pm:113
-#: authentication.pm:115
+#: authentication.pm:110 authentication.pm:113 authentication.pm:115
 #: authentication.pm:119
 #, c-format
 msgid "  "
 msgstr "  "
 
-#: authentication.pm:111
-#: authentication.pm:163
+#: authentication.pm:111 authentication.pm:163
 #, c-format
 msgid "Bind DN "
 msgstr "Привязка DN"
 
-#: authentication.pm:112
-#: authentication.pm:164
+#: authentication.pm:112 authentication.pm:164
 #, c-format
 msgid "Bind Password "
 msgstr "Привязка пароля"
@@ -939,8 +920,11 @@ msgstr "База shadow"
 
 #: authentication.pm:133
 #, c-format
-msgid "You have selected Kerberos 5 authentication. Please review the configuration options below "
-msgstr "Выбрана аутентификация типа Kerberos 5. Проверьте конфигурационные параметры"
+msgid ""
+"You have selected Kerberos 5 authentication. Please review the configuration "
+"options below "
+msgstr ""
+"Выбрана аутентификация типа Kerberos 5. Проверьте конфигурационные параметры"
 
 #: authentication.pm:135
 #, c-format
@@ -974,8 +958,12 @@ msgstr "Использовать LDAP с данными о пользовате�
 
 #: authentication.pm:152
 #, c-format
-msgid "You have selected Kerberos 5 for authentication, now you must choose the type of users information "
-msgstr "Выбрана аутентификация типа Kerberos 5. Теперь необходимо выбрать тип данных пользователей"
+msgid ""
+"You have selected Kerberos 5 for authentication, now you must choose the "
+"type of users information "
+msgstr ""
+"Выбрана аутентификация типа Kerberos 5. Теперь необходимо выбрать тип данных "
+"пользователей"
 
 #: authentication.pm:158
 #, c-format
@@ -984,7 +972,9 @@ msgstr "Получить базу Dn"
 
 #: authentication.pm:179
 #, c-format
-msgid "You have selected NIS authentication. Please review the configuration options below "
+msgid ""
+"You have selected NIS authentication. Please review the configuration "
+"options below "
 msgstr "Выбрана аутентификация типа NIS. Проверьте конфигурационные параметры"
 
 #: authentication.pm:181
@@ -999,8 +989,11 @@ msgstr "Сервер NIS"
 
 #: authentication.pm:203
 #, c-format
-msgid "You have selected Windows Domain authentication. Please review the configuration options below "
-msgstr "Выбрана аутентификация в домене Windows. Проверьте конфигурационные параметры"
+msgid ""
+"You have selected Windows Domain authentication. Please review the "
+"configuration options below "
+msgstr ""
+"Выбрана аутентификация в домене Windows. Проверьте конфигурационные параметры"
 
 #: authentication.pm:207
 #, c-format
@@ -1012,8 +1005,7 @@ msgstr "Тип домена"
 msgid "Active Directory Realm "
 msgstr "Область Active Directory"
 
-#: authentication.pm:225
-#: authentication.pm:241
+#: authentication.pm:225 authentication.pm:241
 #, c-format
 msgid "Authentication"
 msgstr "Аутентификация"
@@ -1112,13 +1104,21 @@ msgstr "Начальный загрузчик нельзя установить
 
 #: bootloader.pm:1964
 #, c-format
-msgid "Your bootloader configuration must be updated because partition has been renumbered"
-msgstr "Так как был изменён номера раздела, необходимо обновить конфигурацию начального загрузчика"
+msgid ""
+"Your bootloader configuration must be updated because partition has been "
+"renumbered"
+msgstr ""
+"Так как был изменён номера раздела, необходимо обновить конфигурацию "
+"начального загрузчика"
 
 #: bootloader.pm:1977
 #, c-format
-msgid "The bootloader can not be installed correctly. You have to boot rescue and choose \"%s\""
-msgstr "Начальный загрузчик не может быть корректно установлен. Вам необходимо загрузиться в режиме rescue и выбрать \"%s\""
+msgid ""
+"The bootloader can not be installed correctly. You have to boot rescue and "
+"choose \"%s\""
+msgstr ""
+"Начальный загрузчик не может быть корректно установлен. Вам необходимо "
+"загрузиться в режиме rescue и выбрать \"%s\""
 
 #: bootloader.pm:1978
 #, c-format
@@ -1145,8 +1145,7 @@ msgstr "МБ"
 msgid "GB"
 msgstr "ГБ"
 
-#: common.pm:142
-#: common.pm:151
+#: common.pm:142 common.pm:151
 #, c-format
 msgid "TB"
 msgstr "ТБ"
@@ -1178,23 +1177,23 @@ msgid ""
 "locally, and treat it like a local filesystem (provided the web server is\n"
 "configured as a WebDAV server). If you would like to add WebDAV mount\n"
 "points, select \"New\"."
-msgstr "WebDAV является протоколом, который позволяет вам локально монтировать директорию веб-сервера, интерпретируя ее как локальную файловую систему (при условии, что веб-сервер настроен как сервер WebDAV). Если вы захотите добавить точки монтирования WebDAV, выберите \"Новая\"."
+msgstr ""
+"WebDAV является протоколом, который позволяет вам локально монтировать "
+"директорию веб-сервера, интерпретируя ее как локальную файловую систему (при "
+"условии, что веб-сервер настроен как сервер WebDAV). Если вы захотите "
+"добавить точки монтирования WebDAV, выберите \"Новая\"."
 
 #: diskdrake/dav.pm:25
 #, c-format
 msgid "New"
 msgstr "Новая"
 
-#: diskdrake/dav.pm:61
-#: diskdrake/interactive.pm:382
-#: diskdrake/smbnfs_gtk.pm:75
+#: diskdrake/dav.pm:61 diskdrake/interactive.pm:382 diskdrake/smbnfs_gtk.pm:75
 #, c-format
 msgid "Unmount"
 msgstr "Размонтировать"
 
-#: diskdrake/dav.pm:62
-#: diskdrake/interactive.pm:379
-#: diskdrake/smbnfs_gtk.pm:76
+#: diskdrake/dav.pm:62 diskdrake/interactive.pm:379 diskdrake/smbnfs_gtk.pm:76
 #, c-format
 msgid "Mount"
 msgstr "Монтировать"
@@ -1204,64 +1203,37 @@ msgstr "Монтировать"
 msgid "Server"
 msgstr "Сервер"
 
-#: diskdrake/dav.pm:64
-#: diskdrake/interactive.pm:373
-#: diskdrake/interactive.pm:613
-#: diskdrake/interactive.pm:631
-#: diskdrake/interactive.pm:635
-#: diskdrake/removable.pm:23
+#: diskdrake/dav.pm:64 diskdrake/interactive.pm:373
+#: diskdrake/interactive.pm:613 diskdrake/interactive.pm:631
+#: diskdrake/interactive.pm:635 diskdrake/removable.pm:23
 #: diskdrake/smbnfs_gtk.pm:79
 #, c-format
 msgid "Mount point"
 msgstr "Точка монтирования"
 
-#: diskdrake/dav.pm:65
-#: diskdrake/interactive.pm:375
-#: diskdrake/interactive.pm:989
-#: diskdrake/removable.pm:24
+#: diskdrake/dav.pm:65 diskdrake/interactive.pm:375
+#: diskdrake/interactive.pm:989 diskdrake/removable.pm:24
 #: diskdrake/smbnfs_gtk.pm:80
 #, c-format
 msgid "Options"
 msgstr "Параметры"
 
-#: diskdrake/dav.pm:66
-#: diskdrake/hd_gtk.pm:174
-#: diskdrake/removable.pm:26
-#: diskdrake/smbnfs_gtk.pm:82
-#: interactive/http.pm:151
+#: diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:174 diskdrake/removable.pm:26
+#: diskdrake/smbnfs_gtk.pm:82 interactive/http.pm:151
 #, c-format
 msgid "Done"
 msgstr "Готово"
 
-#: diskdrake/dav.pm:75
-#: diskdrake/hd_gtk.pm:120
-#: diskdrake/hd_gtk.pm:272
-#: diskdrake/interactive.pm:233
-#: diskdrake/interactive.pm:246
-#: diskdrake/interactive.pm:480
-#: diskdrake/interactive.pm:485
-#: diskdrake/interactive.pm:603
-#: diskdrake/interactive.pm:861
-#: diskdrake/interactive.pm:1035
-#: diskdrake/interactive.pm:1048
-#: diskdrake/interactive.pm:1051
-#: diskdrake/interactive.pm:1300
-#: diskdrake/smbnfs_gtk.pm:42
-#: do_pkgs.pm:23
-#: do_pkgs.pm:28
-#: do_pkgs.pm:44
-#: do_pkgs.pm:60
-#: do_pkgs.pm:65
-#: fsedit.pm:222
-#: interactive/http.pm:117
-#: interactive/http.pm:118
-#: modules/interactive.pm:19
-#: scanner.pm:94
-#: scanner.pm:105
-#: scanner.pm:112
-#: scanner.pm:119
-#: wizards.pm:95
-#: wizards.pm:99
+#: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:120 diskdrake/hd_gtk.pm:272
+#: diskdrake/interactive.pm:233 diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:480 diskdrake/interactive.pm:485
+#: diskdrake/interactive.pm:603 diskdrake/interactive.pm:861
+#: diskdrake/interactive.pm:1035 diskdrake/interactive.pm:1048
+#: diskdrake/interactive.pm:1051 diskdrake/interactive.pm:1300
+#: diskdrake/smbnfs_gtk.pm:42 do_pkgs.pm:23 do_pkgs.pm:28 do_pkgs.pm:44
+#: do_pkgs.pm:60 do_pkgs.pm:65 fsedit.pm:222 interactive/http.pm:117
+#: interactive/http.pm:118 modules/interactive.pm:19 scanner.pm:94
+#: scanner.pm:105 scanner.pm:112 scanner.pm:119 wizards.pm:95 wizards.pm:99
 #: wizards.pm:121
 #, c-format
 msgid "Error"
@@ -1282,30 +1254,22 @@ msgstr "URL должен начинаться с  http:// или https://"
 msgid "Server: "
 msgstr "Сервер: "
 
-#: diskdrake/dav.pm:110
-#: diskdrake/interactive.pm:453
-#: diskdrake/interactive.pm:1180
-#: diskdrake/interactive.pm:1260
+#: diskdrake/dav.pm:110 diskdrake/interactive.pm:453
+#: diskdrake/interactive.pm:1180 diskdrake/interactive.pm:1260
 #, c-format
 msgid "Mount point: "
 msgstr "Точка монтирования:"
 
-#: diskdrake/dav.pm:111
-#: diskdrake/interactive.pm:1267
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1267
 #, c-format
 msgid "Options: %s"
 msgstr "Параметры: %s"
 
-#: diskdrake/hd_gtk.pm:54
-#: diskdrake/interactive.pm:284
-#: diskdrake/smbnfs_gtk.pm:22
-#: fs/mount_point.pm:106
-#: fs/partitioning_wizard.pm:51
-#: fs/partitioning_wizard.pm:206
-#: fs/partitioning_wizard.pm:211
-#: fs/partitioning_wizard.pm:250
-#: fs/partitioning_wizard.pm:269
-#: fs/partitioning_wizard.pm:274
+#: diskdrake/hd_gtk.pm:54 diskdrake/interactive.pm:284
+#: diskdrake/smbnfs_gtk.pm:22 fs/mount_point.pm:106
+#: fs/partitioning_wizard.pm:51 fs/partitioning_wizard.pm:206
+#: fs/partitioning_wizard.pm:211 fs/partitioning_wizard.pm:250
+#: fs/partitioning_wizard.pm:269 fs/partitioning_wizard.pm:274
 #, c-format
 msgid "Partitioning"
 msgstr "Разметка диска"
@@ -1315,10 +1279,8 @@ msgstr "Разметка диска"
 msgid "Click on a partition, choose a filesystem type then choose an action"
 msgstr "Выберите раздел, смените файловую систему, затем выберите действие"
 
-#: diskdrake/hd_gtk.pm:102
-#: diskdrake/interactive.pm:1010
-#: diskdrake/interactive.pm:1020
-#: diskdrake/interactive.pm:1073
+#: diskdrake/hd_gtk.pm:102 diskdrake/interactive.pm:1010
+#: diskdrake/interactive.pm:1020 diskdrake/interactive.pm:1073
 #, c-format
 msgid "Read carefully"
 msgstr "Прочтите внимательно"
@@ -1328,8 +1290,7 @@ msgstr "Прочтите внимательно"
 msgid "Please make a backup of your data first"
 msgstr "Пожалуйста, сделайте резервную копию данных сначала"
 
-#: diskdrake/hd_gtk.pm:103
-#: diskdrake/interactive.pm:226
+#: diskdrake/hd_gtk.pm:103 diskdrake/interactive.pm:226
 #, c-format
 msgid "Exit"
 msgstr "Выход"
@@ -1339,13 +1300,8 @@ msgstr "Выход"
 msgid "Continue"
 msgstr "Продолжить"
 
-#: diskdrake/hd_gtk.pm:170
-#: interactive.pm:649
-#: interactive/gtk.pm:781
-#: interactive/gtk.pm:797
-#: interactive/gtk.pm:815
-#: ugtk2.pm:933
-#: ugtk2.pm:934
+#: diskdrake/hd_gtk.pm:170 interactive.pm:649 interactive/gtk.pm:781
+#: interactive/gtk.pm:797 interactive/gtk.pm:815 ugtk2.pm:933 ugtk2.pm:934
 #, c-format
 msgid "Help"
 msgstr "Справка"
@@ -1366,8 +1322,7 @@ msgstr ""
 msgid "Please click on a partition"
 msgstr "Пожалуйста, щелкните на раздел"
 
-#: diskdrake/hd_gtk.pm:224
-#: diskdrake/smbnfs_gtk.pm:63
+#: diskdrake/hd_gtk.pm:224 diskdrake/smbnfs_gtk.pm:63
 #, c-format
 msgid "Details"
 msgstr "Подробности"
@@ -1412,14 +1367,12 @@ msgstr "HFS"
 msgid "Windows"
 msgstr "Windows"
 
-#: diskdrake/hd_gtk.pm:362
-#: services.pm:158
+#: diskdrake/hd_gtk.pm:362 services.pm:158
 #, c-format
 msgid "Other"
 msgstr "Другие"
 
-#: diskdrake/hd_gtk.pm:362
-#: diskdrake/interactive.pm:1195
+#: diskdrake/hd_gtk.pm:362 diskdrake/interactive.pm:1195
 #, c-format
 msgid "Empty"
 msgstr "Пусто"
@@ -1429,22 +1382,13 @@ msgstr "Пусто"
 msgid "Filesystem types:"
 msgstr "Типы файловых систем:"
 
-#: diskdrake/hd_gtk.pm:390
-#: diskdrake/interactive.pm:289
-#: diskdrake/interactive.pm:361
-#: diskdrake/interactive.pm:510
-#: diskdrake/interactive.pm:694
-#: diskdrake/interactive.pm:752
-#: diskdrake/interactive.pm:841
-#: diskdrake/interactive.pm:883
-#: diskdrake/interactive.pm:884
-#: diskdrake/interactive.pm:1118
-#: diskdrake/interactive.pm:1156
-#: diskdrake/interactive.pm:1299
-#: do_pkgs.pm:19
-#: do_pkgs.pm:39
-#: do_pkgs.pm:57
-#: harddrake/sound.pm:422
+#: diskdrake/hd_gtk.pm:390 diskdrake/interactive.pm:289
+#: diskdrake/interactive.pm:361 diskdrake/interactive.pm:510
+#: diskdrake/interactive.pm:694 diskdrake/interactive.pm:752
+#: diskdrake/interactive.pm:841 diskdrake/interactive.pm:883
+#: diskdrake/interactive.pm:884 diskdrake/interactive.pm:1118
+#: diskdrake/interactive.pm:1156 diskdrake/interactive.pm:1299 do_pkgs.pm:19
+#: do_pkgs.pm:39 do_pkgs.pm:57 harddrake/sound.pm:422
 #, c-format
 msgid "Warning"
 msgstr "Внимание"
@@ -1464,12 +1408,9 @@ msgstr "Используйте сначала ``Размонтировать''"
 msgid "Use ``%s'' instead (in expert mode)"
 msgstr "Вместо этого используйте ``%s'' (в режиме эксперта)"
 
-#: diskdrake/hd_gtk.pm:399
-#: diskdrake/interactive.pm:374
-#: diskdrake/interactive.pm:548
-#: diskdrake/interactive.pm:1026
-#: diskdrake/removable.pm:25
-#: diskdrake/removable.pm:48
+#: diskdrake/hd_gtk.pm:399 diskdrake/interactive.pm:374
+#: diskdrake/interactive.pm:548 diskdrake/interactive.pm:1026
+#: diskdrake/removable.pm:25 diskdrake/removable.pm:48
 #, c-format
 msgid "Type"
 msgstr "Тип"
@@ -1484,19 +1425,14 @@ msgstr "Выберите другой раздел"
 msgid "Choose a partition"
 msgstr "Выберите раздел"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Переключиться в нормальный режим"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Переключиться в режим эксперта"
+msgid "More"
+msgstr "Больше"
 
-#: diskdrake/interactive.pm:267
-#: diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Подтверждение"
@@ -1521,11 +1457,11 @@ msgstr "Выйти без записи таблицы разделов?"
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "Желаете сохранить изменения /etc/fstab"
 
-#: diskdrake/interactive.pm:284
-#: fs/partitioning_wizard.pm:250
+#: diskdrake/interactive.pm:284 fs/partitioning_wizard.pm:250
 #, c-format
 msgid "You need to reboot for the partition table modifications to take place"
-msgstr "Вам нужно перезагрузиться, чтобы изменения таблицы разделов вступили в силу"
+msgstr ""
+"Вам нужно перезагрузиться, чтобы изменения таблицы разделов вступили в силу"
 
 #: diskdrake/interactive.pm:289
 #, c-format
@@ -1548,14 +1484,17 @@ msgstr "Очистить все"
 msgid "Auto allocate"
 msgstr "Разместить автоматически"
 
-#: diskdrake/interactive.pm:304
-#: diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Больше"
+msgid "Toggle to normal mode"
+msgstr "Переключиться в нормальный режим"
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Переключиться в режим эксперта"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Информация о жестком диске"
@@ -1572,8 +1511,12 @@ msgstr "Добавление новых разделов невозможно"
 
 #: diskdrake/interactive.pm:343
 #, c-format
-msgid "To have more partitions, please delete one to be able to create an extended partition"
-msgstr "Чтобы получить больше разделов, удалите один, чтобы получить возможность создать расширенный раздел"
+msgid ""
+"To have more partitions, please delete one to be able to create an extended "
+"partition"
+msgstr ""
+"Чтобы получить больше разделов, удалите один, чтобы получить возможность "
+"создать расширенный раздел"
 
 #: diskdrake/interactive.pm:354
 #, c-format
@@ -1585,8 +1528,7 @@ msgstr "Перезагрузить таблицу разделов"
 msgid "Detailed information"
 msgstr "Подробная информация"
 
-#: diskdrake/interactive.pm:377
-#: diskdrake/interactive.pm:707
+#: diskdrake/interactive.pm:377 diskdrake/interactive.pm:707
 #, c-format
 msgid "Resize"
 msgstr "Изменить размер"
@@ -1596,19 +1538,22 @@ msgstr "Изменить размер"
 msgid "Format"
 msgstr "Форматировать"
 
-#: diskdrake/interactive.pm:380
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:380 diskdrake/interactive.pm:793
 #, c-format
 msgid "Add to RAID"
 msgstr "Добавить в RAID"
 
-#: diskdrake/interactive.pm:381
-#: diskdrake/interactive.pm:811
+#: diskdrake/interactive.pm:381 diskdrake/interactive.pm:811
 #, c-format
 msgid "Add to LVM"
 msgstr "Добавить в LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ID пользователя"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Удалить"
@@ -1623,7 +1568,12 @@ msgstr "Удалить из RAID"
 msgid "Remove from LVM"
 msgstr "Удалить из LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Удалить из LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Изменить RAID"
@@ -1638,8 +1588,7 @@ msgstr "Использовать для loopback"
 msgid "Create"
 msgstr "Создать"
 
-#: diskdrake/interactive.pm:442
-#: diskdrake/interactive.pm:444
+#: diskdrake/interactive.pm:442 diskdrake/interactive.pm:444
 #, c-format
 msgid "Create a new partition"
 msgstr "Создать новый раздел"
@@ -1649,14 +1598,12 @@ msgstr "Создать новый раздел"
 msgid "Start sector: "
 msgstr "Начальный сектор: "
 
-#: diskdrake/interactive.pm:449
-#: diskdrake/interactive.pm:876
+#: diskdrake/interactive.pm:449 diskdrake/interactive.pm:876
 #, c-format
 msgid "Size in MB: "
 msgstr "Размер в MB: "
 
-#: diskdrake/interactive.pm:451
-#: diskdrake/interactive.pm:877
+#: diskdrake/interactive.pm:451 diskdrake/interactive.pm:877
 #, c-format
 msgid "Filesystem type: "
 msgstr "Тип файловой системы: "
@@ -1689,16 +1636,17 @@ msgstr "Удалить файл loopback?"
 
 #: diskdrake/interactive.pm:532
 #, c-format
-msgid "After changing type of partition %s, all data on this partition will be lost"
-msgstr "После изменения типа раздела %s, все данные в этом разделе будут потеряны"
+msgid ""
+"After changing type of partition %s, all data on this partition will be lost"
+msgstr ""
+"После изменения типа раздела %s, все данные в этом разделе будут потеряны"
 
 #: diskdrake/interactive.pm:545
 #, c-format
 msgid "Change partition type"
 msgstr "Изменить тип раздела"
 
-#: diskdrake/interactive.pm:547
-#: diskdrake/removable.pm:47
+#: diskdrake/interactive.pm:547 diskdrake/removable.pm:47
 #, c-format
 msgid "Which filesystem do you want?"
 msgstr "Какую файловую систему желаете?"
@@ -1708,8 +1656,7 @@ msgstr "Какую файловую систему желаете?"
 msgid "Switching from %s to %s"
 msgstr "Переключение с %s на %s"
 
-#: diskdrake/interactive.pm:580
-#: diskdrake/interactive.pm:583
+#: diskdrake/interactive.pm:580 diskdrake/interactive.pm:583
 #, c-format
 msgid "Which volume label?"
 msgstr "Метка тома?"
@@ -1734,17 +1681,17 @@ msgstr "Куда вы хотите примонтировать устройст
 msgid ""
 "Can not unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
-msgstr "Невозможно снять точку монтирования, поскольку этот раздел используется для loop back. Удалите сначала loopback"
+msgstr ""
+"Невозможно снять точку монтирования, поскольку этот раздел используется для "
+"loop back. Удалите сначала loopback"
 
 #: diskdrake/interactive.pm:634
 #, c-format
 msgid "Where do you want to mount %s?"
 msgstr "Куда вы хотите примонтировать %s?"
 
-#: diskdrake/interactive.pm:658
-#: diskdrake/interactive.pm:741
-#: fs/partitioning_wizard.pm:146
-#: fs/partitioning_wizard.pm:178
+#: diskdrake/interactive.pm:658 diskdrake/interactive.pm:741
+#: fs/partitioning_wizard.pm:146 fs/partitioning_wizard.pm:178
 #, c-format
 msgid "Resizing"
 msgstr "Изменение размера"
@@ -1767,7 +1714,8 @@ msgstr "Для всех данных в этом разделе должна б�
 #: diskdrake/interactive.pm:701
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
-msgstr "После изменения размера раздела %s все данные в этом разделе будут потеряны"
+msgstr ""
+"После изменения размера раздела %s все данные в этом разделе будут потеряны"
 
 #: diskdrake/interactive.pm:708
 #, c-format
@@ -1789,8 +1737,7 @@ msgstr "Минимальный размер: %s МБ"
 msgid "Maximum size: %s MB"
 msgstr "Максимальный размер: %s МБ"
 
-#: diskdrake/interactive.pm:752
-#: fs/partitioning_wizard.pm:186
+#: diskdrake/interactive.pm:752 fs/partitioning_wizard.pm:186
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
@@ -1800,13 +1747,32 @@ msgstr ""
 "раздела(ов) при следующей загрузке в Microsoft Windows® будет \n"
 "запущена проверка файловой системы "
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Ключ шифрования файловой системы: "
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Выберите ключ шифрования вашей файловой системы"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Ключ шифрования"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Выберите существующий RAID для добавления"
 
-#: diskdrake/interactive.pm:795
-#: diskdrake/interactive.pm:813
+#: diskdrake/interactive.pm:795 diskdrake/interactive.pm:813
 #, c-format
 msgid "new"
 msgstr "новый"
@@ -1828,7 +1794,8 @@ msgid ""
 "Do you want to move used physical extents on this volume to other volumes?"
 msgstr ""
 "Физический раздел %s используется.\n"
-"Желаете ли вы переместить используемые физические области на этом разделе на другие разделы?"
+"Желаете ли вы переместить используемые физические области на этом разделе на "
+"другие разделы?"
 
 #: diskdrake/interactive.pm:843
 #, c-format
@@ -1865,8 +1832,7 @@ msgstr "Файл уже используется другим loopback, выбе
 msgid "File already exists. Use it?"
 msgstr "Файл уже существует. Использовать его?"
 
-#: diskdrake/interactive.pm:916
-#: diskdrake/interactive.pm:919
+#: diskdrake/interactive.pm:916 diskdrake/interactive.pm:919
 #, c-format
 msgid "Mount options"
 msgstr "Параметры монтирования"
@@ -1916,13 +1882,18 @@ msgstr "Вам необходимо перегрузиться, чтобы из�
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Таблица разделов устройства %s будет записана на диск"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Форматируется раздел %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
-msgstr "После форматирования раздела %s, все данные на этом разделе будут потеряны"
+msgstr ""
+"После форматирования раздела %s, все данные на этом разделе будут потеряны"
 
-#: diskdrake/interactive.pm:1103
-#: fs/partitioning.pm:48
+#: diskdrake/interactive.pm:1103 fs/partitioning.pm:48
 #, c-format
 msgid "Check bad blocks?"
 msgstr "Проверить плохие блоки?"
@@ -1943,12 +1914,16 @@ msgid ""
 "Directory %s already contains data\n"
 "(%s)\n"
 "\n"
-"You can either choose to move the files into the partition that will be mounted there or leave them where they are (which results in hiding them by the contents of the mounted partition)"
+"You can either choose to move the files into the partition that will be "
+"mounted there or leave them where they are (which results in hiding them by "
+"the contents of the mounted partition)"
 msgstr ""
 "Каталог %s уже содержит данные\n"
 "(%s)\n"
 "\n"
-"Вы можете или переместить файлы на раздел, который потом будет примонтирован в этот каталог, или оставить оставить их нетронутыми (в результате чего они будут скрыты примонтированным каталогом)."
+"Вы можете или переместить файлы на раздел, который потом будет примонтирован "
+"в этот каталог, или оставить оставить их нетронутыми (в результате чего они "
+"будут скрыты примонтированным каталогом)."
 
 #: diskdrake/interactive.pm:1133
 #, c-format
@@ -1975,8 +1950,7 @@ msgstr "раздел %s теперь известен как %s"
 msgid "Partitions have been renumbered: "
 msgstr "У Для разделов были изменены номера: "
 
-#: diskdrake/interactive.pm:1181
-#: diskdrake/interactive.pm:1244
+#: diskdrake/interactive.pm:1181 diskdrake/interactive.pm:1244
 #, c-format
 msgid "Device: "
 msgstr "Устройство: "
@@ -1996,15 +1970,13 @@ msgstr "UUID: "
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "буква диска DOS: %s (просто предположение)\n"
 
-#: diskdrake/interactive.pm:1188
-#: diskdrake/interactive.pm:1197
+#: diskdrake/interactive.pm:1188 diskdrake/interactive.pm:1197
 #: diskdrake/interactive.pm:1263
 #, c-format
 msgid "Type: "
 msgstr "Тип: "
 
-#: diskdrake/interactive.pm:1192
-#: diskdrake/interactive.pm:1248
+#: diskdrake/interactive.pm:1192 diskdrake/interactive.pm:1248
 #, c-format
 msgid "Name: "
 msgstr "Имя: "
@@ -2054,7 +2026,27 @@ msgstr "Примонтирован\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Ключ шифрования"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2158,12 +2150,7 @@ msgstr "Тип таблицы разделов: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "на канале %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Ключ шифрования файловой системы: "
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Выберите ключ шифрования вашей файловой системы"
@@ -2171,19 +2158,16 @@ msgstr "Выберите ключ шифрования вашей файлово
 #: diskdrake/interactive.pm:1299
 #, c-format
 msgid "This encryption key is too simple (must be at least %d characters long)"
-msgstr "Этот ключ шифрования слишком прост (должен быть длиной по крайней мере в %d символов)"
+msgstr ""
+"Этот ключ шифрования слишком прост (должен быть длиной по крайней мере в %d "
+"символов)"
 
 #: diskdrake/interactive.pm:1300
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "Ключи шифрования не совпадают"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Ключ шифрования"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Ключ шифрования (еще раз)"
@@ -2198,18 +2182,10 @@ msgstr "Алгоритм шифрования"
 msgid "Change type"
 msgstr "Изменить тип"
 
-#: diskdrake/smbnfs_gtk.pm:81
-#: interactive.pm:129
-#: interactive.pm:546
-#: interactive/curses.pm:260
-#: interactive/http.pm:104
-#: interactive/http.pm:160
-#: interactive/stdio.pm:39
-#: interactive/stdio.pm:148
-#: ugtk2.pm:415
-#: ugtk2.pm:517
-#: ugtk2.pm:526
-#: ugtk2.pm:813
+#: diskdrake/smbnfs_gtk.pm:81 interactive.pm:129 interactive.pm:546
+#: interactive/curses.pm:260 interactive/http.pm:104 interactive/http.pm:160
+#: interactive/stdio.pm:39 interactive/stdio.pm:148 ugtk2.pm:415 ugtk2.pm:517
+#: ugtk2.pm:526 ugtk2.pm:813
 #, c-format
 msgid "Cancel"
 msgstr "Отмена"
@@ -2219,8 +2195,7 @@ msgstr "Отмена"
 msgid "Can not login using username %s (bad password?)"
 msgstr "Невозможно войти под пользователем %s (неверный пароль?)"
 
-#: diskdrake/smbnfs_gtk.pm:168
-#: diskdrake/smbnfs_gtk.pm:177
+#: diskdrake/smbnfs_gtk.pm:168 diskdrake/smbnfs_gtk.pm:177
 #, c-format
 msgid "Domain Authentication Required"
 msgstr "Требуется аутентификация домена"
@@ -2237,8 +2212,11 @@ msgstr "Еще один"
 
 #: diskdrake/smbnfs_gtk.pm:178
 #, c-format
-msgid "Please enter your username, password and domain name to access this host."
-msgstr "Пожалуйста, введите свои имя пользователя, пароль и имя домена, чтобы получить доступ к хосту"
+msgid ""
+"Please enter your username, password and domain name to access this host."
+msgstr ""
+"Пожалуйста, введите свои имя пользователя, пароль и имя домена, чтобы "
+"получить доступ к хосту"
 
 #: diskdrake/smbnfs_gtk.pm:180
 #, c-format
@@ -2260,21 +2238,17 @@ msgstr "Поиск серверов"
 msgid "Search new servers"
 msgstr "Поиск новых серверов"
 
-#: do_pkgs.pm:19
-#: do_pkgs.pm:57
+#: do_pkgs.pm:19 do_pkgs.pm:57
 #, c-format
 msgid "The package %s needs to be installed. Do you want to install it?"
 msgstr "Необходимо установить пакет %s. Хотите установить его?"
 
-#: do_pkgs.pm:23
-#: do_pkgs.pm:44
-#: do_pkgs.pm:60
+#: do_pkgs.pm:23 do_pkgs.pm:44 do_pkgs.pm:60
 #, c-format
 msgid "Could not install the %s package!"
 msgstr "Невозможно установить пакет %s !"
 
-#: do_pkgs.pm:28
-#: do_pkgs.pm:65
+#: do_pkgs.pm:28 do_pkgs.pm:65
 #, c-format
 msgid "Mandatory package %s is missing"
 msgstr "Обязательный пакет %s отсутствует"
@@ -2296,21 +2270,19 @@ msgstr "Удаляются пакеты..."
 
 #: 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"
-msgstr "Произошла ошибка - не были найдены верные устройства для создания новых файловых систем. Пожалуйста, проверьте свое аппаратное обеспечение для выяснения вероятной причины."
+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"
+msgstr ""
+"Произошла ошибка - не были найдены верные устройства для создания новых "
+"файловых систем. Пожалуйста, проверьте свое аппаратное обеспечение для "
+"выяснения вероятной причины."
 
-#: fs/any.pm:75
-#: fs/partitioning_wizard.pm:59
+#: fs/any.pm:75 fs/partitioning_wizard.pm:59
 #, c-format
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "У вас должен быть раздел FAT, примонтированный на /boot/efi"
 
-#: fs/format.pm:63
-#: fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Форматируется раздел %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -2321,8 +2293,7 @@ msgstr "Создается и форматируется файл %s"
 msgid "I do not know how to format %s in type %s"
 msgstr "Не знаю как форматировать %s с типом %s"
 
-#: fs/format.pm:127
-#: fs/format.pm:129
+#: fs/format.pm:127 fs/format.pm:129
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s форматирование %s завершилось неудачно"
@@ -2342,14 +2313,12 @@ msgstr "Монтируется раздел %s"
 msgid "mounting partition %s in directory %s failed"
 msgstr "монтирование раздела %s в каталог %s завершилось неудачно"
 
-#: fs/mount.pm:85
-#: fs/mount.pm:102
+#: fs/mount.pm:85 fs/mount.pm:102
 #, c-format
 msgid "Checking %s"
 msgstr "Проверяется %s"
 
-#: fs/mount.pm:119
-#: partition_table.pm:403
+#: fs/mount.pm:119 partition_table.pm:403
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "ошибка размонтирования %s: %s"
@@ -2372,7 +2341,8 @@ msgstr "Очищать кэш записи при закрытии файла"
 #: fs/mount_options.pm:119
 #, c-format
 msgid "Enable group disk quota accounting and optionally enforce limits"
-msgstr "Разрешить подсчет дисковых квот для групп и опционально установку лимитов"
+msgstr ""
+"Разрешить подсчет дисковых квот для групп и опционально установку лимитов"
 
 #: fs/mount_options.pm:121
 #, c-format
@@ -2381,7 +2351,8 @@ msgid ""
 "(e.g, for faster access on the news spool to speed up news servers)."
 msgstr ""
 "Не обновлять время доступа к inode на этой файловой системе\n"
-"(нужно для более быстрого доступа к спулу новостей для ускорения работы серверов новостей)."
+"(нужно для более быстрого доступа к спулу новостей для ускорения работы "
+"серверов новостей)."
 
 #: fs/mount_options.pm:124
 #, c-format
@@ -2390,7 +2361,8 @@ msgid ""
 "(e.g, for faster access on the news spool to speed up news servers)."
 msgstr ""
 "Не обновлять время доступа к inode на этой файловой системе\n"
-"(нужно для более быстрого доступа к спулу новостей для ускорения работы серверов новостей)."
+"(нужно для более быстрого доступа к спулу новостей для ускорения работы "
+"серверов новостей)."
 
 #: fs/mount_options.pm:127
 #, c-format
@@ -2404,7 +2376,9 @@ msgstr ""
 #: fs/mount_options.pm:130
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
-msgstr "Не интерпретировать символьные или специальные блочные устройства в файловой системе."
+msgstr ""
+"Не интерпретировать символьные или специальные блочные устройства в файловой "
+"системе."
 
 #: fs/mount_options.pm:132
 #, c-format
@@ -2442,7 +2416,8 @@ msgstr "Все I/O для файловой системы должны быть
 #: fs/mount_options.pm:144
 #, c-format
 msgid "Allow every user to mount and umount the file system."
-msgstr "Разрешить всем пользователям монтировать и размонтировать файловую систему."
+msgstr ""
+"Разрешить всем пользователям монтировать и размонтировать файловую систему."
 
 #: fs/mount_options.pm:146
 #, c-format
@@ -2452,7 +2427,9 @@ msgstr "Разрешить обычному пользователям монт�
 #: fs/mount_options.pm:148
 #, c-format
 msgid "Enable user disk quota accounting, and optionally enforce limits"
-msgstr "Включить учёт дисковых квот для пользователей и, опционально, установку лимитов."
+msgstr ""
+"Включить учёт дисковых квот для пользователей и, опционально, установку "
+"лимитов."
 
 #: fs/mount_options.pm:150
 #, c-format
@@ -2496,13 +2473,19 @@ msgstr "Выберите разделы, которые вы хотите отф
 
 #: fs/partitioning.pm:75
 #, c-format
-msgid "Failed to check filesystem %s. Do you want to repair the errors? (beware, you can lose data)"
-msgstr "Проверка файловой системы %s завершилась неудачей. Хотите исправить ошибки (осторожно, вы можете потерять данные)?"
+msgid ""
+"Failed to check filesystem %s. Do you want to repair the errors? (beware, "
+"you can lose data)"
+msgstr ""
+"Проверка файловой системы %s завершилась неудачей. Хотите исправить ошибки "
+"(осторожно, вы можете потерять данные)?"
 
 #: fs/partitioning.pm:78
 #, c-format
 msgid "Not enough swap space to fulfill installation, please add some"
-msgstr "Не хватает swap-пространства для завершения установки, пожалуйста, увеличьте его немного"
+msgstr ""
+"Не хватает swap-пространства для завершения установки, пожалуйста, увеличьте "
+"его немного"
 
 #: fs/partitioning_wizard.pm:51
 #, c-format
@@ -2574,7 +2557,9 @@ msgstr "Размер раздела swap в MB: "
 #: fs/partitioning_wizard.pm:119
 #, c-format
 msgid "There is no FAT partition to use as loopback (or not enough space left)"
-msgstr "Отсутствует раздел FAT для использования в качестве loopback (или не хватает места)"
+msgstr ""
+"Отсутствует раздел FAT для использования в качестве loopback (или не хватает "
+"места)"
 
 #: fs/partitioning_wizard.pm:127
 #, c-format
@@ -2602,8 +2587,14 @@ msgstr "Вычисляется размер раздела Microsoft Windows®"
 
 #: fs/partitioning_wizard.pm:153
 #, c-format
-msgid "Your Microsoft Windows® partition is too fragmented. Please reboot your computer under Microsoft Windows®, run the ``defrag'' utility, then restart the Mandriva Linux installation."
-msgstr "Ваш раздел Microsoft Windows® слишком фрагментирован. Пожалуйста, перезагрузите свой компьютер под Microsoft Windows®, запустите утилиту ``defrag'', а затем повторно запустите установку Mandriva Linux."
+msgid ""
+"Your Microsoft Windows® partition is too fragmented. Please reboot your "
+"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
+"the Mandriva Linux installation."
+msgstr ""
+"Ваш раздел Microsoft Windows® слишком фрагментирован. Пожалуйста, "
+"перезагрузите свой компьютер под Microsoft Windows®, запустите утилиту "
+"``defrag'', а затем повторно запустите установку Mandriva Linux."
 
 #: fs/partitioning_wizard.pm:156
 #, c-format
@@ -2614,7 +2605,12 @@ msgid ""
 "Your Microsoft Windows® partition will be now resized.\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"
+"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."
@@ -2625,15 +2621,18 @@ msgstr ""
 "Сейчас DrakX изменит размер вашего раздела Windows.\n"
 "\n"
 "\n"
-"Будьте осторожны: эта операция опасна. Если вы еще этого не сделали, вам стоит выйти из инсталляции, запустить \"chkdsk c:\" в командной строке под Windows (имейте в виду, что запуска  графической программы \"scandisk\" недостаточно, обязательно запустите \"chkdsk\" в командной строке), по желанию выполнить дефрагментацию (defrag), затем начать установку снова. Вы также должны сделать резервную копию данных.\n"
+"Будьте осторожны: эта операция опасна. Если вы еще этого не сделали, вам "
+"стоит выйти из инсталляции, запустить \"chkdsk c:\" в командной строке под "
+"Windows (имейте в виду, что запуска  графической программы \"scandisk\" "
+"недостаточно, обязательно запустите \"chkdsk\" в командной строке), по "
+"желанию выполнить дефрагментацию (defrag), затем начать установку снова. Вы "
+"также должны сделать резервную копию данных.\n"
 "\n"
 "\n"
 "Если уверены, нажмите %s."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: fs/partitioning_wizard.pm:165
-#: interactive.pm:545
-#: interactive/curses.pm:263
+#: fs/partitioning_wizard.pm:165 interactive.pm:545 interactive/curses.pm:263
 #: ugtk2.pm:519
 #, c-format
 msgid "Next"
@@ -2682,10 +2681,11 @@ msgstr "Очистить и использовать весь диск"
 #: fs/partitioning_wizard.pm:205
 #, c-format
 msgid "You have more than one hard drive, which one do you install linux on?"
-msgstr "У вас есть более одного жёсткого диска. На какой из них вы хотите установить Linux?"
+msgstr ""
+"У вас есть более одного жёсткого диска. На какой из них вы хотите установить "
+"Linux?"
 
-#: fs/partitioning_wizard.pm:210
-#: fsedit.pm:570
+#: fs/partitioning_wizard.pm:210 fsedit.pm:570
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr "ВСЕ существующие разделы и данные на них будут потеряны на диске %s"
@@ -2757,15 +2757,18 @@ msgstr "На дисках %s обнаружен программный (BIOS) RA
 #: fsedit.pm:223
 #, c-format
 msgid ""
-"I can not read the partition table of device %s, it's too corrupted for me :(\n"
+"I can not 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"
 "\n"
 "Do you agree to lose all the partitions?\n"
 msgstr ""
-"Невозможно прочитать таблицу разделов на устройстве %s, она слишком повреждена :(\n"
-"Можно попытаться продолжить, очистив плохие разделы (ВСЯ ИНФОРМАЦИЯ будет потеряна!).\n"
+"Невозможно прочитать таблицу разделов на устройстве %s, она слишком "
+"повреждена :(\n"
+"Можно попытаться продолжить, очистив плохие разделы (ВСЯ ИНФОРМАЦИЯ будет "
+"потеряна!).\n"
 "Другой вариант - не разрешить DrakX'у изменить таблицу разделов.\n"
 "(ошибка %s)\n"
 "\n"
@@ -2799,30 +2802,36 @@ msgstr ""
 
 #: fsedit.pm:409
 #, c-format
-msgid "You can not use the LVM Logical Volume for mount point %s since it spans physical volumes"
-msgstr "Вы не можете использовать логический том LVM для точки монтирования %s, поскольку он распределён по физическим разделам"
+msgid ""
+"You can not use the LVM Logical Volume for mount point %s since it spans "
+"physical volumes"
+msgstr ""
+"Вы не можете использовать логический том LVM для точки монтирования %s, "
+"поскольку он распределён по физическим разделам"
 
 #: fsedit.pm:411
 #, c-format
 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"
+"The bootloader is not able to handle this when the volume spans physical "
+"volumes.\n"
 "You should create a /boot partition first"
 msgstr ""
 "Вы выбрали логический том LVM в качестве корневого (/).\n"
-"Загрузчик не сможет управлять им, если том распределён по физическим разделам.\n"
+"Загрузчик не сможет управлять им, если том распределён по физическим "
+"разделам.\n"
 "Вам следует сначала создать раздел /boot"
 
-#: fsedit.pm:415
-#: fsedit.pm:417
+#: fsedit.pm:415 fsedit.pm:417
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "Этот каталог должен оставаться в пределах корневой файловой системы"
 
-#: fsedit.pm:419
-#: fsedit.pm:421
+#: fsedit.pm:419 fsedit.pm:421
 #, c-format
-msgid "You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount point\n"
+msgid ""
+"You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
+"point\n"
 msgstr ""
 "Для этой точки монтирования требуется реальная файловая система\n"
 "(ext2/ext3, reiserfs, xfs или jfs)\n"
@@ -2830,7 +2839,9 @@ msgstr ""
 #: fsedit.pm:423
 #, c-format
 msgid "You can not use an encrypted file system for mount point %s"
-msgstr "Вы не можете использовать зашифрованную файловую систему для точки монтирования %s"
+msgstr ""
+"Вы не можете использовать зашифрованную файловую систему для точки "
+"монтирования %s"
 
 #: fsedit.pm:487
 #, c-format
@@ -3125,8 +3136,12 @@ msgstr "Альтернативный драйвер отсутствует"
 
 #: harddrake/sound.pm:378
 #, c-format
-msgid "There's no known OSS/ALSA alternative driver for your sound card (%s) which currently uses \"%s\""
-msgstr "Для данной звуковой карты (%s) отсутствует альтернативный драйвер OSS/ALSA, которая в данный момент использует \"%s\""
+msgid ""
+"There's no known OSS/ALSA alternative driver for your sound card (%s) which "
+"currently uses \"%s\""
+msgstr ""
+"Для данной звуковой карты (%s) отсутствует альтернативный драйвер OSS/ALSA, "
+"которая в данный момент использует \"%s\""
 
 #: harddrake/sound.pm:385
 #, c-format
@@ -3135,10 +3150,14 @@ msgstr "Настройка звука"
 
 #: harddrake/sound.pm:387
 #, c-format
-msgid "Here you can select an alternative driver (either OSS or ALSA) for your sound card (%s)."
-msgstr "Здесь можно выбрать альтернативный драйвер (OSS или ALSA) для звуковой карты (%s)"
+msgid ""
+"Here you can select an alternative driver (either OSS or ALSA) for your "
+"sound card (%s)."
+msgstr ""
+"Здесь можно выбрать альтернативный драйвер (OSS или ALSA) для звуковой карты "
+"(%s)"
 
-#. -PO: here the first %s is either "OSS" or "ALSA",
+#. -PO: here the first %s is either "OSS" or "ALSA", 
 #. -PO: the second %s is the name of the current driver
 #. -PO: and the third %s is the name of the default driver
 #: harddrake/sound.pm:392
@@ -3146,40 +3165,50 @@ msgstr "Здесь можно выбрать альтернативный дра
 msgid ""
 "\n"
 "\n"
-"Your card currently use the %s\"%s\" driver (default driver for your card is \"%s\")"
+"Your card currently use the %s\"%s\" driver (default driver for your card is "
+"\"%s\")"
 msgstr ""
 "\n"
 "\n"
-"В настоящий момент ваша карта использует драйвер %s\"%s\" (драйвером по умолчанию для вашей карты является \"%s\")"
+"В настоящий момент ваша карта использует драйвер %s\"%s\" (драйвером по "
+"умолчанию для вашей карты является \"%s\")"
 
 #: harddrake/sound.pm:394
 #, 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(tm) 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"
+"ALSA (Advanced Linux Sound Architecture) is a modularized architecture "
+"which\n"
 "supports quite a large range of ISA, USB and PCI cards.\n"
 "\n"
 "It also provides a much higher API than OSS.\n"
 "\n"
 "To use alsa, one can either use:\n"
 "- the old compatibility OSS api\n"
-"- the new ALSA api that provides many enhanced features but requires using the ALSA library.\n"
+"- the new ALSA api that provides many enhanced features but requires using "
+"the ALSA library.\n"
 msgstr ""
-"OSS (Открытая звуковая система) была первой звуковой API. Она является звуковой API, не зависящей от ОС (доступна на большинстве UNIX-системах), но она все-таки очень простая и ограниченная API.\n"
+"OSS (Открытая звуковая система) была первой звуковой API. Она является "
+"звуковой API, не зависящей от ОС (доступна на большинстве UNIX-системах), но "
+"она все-таки очень простая и ограниченная API.\n"
 "Куда уж больше, все драйверы OSS и так заново открывают колесо.\n"
 "\n"
-"ALSA (Расширенная звуковая архитектура Linux) представляет собой модульную архитектуру, которая поддерживает довольно широкий диапазон ISA, USB и PCI-карт.\n"
+"ALSA (Расширенная звуковая архитектура Linux) представляет собой модульную "
+"архитектуру, которая поддерживает довольно широкий диапазон ISA, USB и PCI-"
+"карт.\n"
 "\n"
 "Она также предоставляет значительно большую API, чем OSS.\n"
 "\n"
 "Для поддержки alsa можно использовать:\n"
 "- старую api, совместимую с OSS\n"
-"- новую api ALSA, предоставляющую много расширенных возможностей, но требующую библиотеку ALSA.\n"
+"- новую api ALSA, предоставляющую много расширенных возможностей, но "
+"требующую библиотеку ALSA.\n"
 
-#: harddrake/sound.pm:408
-#: harddrake/sound.pm:491
+#: harddrake/sound.pm:408 harddrake/sound.pm:491
 #, c-format
 msgid "Driver:"
 msgstr "Драйвер:"
@@ -3207,8 +3236,12 @@ msgstr "Нет драйвера с открытым исходным кодом"
 
 #: harddrake/sound.pm:431
 #, c-format
-msgid "There's no free driver for your sound card (%s), but there's a proprietary driver at \"%s\"."
-msgstr "Для вашей звуковой карты (%s) нет свободного драйвера, но имеется собственный драйвер на \"%s\""
+msgid ""
+"There's no free driver for your sound card (%s), but there's a proprietary "
+"driver at \"%s\"."
+msgstr ""
+"Для вашей звуковой карты (%s) нет свободного драйвера, но имеется "
+"собственный драйвер на \"%s\""
 
 #: harddrake/sound.pm:434
 #, c-format
@@ -3232,7 +3265,8 @@ msgid ""
 "The classic bug sound tester is to run the following commands:\n"
 "\n"
 "\n"
-"- \"lspcidrake -v | fgrep -i AUDIO\" will tell you which driver your card uses\n"
+"- \"lspcidrake -v | fgrep -i AUDIO\" will tell you which driver your card "
+"uses\n"
 "by default\n"
 "\n"
 "- \"grep sound-slot /etc/modprobe.conf\" will tell you what driver it\n"
@@ -3249,10 +3283,12 @@ msgid ""
 "\n"
 "- \"/sbin/fuser -v /dev/dsp\" will tell which program uses the sound card.\n"
 msgstr ""
-"Классическое тестирование ошибок звука выполняется запуском следующих команд:\n"
+"Классическое тестирование ошибок звука выполняется запуском следующих "
+"команд:\n"
 "\n"
 "\n"
-"- \"lspcidrake -v | fgrep -i AUDIO\" сообщит вам, какой драйвер использует ваша карта по умолчанию\n"
+"- \"lspcidrake -v | fgrep -i AUDIO\" сообщит вам, какой драйвер использует "
+"ваша карта по умолчанию\n"
 "\n"
 "- \"grep sound-slot /etc/modprobe.conf\" сообщит вам, какой драйвер\n"
 "используется в данный момент\n"
@@ -3282,12 +3318,14 @@ msgstr "Выбор произвольного драйвера"
 #: harddrake/sound.pm:486
 #, c-format
 msgid ""
-"If you really think that you know which driver is the right one for your card\n"
+"If you really think that you know which driver is the right one for your "
+"card\n"
 "you can pick one in the above list.\n"
 "\n"
 "The current driver for your \"%s\" sound card is \"%s\" "
 msgstr ""
-"Если вы действительно думаете, что сами знаете, какой драйвер является верным\n"
+"Если вы действительно думаете, что сами знаете, какой драйвер является "
+"верным\n"
 "для вашей карты, вы можете выбрать его из списка сверху.\n"
 "\n"
 "Текущим драйвером для вашей звуковой карты \"%s\" является \"%s\" "
@@ -3297,9 +3335,7 @@ msgstr ""
 msgid "Auto-detect"
 msgstr "Автоопределение"
 
-#: harddrake/v4l.pm:97
-#: harddrake/v4l.pm:285
-#: harddrake/v4l.pm:337
+#: harddrake/v4l.pm:97 harddrake/v4l.pm:285 harddrake/v4l.pm:337
 #, c-format
 msgid "Unknown|Generic"
 msgstr "Неизвестный|Обычный"
@@ -3317,11 +3353,16 @@ msgstr "Неизвестный|CPH06X (bt878) [большинство произ
 #: 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"
-"If your card is misdetected, you can force the right tuner and card types here. Just select your tv card parameters if needed."
+"For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-"
+"detect the rights parameters.\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 ""
-"Для большинства современных ТВ-карт модуль bttv ядра GNU/Linux просто автоматически определит правильные параметры.\n"
-"Если ваша карта не определилась, то здесь вы можете принудительно включить использование правильных типов тюнера и карты. Если необходимо, просто выберите параметры своей ТВ-карты"
+"Для большинства современных ТВ-карт модуль bttv ядра GNU/Linux просто "
+"автоматически определит правильные параметры.\n"
+"Если ваша карта не определилась, то здесь вы можете принудительно включить "
+"использование правильных типов тюнера и карты. Если необходимо, просто "
+"выберите параметры своей ТВ-карты"
 
 #: harddrake/v4l.pm:478
 #, c-format
@@ -3333,34 +3374,20 @@ msgstr "Модель карты :"
 msgid "Tuner type:"
 msgstr "Тип тюнера :"
 
-#: interactive.pm:128
-#: interactive.pm:545
-#: interactive/curses.pm:263
-#: interactive/http.pm:103
-#: interactive/http.pm:156
-#: interactive/stdio.pm:39
-#: interactive/stdio.pm:148
-#: interactive/stdio.pm:149
-#: ugtk2.pm:421
-#: ugtk2.pm:519
-#: ugtk2.pm:813
-#: ugtk2.pm:836
+#: interactive.pm:128 interactive.pm:545 interactive/curses.pm:263
+#: interactive/http.pm:103 interactive/http.pm:156 interactive/stdio.pm:39
+#: interactive/stdio.pm:148 interactive/stdio.pm:149 ugtk2.pm:421 ugtk2.pm:519
+#: ugtk2.pm:813 ugtk2.pm:836
 #, c-format
 msgid "Ok"
 msgstr "ОК"
 
-#: interactive.pm:227
-#: modules/interactive.pm:71
-#: ugtk2.pm:812
-#: wizards.pm:156
+#: interactive.pm:227 modules/interactive.pm:71 ugtk2.pm:812 wizards.pm:156
 #, c-format
 msgid "Yes"
 msgstr "Да"
 
-#: interactive.pm:227
-#: modules/interactive.pm:71
-#: ugtk2.pm:812
-#: wizards.pm:156
+#: interactive.pm:227 modules/interactive.pm:71 ugtk2.pm:812 wizards.pm:156
 #, c-format
 msgid "No"
 msgstr "Нет"
@@ -3370,34 +3397,27 @@ msgstr "Нет"
 msgid "Choose a file"
 msgstr "Выберите файл"
 
-#: interactive.pm:386
-#: interactive/gtk.pm:436
+#: interactive.pm:386 interactive/gtk.pm:436
 #, c-format
 msgid "Add"
 msgstr "Добавить"
 
-#: interactive.pm:386
-#: interactive/gtk.pm:436
+#: interactive.pm:386 interactive/gtk.pm:436
 #, c-format
 msgid "Modify"
 msgstr "Изменить"
 
-#: interactive.pm:386
-#: interactive/gtk.pm:436
+#: interactive.pm:386 interactive/gtk.pm:436
 #, c-format
 msgid "Remove"
 msgstr "Удалить"
 
-#: interactive.pm:545
-#: interactive/curses.pm:263
-#: ugtk2.pm:519
+#: interactive.pm:545 interactive/curses.pm:263 ugtk2.pm:519
 #, c-format
 msgid "Finish"
 msgstr "Завершить"
 
-#: interactive.pm:546
-#: interactive/curses.pm:260
-#: ugtk2.pm:517
+#: interactive.pm:546 interactive/curses.pm:260 ugtk2.pm:517
 #, c-format
 msgid "Previous"
 msgstr "Назад"
@@ -3407,14 +3427,12 @@ msgstr "Назад"
 msgid "Beware, Caps Lock is enabled"
 msgstr "Обратите внимание, CapsLock включен"
 
-#: interactive/stdio.pm:29
-#: interactive/stdio.pm:154
+#: interactive/stdio.pm:29 interactive/stdio.pm:154
 #, c-format
 msgid "Bad choice, try again\n"
 msgstr "Неудачный выбор, попробуйте еще раз\n"
 
-#: interactive/stdio.pm:30
-#: interactive/stdio.pm:155
+#: interactive/stdio.pm:30 interactive/stdio.pm:155
 #, c-format
 msgid "Your choice? (default %s) "
 msgstr "Что вы выбираете? (по умолчанию %s) "
@@ -3496,8 +3514,7 @@ msgstr "default:LTR"
 msgid "Andorra"
 msgstr "Андорра"
 
-#: lang.pm:211
-#: timezone.pm:226
+#: lang.pm:211 timezone.pm:226
 #, c-format
 msgid "United Arab Emirates"
 msgstr "Объединенные арабские Эмираты"
@@ -3542,8 +3559,7 @@ msgstr "Ангола"
 msgid "Antarctica"
 msgstr "Антарктика"
 
-#: lang.pm:220
-#: timezone.pm:271
+#: lang.pm:220 timezone.pm:271
 #, c-format
 msgid "Argentina"
 msgstr "Аргентина"
@@ -3553,16 +3569,12 @@ msgstr "Аргентина"
 msgid "American Samoa"
 msgstr "Американские Самоа"
 
-#: lang.pm:222
-#: mirror.pm:12
-#: timezone.pm:229
+#: lang.pm:222 mirror.pm:12 timezone.pm:229
 #, c-format
 msgid "Austria"
 msgstr "Австрия"
 
-#: lang.pm:223
-#: mirror.pm:11
-#: timezone.pm:267
+#: lang.pm:223 mirror.pm:11 timezone.pm:267
 #, c-format
 msgid "Australia"
 msgstr "Австралия"
@@ -3587,15 +3599,12 @@ msgstr "Босния и Герцеговина"
 msgid "Barbados"
 msgstr "Барбадос"
 
-#: lang.pm:228
-#: timezone.pm:211
+#: lang.pm:228 timezone.pm:211
 #, c-format
 msgid "Bangladesh"
 msgstr "Бангладеш"
 
-#: lang.pm:229
-#: mirror.pm:13
-#: timezone.pm:231
+#: lang.pm:229 mirror.pm:13 timezone.pm:231
 #, c-format
 msgid "Belgium"
 msgstr "Бельгия"
@@ -3605,8 +3614,7 @@ msgstr "Бельгия"
 msgid "Burkina Faso"
 msgstr "Буркина-Фасо"
 
-#: lang.pm:231
-#: timezone.pm:232
+#: lang.pm:231 timezone.pm:232
 #, c-format
 msgid "Bulgaria"
 msgstr "Болгария"
@@ -3641,9 +3649,7 @@ msgstr "Бруней Даруссалам"
 msgid "Bolivia"
 msgstr "Боливия"
 
-#: lang.pm:238
-#: mirror.pm:14
-#: timezone.pm:272
+#: lang.pm:238 mirror.pm:14 timezone.pm:272
 #, c-format
 msgid "Brazil"
 msgstr "Бразилия"
@@ -3668,8 +3674,7 @@ msgstr "Остров Буве"
 msgid "Botswana"
 msgstr "Ботсвана"
 
-#: lang.pm:243
-#: timezone.pm:230
+#: lang.pm:243 timezone.pm:230
 #, c-format
 msgid "Belarus"
 msgstr "Беларусь"
@@ -3679,9 +3684,7 @@ msgstr "Беларусь"
 msgid "Belize"
 msgstr "Белиз"
 
-#: lang.pm:245
-#: mirror.pm:15
-#: timezone.pm:261
+#: lang.pm:245 mirror.pm:15 timezone.pm:261
 #, c-format
 msgid "Canada"
 msgstr "Канада"
@@ -3706,9 +3709,7 @@ msgstr "Центрально-африканская республика"
 msgid "Congo (Brazzaville)"
 msgstr "Конго (Brazzaville)"
 
-#: lang.pm:250
-#: mirror.pm:39
-#: timezone.pm:255
+#: lang.pm:250 mirror.pm:39 timezone.pm:255
 #, c-format
 msgid "Switzerland"
 msgstr "Швейцария"
@@ -3723,8 +3724,7 @@ msgstr "Кот-д'Ивуар"
 msgid "Cook Islands"
 msgstr "Острова Кука"
 
-#: lang.pm:253
-#: timezone.pm:273
+#: lang.pm:253 timezone.pm:273
 #, c-format
 msgid "Chile"
 msgstr "Чили"
@@ -3734,8 +3734,7 @@ msgstr "Чили"
 msgid "Cameroon"
 msgstr "Камерун"
 
-#: lang.pm:255
-#: timezone.pm:212
+#: lang.pm:255 timezone.pm:212
 #, c-format
 msgid "China"
 msgstr "Китай"
@@ -3745,8 +3744,7 @@ msgstr "Китай"
 msgid "Colombia"
 msgstr "Колумбия"
 
-#: lang.pm:257
-#: mirror.pm:16
+#: lang.pm:257 mirror.pm:16
 #, c-format
 msgid "Costa Rica"
 msgstr "Коста-Рика"
@@ -3776,16 +3774,12 @@ msgstr "Остров Рождества"
 msgid "Cyprus"
 msgstr "Кипр"
 
-#: lang.pm:263
-#: mirror.pm:17
-#: timezone.pm:233
+#: lang.pm:263 mirror.pm:17 timezone.pm:233
 #, c-format
 msgid "Czech Republic"
 msgstr "Чешская Республика"
 
-#: lang.pm:264
-#: mirror.pm:22
-#: timezone.pm:238
+#: lang.pm:264 mirror.pm:22 timezone.pm:238
 #, c-format
 msgid "Germany"
 msgstr "Германия"
@@ -3795,9 +3789,7 @@ msgstr "Германия"
 msgid "Djibouti"
 msgstr "Джибути"
 
-#: lang.pm:266
-#: mirror.pm:18
-#: timezone.pm:234
+#: lang.pm:266 mirror.pm:18 timezone.pm:234
 #, c-format
 msgid "Denmark"
 msgstr "Дания"
@@ -3822,9 +3814,7 @@ msgstr "Алжир"
 msgid "Ecuador"
 msgstr "Эквадор"
 
-#: lang.pm:271
-#: mirror.pm:19
-#: timezone.pm:235
+#: lang.pm:271 mirror.pm:19 timezone.pm:235
 #, c-format
 msgid "Estonia"
 msgstr "Эстония"
@@ -3844,9 +3834,7 @@ msgstr "Западная Сахара"
 msgid "Eritrea"
 msgstr "Эритрея"
 
-#: lang.pm:275
-#: mirror.pm:37
-#: timezone.pm:253
+#: lang.pm:275 mirror.pm:37 timezone.pm:253
 #, c-format
 msgid "Spain"
 msgstr "Испания"
@@ -3856,9 +3844,7 @@ msgstr "Испания"
 msgid "Ethiopia"
 msgstr "Эфиопия"
 
-#: lang.pm:277
-#: mirror.pm:20
-#: timezone.pm:236
+#: lang.pm:277 mirror.pm:20 timezone.pm:236
 #, c-format
 msgid "Finland"
 msgstr "Финляндия"
@@ -3883,9 +3869,7 @@ msgstr "Микронезия"
 msgid "Faroe Islands"
 msgstr "Фарерские острова"
 
-#: lang.pm:282
-#: mirror.pm:21
-#: timezone.pm:237
+#: lang.pm:282 mirror.pm:21 timezone.pm:237
 #, c-format
 msgid "France"
 msgstr "Франция"
@@ -3895,8 +3879,7 @@ msgstr "Франция"
 msgid "Gabon"
 msgstr "Габон"
 
-#: lang.pm:284
-#: timezone.pm:257
+#: lang.pm:284 timezone.pm:257
 #, c-format
 msgid "United Kingdom"
 msgstr "Объединенное Королевство"
@@ -3951,9 +3934,7 @@ msgstr "Гваделупа"
 msgid "Equatorial Guinea"
 msgstr "Экваториальная Гвинея"
 
-#: lang.pm:295
-#: mirror.pm:23
-#: timezone.pm:239
+#: lang.pm:295 mirror.pm:23 timezone.pm:239
 #, c-format
 msgid "Greece"
 msgstr "Греция"
@@ -3963,8 +3944,7 @@ msgstr "Греция"
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "Южная Джорджия и Южные Сандвичевы острова "
 
-#: lang.pm:297
-#: timezone.pm:262
+#: lang.pm:297 timezone.pm:262
 #, c-format
 msgid "Guatemala"
 msgstr "Гватемала"
@@ -4009,35 +3989,27 @@ msgstr "Хорватия"
 msgid "Haiti"
 msgstr "Гаити"
 
-#: lang.pm:306
-#: mirror.pm:24
-#: timezone.pm:240
+#: lang.pm:306 mirror.pm:24 timezone.pm:240
 #, c-format
 msgid "Hungary"
 msgstr "Венгрия"
 
-#: lang.pm:307
-#: timezone.pm:215
+#: lang.pm:307 timezone.pm:215
 #, c-format
 msgid "Indonesia"
 msgstr "Индонезия"
 
-#: lang.pm:308
-#: mirror.pm:25
-#: timezone.pm:241
+#: lang.pm:308 mirror.pm:25 timezone.pm:241
 #, c-format
 msgid "Ireland"
 msgstr "Ирландия"
 
-#: lang.pm:309
-#: mirror.pm:26
-#: timezone.pm:217
+#: lang.pm:309 mirror.pm:26 timezone.pm:217
 #, c-format
 msgid "Israel"
 msgstr "Израиль"
 
-#: lang.pm:310
-#: timezone.pm:214
+#: lang.pm:310 timezone.pm:214
 #, c-format
 msgid "India"
 msgstr "Индия"
@@ -4052,8 +4024,7 @@ msgstr "Британская территория Индийского океа�
 msgid "Iraq"
 msgstr "Ирак"
 
-#: lang.pm:313
-#: timezone.pm:216
+#: lang.pm:313 timezone.pm:216
 #, c-format
 msgid "Iran"
 msgstr "Иран"
@@ -4063,9 +4034,7 @@ msgstr "Иран"
 msgid "Iceland"
 msgstr "Исландия"
 
-#: lang.pm:315
-#: mirror.pm:27
-#: timezone.pm:242
+#: lang.pm:315 mirror.pm:27 timezone.pm:242
 #, c-format
 msgid "Italy"
 msgstr "Италия"
@@ -4080,9 +4049,7 @@ msgstr "Ямайка"
 msgid "Jordan"
 msgstr "Иордания"
 
-#: lang.pm:318
-#: mirror.pm:28
-#: timezone.pm:218
+#: lang.pm:318 mirror.pm:28 timezone.pm:218
 #, c-format
 msgid "Japan"
 msgstr "Япония"
@@ -4122,8 +4089,7 @@ msgstr "Сент-Китс и Невис"
 msgid "Korea (North)"
 msgstr "Корея (North)"
 
-#: lang.pm:326
-#: timezone.pm:219
+#: lang.pm:326 timezone.pm:219
 #, c-format
 msgid "Korea"
 msgstr "Корея"
@@ -4178,14 +4144,12 @@ msgstr "Либерия"
 msgid "Lesotho"
 msgstr "Лесото"
 
-#: lang.pm:337
-#: timezone.pm:243
+#: lang.pm:337 timezone.pm:243
 #, c-format
 msgid "Lithuania"
 msgstr "Литва"
 
-#: lang.pm:338
-#: timezone.pm:244
+#: lang.pm:338 timezone.pm:244
 #, c-format
 msgid "Luxembourg"
 msgstr "Люксембург"
@@ -4285,14 +4249,12 @@ msgstr "Мальдивы"
 msgid "Malawi"
 msgstr "Малави"
 
-#: lang.pm:358
-#: timezone.pm:263
+#: lang.pm:358 timezone.pm:263
 #, c-format
 msgid "Mexico"
 msgstr "Мексика"
 
-#: lang.pm:359
-#: timezone.pm:220
+#: lang.pm:359 timezone.pm:220
 #, c-format
 msgid "Malaysia"
 msgstr "Малайзия"
@@ -4332,16 +4294,12 @@ msgstr "Нигерия"
 msgid "Nicaragua"
 msgstr "Никарагуа"
 
-#: lang.pm:367
-#: mirror.pm:29
-#: timezone.pm:245
+#: lang.pm:367 mirror.pm:29 timezone.pm:245
 #, c-format
 msgid "Netherlands"
 msgstr "Нидерланды"
 
-#: lang.pm:368
-#: mirror.pm:31
-#: timezone.pm:246
+#: lang.pm:368 mirror.pm:31 timezone.pm:246
 #, c-format
 msgid "Norway"
 msgstr "Норвегия"
@@ -4361,9 +4319,7 @@ msgstr "Науру"
 msgid "Niue"
 msgstr "Нью"
 
-#: lang.pm:372
-#: mirror.pm:30
-#: timezone.pm:268
+#: lang.pm:372 mirror.pm:30 timezone.pm:268
 #, c-format
 msgid "New Zealand"
 msgstr "Новая Зеландия"
@@ -4393,8 +4349,7 @@ msgstr "Французская Полинезия"
 msgid "Papua New Guinea"
 msgstr "Папуа Новая Гвинея"
 
-#: lang.pm:378
-#: timezone.pm:221
+#: lang.pm:378 timezone.pm:221
 #, c-format
 msgid "Philippines"
 msgstr "Филиппины"
@@ -4404,9 +4359,7 @@ msgstr "Филиппины"
 msgid "Pakistan"
 msgstr "Пакистан"
 
-#: lang.pm:380
-#: mirror.pm:32
-#: timezone.pm:247
+#: lang.pm:380 mirror.pm:32 timezone.pm:247
 #, c-format
 msgid "Poland"
 msgstr "Польша"
@@ -4431,9 +4384,7 @@ msgstr "Пуэрто-Рико"
 msgid "Palestine"
 msgstr "Палестина"
 
-#: lang.pm:385
-#: mirror.pm:33
-#: timezone.pm:248
+#: lang.pm:385 mirror.pm:33 timezone.pm:248
 #, c-format
 msgid "Portugal"
 msgstr "Португалия"
@@ -4458,14 +4409,12 @@ msgstr "Катар"
 msgid "Reunion"
 msgstr "Реюньон"
 
-#: lang.pm:390
-#: timezone.pm:249
+#: lang.pm:390 timezone.pm:249
 #, c-format
 msgid "Romania"
 msgstr "Румыния"
 
-#: lang.pm:391
-#: mirror.pm:34
+#: lang.pm:391 mirror.pm:34
 #, c-format
 msgid "Russia"
 msgstr "Россия"
@@ -4495,15 +4444,12 @@ msgstr "Сейшельские Острова"
 msgid "Sudan"
 msgstr "Судан"
 
-#: lang.pm:397
-#: mirror.pm:38
-#: timezone.pm:254
+#: lang.pm:397 mirror.pm:38 timezone.pm:254
 #, c-format
 msgid "Sweden"
 msgstr "Швеция"
 
-#: lang.pm:398
-#: timezone.pm:222
+#: lang.pm:398 timezone.pm:222
 #, c-format
 msgid "Singapore"
 msgstr "Сингапур"
@@ -4513,8 +4459,7 @@ msgstr "Сингапур"
 msgid "Saint Helena"
 msgstr "Святая Елена"
 
-#: lang.pm:400
-#: timezone.pm:252
+#: lang.pm:400 timezone.pm:252
 #, c-format
 msgid "Slovenia"
 msgstr "Словения"
@@ -4524,9 +4469,7 @@ msgstr "Словения"
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "Свалбард и острова Яна Майена"
 
-#: lang.pm:402
-#: mirror.pm:35
-#: timezone.pm:251
+#: lang.pm:402 mirror.pm:35 timezone.pm:251
 #, c-format
 msgid "Slovakia"
 msgstr "Словакия"
@@ -4596,9 +4539,7 @@ msgstr "Французские южные территории"
 msgid "Togo"
 msgstr "Того"
 
-#: lang.pm:416
-#: mirror.pm:41
-#: timezone.pm:224
+#: lang.pm:416 mirror.pm:41 timezone.pm:224
 #, c-format
 msgid "Thailand"
 msgstr "Тайланд"
@@ -4633,8 +4574,7 @@ msgstr "Тунис"
 msgid "Tonga"
 msgstr "Тонга"
 
-#: lang.pm:423
-#: timezone.pm:225
+#: lang.pm:423 timezone.pm:225
 #, c-format
 msgid "Turkey"
 msgstr "Турция"
@@ -4649,21 +4589,17 @@ msgstr "Тринидад и Тобаго"
 msgid "Tuvalu"
 msgstr "Тувалу"
 
-#: lang.pm:426
-#: mirror.pm:40
-#: timezone.pm:223
+#: lang.pm:426 mirror.pm:40 timezone.pm:223
 #, c-format
 msgid "Taiwan"
 msgstr "Тайвань"
 
-#: lang.pm:427
-#: timezone.pm:208
+#: lang.pm:427 timezone.pm:208
 #, c-format
 msgid "Tanzania"
 msgstr "Танзания"
 
-#: lang.pm:428
-#: timezone.pm:256
+#: lang.pm:428 timezone.pm:256
 #, c-format
 msgid "Ukraine"
 msgstr "Украина"
@@ -4678,9 +4614,7 @@ msgstr "Уганда"
 msgid "United States Minor Outlying Islands"
 msgstr "Соединенные штаты Малых  Удаленных островов"
 
-#: lang.pm:431
-#: mirror.pm:42
-#: timezone.pm:264
+#: lang.pm:431 mirror.pm:42 timezone.pm:264
 #, c-format
 msgid "United States"
 msgstr "Соединенные Штаты"
@@ -4750,9 +4684,7 @@ msgstr "Йемен"
 msgid "Mayotte"
 msgstr "Майот"
 
-#: lang.pm:445
-#: mirror.pm:36
-#: timezone.pm:207
+#: lang.pm:445 mirror.pm:36 timezone.pm:207
 #, c-format
 msgid "South Africa"
 msgstr "Южная Африка"
@@ -4775,7 +4707,9 @@ msgstr "Добро пожаловать в %s"
 #: lvm.pm:84
 #, c-format
 msgid "Moving used physical extents to other physical volumes failed"
-msgstr "Перемещение используемых физических областей на другой физический раздел не удалось"
+msgstr ""
+"Перемещение используемых физических областей на другой физический раздел не "
+"удалось"
 
 #: lvm.pm:141
 #, c-format
@@ -4790,87 +4724,138 @@ msgstr "Сначала удалите логические тома\n"
 #: lvm.pm:184
 #, c-format
 msgid "The bootloader can't handle /boot on multiple physical volumes"
-msgstr "Загрузчик не может работать с разделом /boot на нескольких физических разделах"
+msgstr ""
+"Загрузчик не может работать с разделом /boot на нескольких физических "
+"разделах"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Mandriva Linux distribution \n"
-"shall be called the \"Software Products\" hereafter. The Software Products include, but are not \n"
-"restricted to, the set of programs, methods, rules and documentation related to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
+"shall be called the \"Software Products\" hereafter. The Software Products "
+"include, but are not \n"
+"restricted to, the set of programs, methods, rules and documentation related "
+"to the operating \n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
-"Please read this document carefully. This document is a license agreement between you and  \n"
+"Please read this document carefully. This document is a license agreement "
+"between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you explicitly \n"
-"accept and fully agree to conform to the terms and conditions of this License. \n"
-"If you disagree with any portion of the License, you are not allowed to install, duplicate or use \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
+"accept and fully agree to conform to the terms and conditions of this "
+"License. \n"
+"If you disagree with any portion of the License, you are not allowed to "
+"install, duplicate or use \n"
 "the Software Products. \n"
-"Any attempt to install, duplicate or use the Software Products in a manner which does not comply \n"
-"with the terms and conditions of this License is void and will terminate your rights under this \n"
-"License. Upon termination of the License,  you must immediately destroy all copies of the \n"
+"Any attempt to install, duplicate or use the Software Products in a manner "
+"which does not comply \n"
+"with the terms and conditions of this License is void and will terminate "
+"your rights under this \n"
+"License. Upon termination of the License,  you must immediately destroy all "
+"copies of the \n"
 "Software Products.\n"
 "\n"
 "\n"
 "2. Limited Warranty\n"
 "\n"
-"The Software Products and attached documentation are provided \"as is\", with no warranty, to the \n"
+"The Software Products and attached documentation are provided \"as is\", "
+"with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or occurrence of such \n"
-"damages.\n"
-"\n"
-"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME COUNTRIES\n"
-"\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever (including without \n"
-"limitation damages for loss of business, interruption of business, financial loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential loss) arising out \n"
-"of the possession and use of software components or arising out of  downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some countries by local laws.\n"
-"This limited liability applies to, but is not restricted to, the strong cryptography components \n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
+"\n"
+"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
+"COUNTRIES\n"
+"\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
+"This limited liability applies to, but is not restricted to, the strong "
+"cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
-"The Software Products consist of components created by different persons or entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please read carefully the terms \n"
-"and conditions of the license agreement for each component before using any component. Any question \n"
-"on a component license should be addressed to the component author and not to Mandriva.\n"
-"The programs developed by Mandriva S.A. are governed by the GPL License. Documentation written \n"
-"by Mandriva S.A. is governed by a specific license. Please refer to the documentation for \n"
+"The Software Products consist of components created by different persons or "
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
+"Documentation written \n"
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
+"documentation for \n"
 "further details.\n"
 "\n"
 "\n"
 "4. Intellectual Property Rights\n"
 "\n"
-"All rights to the components of the Software Products belong to their respective authors and are \n"
-"protected by intellectual property and copyright laws applicable to software programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, as a whole or in \n"
-"parts, by all means and for all purposes.\n"
-"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of Mandriva S.A.  \n"
+"All rights to the components of the Software Products belong to their "
+"respective authors and are \n"
+"protected by intellectual property and copyright laws applicable to software "
+"programs.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
 "\n"
-"If any portion of this agreement is held void, illegal or inapplicable by a court judgment, this \n"
-"portion is excluded from this contract. You remain bound by the other applicable sections of the \n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
 "agreement.\n"
-"The terms and conditions of this License are governed by the Laws of France.\n"
-"All disputes on the terms of this license will preferably be settled out of court. As a last \n"
-"resort, the dispute will be referred to the appropriate Courts of Law of Paris - France.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of "
+"Paris - France.\n"
 "For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Введение\n"
@@ -4895,28 +4880,36 @@ msgstr ""
 "Любые попытки использовать, тиражировать или использовать Программные\n"
 "Продукты в целях, противоречащих условиям данной Лицензии, аннулируют и\n"
 "освобождают вас от всех прав, предоставляемых данной Лицензией.\n"
-"При окончании срока действия Лицензии вы должны немедленно удалить все копии\n"
+"При окончании срока действия Лицензии вы должны немедленно удалить все "
+"копии\n"
 "Программных Продуктов.\n"
 "\n"
 "\n"
 "2. Ограниченные гарантийные обязательства\n"
 "\n"
-"Программные Продукты и прилагаемая документация предоставляются \"как есть\",безо всякой гарантии в пределах, дозволенных законом.\n"
+"Программные Продукты и прилагаемая документация предоставляются \"как есть\","
+"безо всякой гарантии в пределах, дозволенных законом.\n"
 "Mandriva S.A. ни при каких условиях и в пределах, дозволенных\n"
-"законом, не несет ответственности за любой какой бы то ни было определенный,\n"
+"законом, не несет ответственности за любой какой бы то ни было "
+"определенный,\n"
 "случайный, прямой или косвенный ущерб (включая неограниченный ущерб от\n"
-"крушения бизнеса, перерывов в коммерческой деятельности, финансовых убытков,\n"
-"судебных издержек и штрафов, являющихся результатом судебных разбирательств,\n"
+"крушения бизнеса, перерывов в коммерческой деятельности, финансовых "
+"убытков,\n"
+"судебных издержек и штрафов, являющихся результатом судебных "
+"разбирательств,\n"
 "или любых других косвенных потерь), являющийся результатом использования\n"
 "Программных Продуктов, даже, если Mandriva S.A. было известно\n"
 "о возможности или случаях такого ущерба.\n"
 "\n"
-"ОГРАНИЧЕННАЯ ОТВЕТСТВЕННОСТЬ, СВЯЗАННАЯ С ВЛАДЕНИЕМ ИЛИ ИСПОЛЬЗОВАНИЕМ ЗАПРЕЩЕННОГО ПРОГРАММНОГО ОБЕСПЕЧЕНИЯ В НЕКОТОРЫХ СТРАНАХ\n"
+"ОГРАНИЧЕННАЯ ОТВЕТСТВЕННОСТЬ, СВЯЗАННАЯ С ВЛАДЕНИЕМ ИЛИ ИСПОЛЬЗОВАНИЕМ "
+"ЗАПРЕЩЕННОГО ПРОГРАММНОГО ОБЕСПЕЧЕНИЯ В НЕКОТОРЫХ СТРАНАХ\n"
 "\n"
 "В пределах, дозволенных законом, Mandriva S.A. или ее распространители\n"
-"ни при каких условиях не несут ответственности за любой, какой бы то ни было\n"
+"ни при каких условиях не несут ответственности за любой, какой бы то ни "
+"было\n"
 "определенный, случайный, прямой или косвенный ущерб (включая неограниченный\n"
-"ущерб от крушения бизнеса, перерывов в коммерческой деятельности, финансовых\n"
+"ущерб от крушения бизнеса, перерывов в коммерческой деятельности, "
+"финансовых\n"
 "убытков, судебных издержек и штрафов, являющихся результатом судебных\n"
 "разбирательств, или любых других косвенных потерь), являющихся результатом\n"
 "владения и использования компонентов программного обеспечения,\n"
@@ -4945,13 +4938,15 @@ msgstr ""
 "\n"
 "4. Права на интеллектуальную собственность\n"
 "\n"
-"Все права на компоненты Программных Продуктов принадлежат их соответствующим\n"
+"Все права на компоненты Программных Продуктов принадлежат их "
+"соответствующим\n"
 "авторам и защищены законами об интеллектуальной собственности и авторском\n"
 "праве, применительно к программному обеспечению.\n"
 "Mandriva S.A. сохраняет за собой право изменять или адаптировать\n"
 "Программные Продукты, как целиком, так и по частям, любым способом и для\n"
 "любых целей.\n"
-"\"Mandriva\", \"Mandriva Linux\" и соответствующие логотипы являются торговыми марками Mandriva S.A.\n"
+"\"Mandriva\", \"Mandriva Linux\" и соответствующие логотипы являются "
+"торговыми марками Mandriva S.A.\n"
 "\n"
 "\n"
 "5. Основные законы\n"
@@ -4962,16 +4957,69 @@ msgstr ""
 "другими пригодными разделами соглашения.\n"
 "Условия и положения данной Лицензии находятся под действием французского\n"
 "законодательства.\n"
-"Все разногласия по поводу условий и положений этой лицензии, скорее всего, будут оспариваться в суде. В последнюю очередь оспаривание вопроса будет передано в соответствующий Законодательный Суд Парижа - Франция. По любым вопросам, касающимся этого документа, пожалуйста, свяжитесь\n"
+"Все разногласия по поводу условий и положений этой лицензии, скорее всего, "
+"будут оспариваться в суде. В последнюю очередь оспаривание вопроса будет "
+"передано в соответствующий Законодательный Суд Парижа - Франция. По любым "
+"вопросам, касающимся этого документа, пожалуйста, свяжитесь\n"
 "с Mandriva S.A.\n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
-"Software included may be covered by patents in your country. For example, the\n"
+"Software included may be covered by patents in your country. For example, "
+"the\n"
 "MP3 decoders included may require a licence for further usage (see\n"
-"http://www.mp3licensing.com for more details). If you are unsure if a patent\n"
+"http://www.mp3licensing.com for more details). If you are unsure if a "
+"patent\n"
 "may be applicable to you, check your local laws."
 msgstr ""
 "Предупреждение: Свободное программное обеспечение не обязательно может\n"
@@ -4982,70 +5030,55 @@ msgstr ""
 "Если вы не уверены в применимости патента для вас, сверьтесь со своими \n"
 "местными законами."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
-msgstr ""
-"\n"
-"Предупреждение\n"
-"Пожалуйста, внимательно прочтите условия, приведенные ниже. Если вы\n"
-"не согласны с какой-либо частью, вам не разрешается устанавливать \n"
-"следующий накопитель CD. Нажмите 'Отказаться' для продолжения установки\n"
-"без этого накопителя.\n"
-"\n"
-"\n"
-"Некоторые компоненты, имеющиеся на следующем CD, не ограничиваются\n"
-"Лицензией GPL или подобными соглашениями. Каждый такой компонент\n"
-"ограничен условиями его собственного лицензионного соглашения. \n"
-"Пожалуйста, внимательно прочтите и соблюдайте правила таких особых\n"
-"лицензионных соглашений перед использованием или дальнейшем\n"
-"распространением оговоренных компонентов. \n"
-"Такие лицензионные соглашения в основном будут предупреждать передачу,\n"
-"копирование (за исключением создания резервных копий), дальнейшее\n"
-"распространение, обратную разработку, дизассемблирование, декомпиляцию\n"
-"или изменение компонента.\n"
-"Любое нарушение соглашения немедленно аннулирует ваши права по\n"
-"указанному лицензионному соглашению. Пока определенное лицензионное\n"
-"соглашение не обеспечит вас такими правами, вы, обычно, не можете\n"
-"устанавливать программы более, чем на одну систему, или применять их\n"
-"для сетевого использования. Если сомневаетесь, пожалуйста, свяжитесь\n"
-"непосредственно с распространителем или редактором компонента. \n"
-"Передача третьим лицам или копирование таких компонентов, включая\n"
-"документацию, зачастую запрещено.\n"
-"\n"
-"Все права на компоненты следующего накопителя CD принадлежат их\n"
-"непосредственным авторам и защищены законами об интеллектуальной\n"
-"собственности и авторских правах применительно к программному\n"
-"обеспечению.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
+msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -5055,7 +5088,8 @@ msgid ""
 "Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of Mandriva Linux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5181,9 +5215,11 @@ msgstr "Какой %s драйвер мне попробовать?"
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without them. Would you like to specify\n"
+"properly, although it normally works fine without them. Would you like to "
+"specify\n"
 "extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it should\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
 "not cause any damage."
 msgstr ""
 "В некоторых случаях драйверу %s нужна некоторая дополнительная информация,\n"
@@ -5225,25 +5261,26 @@ msgstr "Расширенный раздел не поддерживается н
 #, c-format
 msgid ""
 "You have a hole in your partition table but I can not use it.\n"
-"The only solution is to move your primary partitions to have the hole next to the extended partitions."
+"The only solution is to move your primary partitions to have the hole next "
+"to the extended partitions."
 msgstr ""
 "У вас есть дыра в вашей таблице разделов, но я не могу её использовать.\n"
-"Единственное решение - переместить первичные разделы так, чтобы дыра располагалась сразу за расширенными разделами."
+"Единственное решение - переместить первичные разделы так, чтобы дыра "
+"располагалась сразу за расширенными разделами."
 
 #: partition_table/raw.pm:285
 #, c-format
 msgid ""
 "Something bad is happening on your 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."
+"It means writing anything on the disk will end up with random, corrupted "
+"data."
 msgstr ""
 "Что-то плохое происходит на вашем диске. \n"
 "Тест на проверку целостности данных завершился неудачей. \n"
 "Это означает, что запись чего-нибудь на диск закончится случайным мусором"
 
-#: pkgs.pm:228
-#: pkgs.pm:231
-#: pkgs.pm:240
+#: pkgs.pm:228 pkgs.pm:231 pkgs.pm:240
 #, c-format
 msgid "Unused packages removal"
 msgstr "Удаление неиспользуемых пакетов"
@@ -5260,22 +5297,23 @@ msgstr "Поиск неиспользуемых пакетов локализа�
 
 #: pkgs.pm:241
 #, c-format
-msgid "We have detected that some packages are not needed for your system configuration."
-msgstr "Мы обнаружили, что часть пакетов не нужны для вашей конфигурации системы."
+msgid ""
+"We have detected that some packages are not needed for your system "
+"configuration."
+msgstr ""
+"Мы обнаружили, что часть пакетов не нужны для вашей конфигурации системы."
 
 #: pkgs.pm:242
 #, c-format
 msgid "We will remove the following packages, unless you choose otherwise:"
 msgstr "Мы хотим удалить следующие пакеты, если вы не измените выбор:"
 
-#: pkgs.pm:245
-#: pkgs.pm:246
+#: pkgs.pm:245 pkgs.pm:246
 #, c-format
 msgid "Unused hardware support"
 msgstr "Поддержка неиспользуемого оборудования"
 
-#: pkgs.pm:249
-#: pkgs.pm:250
+#: pkgs.pm:249 pkgs.pm:250
 #, c-format
 msgid "Unused localization"
 msgstr "Неиспользуемые локализации"
@@ -5318,7 +5356,9 @@ msgstr "Scannerdrake"
 #: scanner.pm:201
 #, c-format
 msgid "Could not install the packages needed to share your scanner(s)."
-msgstr "Не получается установить пакеты, необходимые для совместного использования ваших сканеров."
+msgstr ""
+"Не получается установить пакеты, необходимые для совместного использования "
+"ваших сканеров."
 
 #: scanner.pm:202
 #, c-format
@@ -5355,7 +5395,8 @@ msgid ""
 "\n"
 "Else only /etc/issue is allowed."
 msgstr ""
-"Если установлено в \"ВСЕ\", разрешено существовать файлам /etc/issue и /etc/issue.net.\n"
+"Если установлено в \"ВСЕ\", разрешено существовать файлам /etc/issue и /etc/"
+"issue.net.\n"
 "\n"
 "Если установлено в \"НИ ОДНОГО\", не разрешено ни одного issue .\n"
 "\n"
@@ -5378,8 +5419,11 @@ msgstr "Разрешает/Запрещает непосредственный �
 
 #: security/help.pm:33
 #, c-format
-msgid "Allow the list of users on the system on display managers (kdm and gdm)."
-msgstr "Разрешает/Запрещает вывод списка пользователей системы в оконных менеджерах (kdm и gdm)."
+msgid ""
+"Allow the list of users on the system on display managers (kdm and gdm)."
+msgstr ""
+"Разрешает/Запрещает вывод списка пользователей системы в оконных менеджерах "
+"(kdm и gdm)."
 
 #: security/help.pm:35
 #, c-format
@@ -5428,23 +5472,27 @@ msgstr ""
 msgid ""
 "Authorize:\n"
 "\n"
-"- all services controlled by tcp_wrappers (see hosts.deny(5) man page) if set to \"ALL\",\n"
+"- all services controlled by tcp_wrappers (see hosts.deny(5) man page) if "
+"set to \"ALL\",\n"
 "\n"
 "- only local ones if set to \"Local\"\n"
 "\n"
 "- none if set to \"None\".\n"
 "\n"
-"To authorize the services you need, use /etc/hosts.allow (see hosts.allow(5))."
+"To authorize the services you need, use /etc/hosts.allow (see hosts.allow"
+"(5))."
 msgstr ""
 "Разрешает:\n"
 "\n"
-"- все службы, контролируемые tcp_wrappers'ами (см. hosts.deny(5) man page), если установлено в \"ВСЕ\",\n"
+"- все службы, контролируемые tcp_wrappers'ами (см. hosts.deny(5) man page), "
+"если установлено в \"ВСЕ\",\n"
 "\n"
 "- только локальные, если установлено в \"ЛОКАЛЬНЫЕ\"\n"
 "\n"
 "- ни одной, если установлено в \"НИ ОДНОГО\".\n"
 "\n"
-"Для разрешения нужных вам служб используйте /etc/hosts.allow (см hosts.allow (5))."
+"Для разрешения нужных вам служб используйте /etc/hosts.allow (см hosts.allow "
+"(5))."
 
 #: security/help.pm:63
 #, c-format
@@ -5521,8 +5569,12 @@ msgstr "Разрешить msec'у проверять безопасность �
 
 #: security/help.pm:90
 #, c-format
-msgid "Enable su only from members of the wheel group. If set to no, allows su from any user."
-msgstr "Разрешает su только для членов группы wheel. Если установлено в \"нет\", разрешает su для любого пользователя."
+msgid ""
+"Enable su only from members of the wheel group. If set to no, allows su from "
+"any user."
+msgstr ""
+"Разрешает su только для членов группы wheel. Если установлено в \"нет\", "
+"разрешает su для любого пользователя."
 
 #: security/help.pm:92
 #, c-format
@@ -5547,22 +5599,32 @@ msgstr "Включает/Отключает sulogin(8) в однопользов
 #: security/help.pm:100
 #, c-format
 msgid "Add the name as an exception to the handling of password aging by msec."
-msgstr "Добавление имени в качестве исключения в управление возрастом паролей, осуществляемого msec'ом."
+msgstr ""
+"Добавление имени в качестве исключения в управление возрастом паролей, "
+"осуществляемого msec'ом."
 
 #: security/help.pm:102
 #, c-format
 msgid "Set password aging to \"max\" days and delay to change to \"inactive\"."
-msgstr "Установка возраста пароля в \"max\" дней и задержку для изменения на \"inactive\"."
+msgstr ""
+"Установка возраста пароля в \"max\" дней и задержку для изменения на "
+"\"inactive\"."
 
 #: security/help.pm:104
 #, c-format
 msgid "Set the password history length to prevent password reuse."
-msgstr "Установка длительности истории пароля для предотвращения повторного использования пароля."
+msgstr ""
+"Установка длительности истории пароля для предотвращения повторного "
+"использования пароля."
 
 #: security/help.pm:106
 #, c-format
-msgid "Set the password minimum length and minimum number of digit and minimum number of capitalized letters."
-msgstr "Установка минимальной длины пароля, минимального количества цифр и минимального количества символов в верхнем регистре."
+msgid ""
+"Set the password minimum length and minimum number of digit and minimum "
+"number of capitalized letters."
+msgstr ""
+"Установка минимальной длины пароля, минимального количества цифр и "
+"минимального количества символов в верхнем регистре."
 
 #: security/help.pm:108
 #, c-format
@@ -5596,12 +5658,16 @@ msgstr ""
 #: security/help.pm:117
 #, c-format
 msgid "if set to yes, check permissions of files in the users' home."
-msgstr "если установлено Да, проверяются права доступа файлов в домашних каталогах пользователей."
+msgstr ""
+"если установлено Да, проверяются права доступа файлов в домашних каталогах "
+"пользователей."
 
 #: security/help.pm:118
 #, c-format
 msgid "if set to yes, check if the network devices are in promiscuous mode."
-msgstr "если установлено Да, проверяется, работают ли сетевые устройства в режиме promiscuous."
+msgstr ""
+"если установлено Да, проверяется, работают ли сетевые устройства в режиме "
+"promiscuous."
 
 #: security/help.pm:119
 #, c-format
@@ -5611,7 +5677,8 @@ msgstr "если установлено Да, ежедневно выполня�
 #: security/help.pm:120
 #, c-format
 msgid "if set to yes, check additions/removals of sgid files."
-msgstr "если установлено Да, проверяется добавление/удаление файлов с sgid-битами."
+msgstr ""
+"если установлено Да, проверяется добавление/удаление файлов с sgid-битами."
 
 #: security/help.pm:121
 #, c-format
@@ -5621,12 +5688,15 @@ msgstr "если установлено Да, проверяется налич�
 #: security/help.pm:122
 #, c-format
 msgid "if set to yes, verify checksum of the suid/sgid files."
-msgstr "если установлено Да, проверяется контрольная сумма файлов с битами suid/sgid."
+msgstr ""
+"если установлено Да, проверяется контрольная сумма файлов с битами suid/sgid."
 
 #: security/help.pm:123
 #, c-format
 msgid "if set to yes, check additions/removals of suid root files."
-msgstr "если установлено Да, проверяется добавление/удаление файлов root'а с suid-битом."
+msgstr ""
+"если установлено Да, проверяется добавление/удаление файлов root'а с suid-"
+"битом."
 
 #: security/help.pm:124
 #, c-format
@@ -5636,7 +5706,9 @@ msgstr "если установлено Да, создается отчет о �
 #: security/help.pm:125
 #, c-format
 msgid "if set to yes, check files/directories writable by everybody."
-msgstr "если установлено Да, проверяются файлы/каталоги с возможностью записи кем-угодно."
+msgstr ""
+"если установлено Да, проверяются файлы/каталоги с возможностью записи кем-"
+"угодно."
 
 #: security/help.pm:126
 #, c-format
@@ -5645,8 +5717,11 @@ msgstr "если установлено Да, выполняются прове�
 
 #: security/help.pm:127
 #, c-format
-msgid "if set, send the mail report to this email address else send it to root."
-msgstr "если установлено, письмо с отчетом отправляется на этот адрес, иначе отправляется root'у."
+msgid ""
+"if set, send the mail report to this email address else send it to root."
+msgstr ""
+"если установлено, письмо с отчетом отправляется на этот адрес, иначе "
+"отправляется root'у."
 
 #: security/help.pm:128
 #, c-format
@@ -5656,7 +5731,8 @@ msgstr "если установлено Да, результаты провер�
 #: security/help.pm:129
 #, c-format
 msgid "Do not send mails if there's nothing to warn about"
-msgstr "если установлено Да, сообщения не отправляются, если не о чем предупреждать."
+msgstr ""
+"если установлено Да, сообщения не отправляются, если не о чем предупреждать."
 
 #: security/help.pm:130
 #, c-format
@@ -5676,12 +5752,16 @@ msgstr "если установлено Да, результаты провер�
 #: security/help.pm:134
 #, c-format
 msgid "Set shell commands history size. A value of -1 means unlimited."
-msgstr "Устанавливает размер истории команд командного процессора. Значение -1 означает неограниченную историю."
+msgstr ""
+"Устанавливает размер истории команд командного процессора. Значение -1 "
+"означает неограниченную историю."
 
 #: security/help.pm:136
 #, c-format
 msgid "Set the shell timeout. A value of zero means no timeout."
-msgstr "Устанавливает таймаут для командного процессора. Нулевое значение означает отсутствие таймаута."
+msgstr ""
+"Устанавливает таймаут для командного процессора. Нулевое значение означает "
+"отсутствие таймаута."
 
 #: security/help.pm:136
 #, c-format
@@ -5826,7 +5906,9 @@ msgstr "Нет возраста пароля для"
 #: security/l10n.pm:38
 #, c-format
 msgid "Set password expiration and account inactivation delays"
-msgstr "Установить сроки действия паролей и предупреждений о блокировке учётных записей"
+msgstr ""
+"Установить сроки действия паролей и предупреждений о блокировке учётных "
+"записей"
 
 #: security/l10n.pm:39
 #, c-format
@@ -5926,7 +6008,9 @@ msgstr "Не отправлять пустые почтовые сообщени
 #: security/l10n.pm:58
 #, c-format
 msgid "If set, send the mail report to this email address else send it to root"
-msgstr "Если установлено, отправляет письмо с отчетом на этот адрес, иначе отправляет его root."
+msgstr ""
+"Если установлено, отправляет письмо с отчетом на этот адрес, иначе "
+"отправляет его root."
 
 #: security/l10n.pm:59
 #, c-format
@@ -5985,33 +6069,48 @@ msgid ""
 "but very sensitive. It must not be used for a machine connected to others\n"
 "or to the Internet. There is no password access."
 msgstr ""
-"Этот уровень надо использовать с осторожностью. Он делает вашу систему проще\n"
+"Этот уровень надо использовать с осторожностью. Он делает вашу систему "
+"проще\n"
 " в использовании, но и очень чувствительной: он не должен использоваться\n"
-"на машинах, соединенных с другими или с Интернетом. Существует доступ без пароля."
+"на машинах, соединенных с другими или с Интернетом. Существует доступ без "
+"пароля."
 
 #: security/level.pm:44
 #, c-format
-msgid "Passwords are now enabled, but use as a networked computer is still not recommended."
-msgstr "Пароли теперь включены, но использование в качестве сетевого компьютера по-прежнему не рекомендуется."
+msgid ""
+"Passwords are now enabled, but use as a networked computer is still not "
+"recommended."
+msgstr ""
+"Пароли теперь включены, но использование в качестве сетевого компьютера по-"
+"прежнему не рекомендуется."
 
 #: security/level.pm:45
 #, c-format
-msgid "This is the standard security recommended for a computer that will be used to connect to the Internet as a client."
+msgid ""
+"This is the standard security recommended for a computer that will be used "
+"to connect to the Internet as a client."
 msgstr ""
 "Это стандартный уровень безопасности, рекомендуемый для компьютера,\n"
 "который будет использоваться для подключения к Интернету в качестве клиента."
 
 #: security/level.pm:46
 #, c-format
-msgid "There are already some restrictions, and more automatic checks are run every night."
-msgstr "Уже присутствует ряд ограничений и каждую ночь запускаются дополнительные автоматические проверки."
+msgid ""
+"There are already some restrictions, and more automatic checks are run every "
+"night."
+msgstr ""
+"Уже присутствует ряд ограничений и каждую ночь запускаются дополнительные "
+"автоматические проверки."
 
 #: security/level.pm:47
 #, c-format
 msgid ""
-"With this security level, the use of this system as a server becomes possible.\n"
-"The security is now high enough to use the system as a server which can accept\n"
-"connections from many clients. Note: if your machine is only a client on the Internet, you should choose a lower level."
+"With this security level, the use of this system as a server becomes "
+"possible.\n"
+"The security is now high enough to use the system as a server which can "
+"accept\n"
+"connections from many clients. Note: if your machine is only a client on the "
+"Internet, you should choose a lower level."
 msgstr ""
 "На этом уровне безопасности становится возможным использование системы \n"
 "в качестве сервера.\n"
@@ -6022,8 +6121,12 @@ msgstr ""
 
 #: security/level.pm:50
 #, c-format
-msgid "This is similar to the previous level, but the system is entirely closed and security features are at their maximum."
-msgstr "Этот уровень похож на предыдущий, но система полностью закрыта и параметры безопасности установлены в их максимальные значения."
+msgid ""
+"This is similar to the previous level, but the system is entirely closed and "
+"security features are at their maximum."
+msgstr ""
+"Этот уровень похож на предыдущий, но система полностью закрыта и параметры "
+"безопасности установлены в их максимальные значения."
 
 #: security/level.pm:55
 #, c-format
@@ -6059,7 +6162,8 @@ msgstr "Логин или email:"
 #: services.pm:19
 #, c-format
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
-msgstr "Запустить звуковую систему ALSA (Расширенная звуковая архитектура Linux)"
+msgstr ""
+"Запустить звуковую систему ALSA (Расширенная звуковая архитектура Linux)"
 
 #: services.pm:20
 #, c-format
@@ -6090,7 +6194,8 @@ msgstr ""
 #, c-format
 msgid ""
 "cron is a standard UNIX program that runs user-specified programs\n"
-"at periodic scheduled times. vixie cron adds a number of features to the basic\n"
+"at periodic scheduled times. vixie cron adds a number of features to the "
+"basic\n"
 "UNIX cron, including better security and more powerful configuration options."
 msgstr ""
 "cron является стандартной программой UNIX, которая по расписанию запускает\n"
@@ -6100,7 +6205,8 @@ msgstr ""
 
 #: services.pm:28
 #, c-format
-msgid "Common UNIX Printing System (CUPS) is an advanced printer spooling system"
+msgid ""
+"Common UNIX Printing System (CUPS) is an advanced printer spooling system"
 msgstr "CUPS - система печати Linux"
 
 #: services.pm:29
@@ -6111,7 +6217,8 @@ msgstr "Запуск экрана входа в систему"
 #: services.pm:30
 #, c-format
 msgid ""
-"FAM is a file monitoring daemon. It is used to get reports when files change.\n"
+"FAM is a file monitoring daemon. It is used to get reports when files "
+"change.\n"
 "It is used by GNOME and KDE"
 msgstr ""
 "FAM это демон слежения за файлами. Он используется для получения отчетов\n"
@@ -6122,7 +6229,8 @@ msgstr ""
 #, c-format
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
-"Midnight Commander. It also allows mouse-based console cut-and-paste operations,\n"
+"Midnight Commander. It also allows mouse-based console cut-and-paste "
+"operations,\n"
 "and includes support for pop-up menus on the console."
 msgstr ""
 "GPM добавляет поддержку мыши для приложений, работающих в текстовом режиме,\n"
@@ -6133,7 +6241,8 @@ msgstr ""
 #: services.pm:35
 #, c-format
 msgid "HAL is a daemon that collects and maintains information about hardware"
-msgstr "HAL - демон, собирающий информацию об аппаратном обеспечении компьютера"
+msgstr ""
+"HAL - демон, собирающий информацию об аппаратном обеспечении компьютера"
 
 #: services.pm:36
 #, c-format
@@ -6146,15 +6255,20 @@ msgstr ""
 
 #: services.pm:38
 #, c-format
-msgid "Apache is a World Wide Web server. It is used to serve HTML files and CGI."
-msgstr "Apache является сервером всемирной паутины. Он используется для обслуживания файлов HTML и CGI."
+msgid ""
+"Apache is a World Wide Web server. It is used to serve HTML files and CGI."
+msgstr ""
+"Apache является сервером всемирной паутины. Он используется для обслуживания "
+"файлов HTML и CGI."
 
 #: services.pm:39
 #, c-format
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
-"variety of other internet services as needed. It is responsible for starting\n"
-"many services, including telnet, ftp, rsh, and rlogin. Disabling inetd disables\n"
+"variety of other internet services as needed. It is responsible for "
+"starting\n"
+"many services, including telnet, ftp, rsh, and rlogin. Disabling inetd "
+"disables\n"
 "all of the services it is responsible for."
 msgstr ""
 "Демон internet superserver (зачастую называемый inetd) запускает по мере\n"
@@ -6211,7 +6325,8 @@ msgid ""
 "lpd is the print daemon required for lpr to work properly. It is\n"
 "basically a server that arbitrates print jobs to printer(s)."
 msgstr ""
-"lpd является демоном печати, который необходим для нормальной работы lpr. Это\n"
+"lpd является демоном печати, который необходим для нормальной работы lpr. "
+"Это\n"
 "в основном сервер, распределяющий по принтерам задания на печать."
 
 #: services.pm:55
@@ -6225,15 +6340,21 @@ msgstr ""
 
 #: services.pm:57
 #, c-format
-msgid "DBUS is a daemon which broadcasts notifications of system events and other messages"
+msgid ""
+"DBUS is a daemon which broadcasts notifications of system events and other "
+"messages"
 msgstr ""
 "DBUS - демон, рассылающий широковещательные уведомления и другие сообщения\n"
 "программам"
 
 #: services.pm:58
 #, c-format
-msgid "named (BIND) is a Domain Name Server (DNS) that is used to resolve host names to IP addresses."
-msgstr "named (BIND) является сервером доменных имен (DNS), который используется для преобразования имен хостов в IP-адреса."
+msgid ""
+"named (BIND) is a Domain Name Server (DNS) that is used to resolve host "
+"names to IP addresses."
+msgstr ""
+"named (BIND) является сервером доменных имен (DNS), который используется для "
+"преобразования имен хостов в IP-адреса."
 
 #: services.pm:59
 #, c-format
@@ -6297,7 +6418,8 @@ msgstr "Поддержка win-принтеров OKI 4w и совместимы
 #, c-format
 msgid ""
 "PCMCIA support is usually to support things like ethernet and\n"
-"modems in laptops.  It will not get started unless configured so it is safe to have\n"
+"modems in laptops.  It will not get started unless configured so it is safe "
+"to have\n"
 "it installed on machines that do not need it."
 msgstr ""
 "Поддержка PCMCIA является обычной поддержкой устройств типа ethernet и\n"
@@ -6308,7 +6430,8 @@ msgstr ""
 #, c-format
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
-"protocols such as NFS and NIS. The portmap server must be running on machines\n"
+"protocols such as NFS and NIS. The portmap server must be running on "
+"machines\n"
 "which act as servers for protocols which make use of the RPC mechanism."
 msgstr ""
 "portmapper управляет соединениями RPC, которые используются протоколами,\n"
@@ -6318,8 +6441,12 @@ msgstr ""
 
 #: services.pm:78
 #, c-format
-msgid "Postfix is a Mail Transport Agent, which is the program that moves mail from one machine to another."
-msgstr "Postfix это Агент доставки почты, программа которая переправляет почту с одной машины на другую."
+msgid ""
+"Postfix is a Mail Transport Agent, which is the program that moves mail from "
+"one machine to another."
+msgstr ""
+"Postfix это Агент доставки почты, программа которая переправляет почту с "
+"одной машины на другую."
 
 #: services.pm:79
 #, c-format
@@ -6348,7 +6475,8 @@ msgid ""
 "routing protocols are needed for complex networks."
 msgstr ""
 "Демон routed разрешает автоматическое обновление таблиц IP-маршрутизации\n"
-"через протокол RIP. В то время как RIP широко используется в небольших сетях,\n"
+"через протокол RIP. В то время как RIP широко используется в небольших "
+"сетях,\n"
 "для сложных сетей необходимы более сложные протоколы маршрутизации."
 
 #: services.pm:86
@@ -6381,14 +6509,18 @@ msgstr ""
 
 #: services.pm:92
 #, c-format
-msgid "SANE (Scanner Access Now Easy) enables to access scanners, video cameras, ..."
+msgid ""
+"SANE (Scanner Access Now Easy) enables to access scanners, video cameras, ..."
 msgstr "SANE - система работы со сканерами и камерами"
 
 #: services.pm:93
 #, c-format
-msgid "The SMB/CIFS protocol enables to share access to files & printers and also integrates with a Windows Server domain"
+msgid ""
+"The SMB/CIFS protocol enables to share access to files & printers and also "
+"integrates with a Windows Server domain"
 msgstr ""
-"Протокол SMB/CIFS даёт возможность открыть общий доступ к файлам и принтерам\n"
+"Протокол SMB/CIFS даёт возможность открыть общий доступ к файлам и "
+"принтерам\n"
 "по сети"
 
 #: services.pm:94
@@ -6398,9 +6530,12 @@ msgstr "Запускает звуковую систему на вашей ма�
 
 #: services.pm:95
 #, c-format
-msgid "Secure Shell is a network protocol that allows data to be exchanged over a secure channel between two computers"
+msgid ""
+"Secure Shell is a network protocol that allows data to be exchanged over a "
+"secure channel between two computers"
 msgstr ""
-"SSH - протокол, позволяющий удалённо работать с компьютером по сети, используя\n"
+"SSH - протокол, позволяющий удалённо работать с компьютером по сети, "
+"используя\n"
 "шифрованный канал передачи данных"
 
 #: services.pm:96
@@ -6458,8 +6593,7 @@ msgstr "Удаленное администрирование"
 msgid "Database Server"
 msgstr "Сервер базы данных"
 
-#: services.pm:153
-#: services.pm:189
+#: services.pm:153 services.pm:189
 #, c-format
 msgid "Services"
 msgstr "Службы"
@@ -6467,7 +6601,8 @@ msgstr "Службы"
 #: services.pm:153
 #, c-format
 msgid "Choose which services should be automatically started at boot time"
-msgstr "Выберите, какие службы должны быть автоматически запущены во время загрузки"
+msgstr ""
+"Выберите, какие службы должны быть автоматически запущены во время загрузки"
 
 #: services.pm:171
 #, c-format
@@ -6498,8 +6633,7 @@ msgstr ""
 "Извините, дополнительная информация\n"
 "об этой службе отсутствует."
 
-#: services.pm:221
-#: ugtk2.pm:923
+#: services.pm:221 ugtk2.pm:923
 #, c-format
 msgid "Info"
 msgstr "Информация"
@@ -6539,7 +6673,8 @@ msgid ""
 "\n"
 "You should have received a copy of the GNU General Public License\n"
 "along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
+"USA.\n"
 msgstr ""
 "Эта программа является открытым программным обеспечением; вы можете\n"
 "распространять ее дальше и/или изменять ее при условии соблюдения GNU\n"
@@ -6564,7 +6699,8 @@ msgid ""
 "--default             : save default directories.\n"
 "--debug               : show all debug messages.\n"
 "--show-conf           : list of files or directories to backup.\n"
-"--config-info         : explain configuration file options (for non-X users).\n"
+"--config-info         : explain configuration file options (for non-X "
+"users).\n"
 "--daemon              : use daemon configuration. \n"
 "--help                : show this message.\n"
 "--version             : show version number.\n"
@@ -6575,7 +6711,8 @@ msgstr ""
 "--default             : сохранить каталоги по умолчанию.\n"
 "--debug               : показать все отладочные сообщения.\n"
 "--show-conf           : перечислить резервируемые файлы или каталоги.\n"
-"--config-info         : разъяснять параметры файла настройки (не для                         пользователей Х).\n"
+"--config-info         : разъяснять параметры файла настройки (не "
+"для                         пользователей Х).\n"
 "--daemon              : использовать конфигурацию демона. \n"
 "--help                : показать это сообщение.\n"
 "--version             : показать номер версии.\n"
@@ -6670,9 +6807,12 @@ msgid ""
 "--start          : start MTS\n"
 "--stop           : stop MTS\n"
 "--adduser        : add an existing system user to MTS (requires username)\n"
-"--deluser        : delete an existing system user from MTS (requires username)\n"
-"--addclient      : add a client machine to MTS (requires MAC address, IP, nbi image name)\n"
-"--delclient      : delete a client machine from MTS (requires MAC address, IP, nbi image name)"
+"--deluser        : delete an existing system user from MTS (requires "
+"username)\n"
+"--addclient      : add a client machine to MTS (requires MAC address, IP, "
+"nbi image name)\n"
+"--delclient      : delete a client machine from MTS (requires MAC address, "
+"IP, nbi image name)"
 msgstr ""
 "[ОПЦИИ]...\n"
 "Конфигуратор Сервера терминалов Mandriva Linux\n"
@@ -6680,10 +6820,14 @@ msgstr ""
 "--disable        : выключить MTS\n"
 "--start          : запустить MTS\n"
 "--stop           : остановить MTS\n"
-"--adduser        : добавить существующего пользователя системы в MTS (требуется имя пользователя)\n"
-"--deluser        : удалить существующего пользователя системы из MTS (требуется имя пользователя)\n"
-"--addclient      : добавить клиентскую машину в MTS (требуется MAC-адрес, IP, имя образа nbi)\n"
-"--delclient      : удалить клиентскую машину из MTS (требуется MAC-адрес, IP, имя образа nbi)"
+"--adduser        : добавить существующего пользователя системы в MTS "
+"(требуется имя пользователя)\n"
+"--deluser        : удалить существующего пользователя системы из MTS "
+"(требуется имя пользователя)\n"
+"--addclient      : добавить клиентскую машину в MTS (требуется MAC-адрес, "
+"IP, имя образа nbi)\n"
+"--delclient      : удалить клиентскую машину из MTS (требуется MAC-адрес, "
+"IP, имя образа nbi)"
 
 #: standalone.pm:100
 #, c-format
@@ -6693,7 +6837,9 @@ msgstr "[клавиатура]"
 #: standalone.pm:101
 #, c-format
 msgid "[--file=myfile] [--word=myword] [--explain=regexp] [--alert]"
-msgstr "[--file=мой_файл] [--word=мое_слово] [--explain=регулярное_выражение] [--alert]"
+msgstr ""
+"[--file=мой_файл] [--word=мое_слово] [--explain=регулярное_выражение] [--"
+"alert]"
 
 #: standalone.pm:102
 #, c-format
@@ -6722,21 +6868,30 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTION]...\n"
-"  --no-confirmation      do not ask first confirmation question in Mandriva Update mode\n"
+"  --no-confirmation      do not ask first confirmation question in Mandriva "
+"Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
-"  --changelog-first      display changelog before filelist in the description window\n"
+"  --changelog-first      display changelog before filelist in the "
+"description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[ОПЦИЯ]...\n"
-"  --no-confirmation      не просить первого подтверждения в режиме Mandriva Update\n"
+"  --no-confirmation      не просить первого подтверждения в режиме Mandriva "
+"Update\n"
 "  --no-verify-rpm        не проверять подписи пакетов\n"
-"  --changelog-first      показывать журнал изменений перед списком файлов в окне описания\n"
-"  --merge-all-rpmnew     предлагать объединить все найденные файлы .rpmnew/.rpmsave"
+"  --changelog-first      показывать журнал изменений перед списком файлов в "
+"окне описания\n"
+"  --merge-all-rpmnew     предлагать объединить все найденные файлы .rpmnew/."
+"rpmsave"
 
 #: standalone.pm:117
 #, c-format
-msgid "[--manual] [--device=dev] [--update-sane=sane_source_dir] [--update-usbtable] [--dynamic=dev]"
-msgstr "[--manual] [--device=устройство] [--update-sane=sane_source_dir] [--update-usbtable] [--dynamic=устройство]"
+msgid ""
+"[--manual] [--device=dev] [--update-sane=sane_source_dir] [--update-"
+"usbtable] [--dynamic=dev]"
+msgstr ""
+"[--manual] [--device=устройство] [--update-sane=sane_source_dir] [--update-"
+"usbtable] [--dynamic=устройство]"
 
 #: standalone.pm:118
 #, c-format
@@ -6753,13 +6908,14 @@ msgstr ""
 #, c-format
 msgid ""
 "\n"
-"Usage: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--testing] [-v|--version] "
+"Usage: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
+"testing] [-v|--version] "
 msgstr ""
 "\n"
-"Использование: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--testing] [-v|--version] "
+"Использование: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] "
+"[--testing] [-v|--version] "
 
-#: timezone.pm:161
-#: timezone.pm:162
+#: timezone.pm:161 timezone.pm:162
 #, c-format
 msgid "All servers"
 msgstr "Все серверы"
@@ -6858,10 +7014,73 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Установка завершилась неудачей"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Предупреждение\n"
+#~ "Пожалуйста, внимательно прочтите условия, приведенные ниже. Если вы\n"
+#~ "не согласны с какой-либо частью, вам не разрешается устанавливать \n"
+#~ "следующий накопитель CD. Нажмите 'Отказаться' для продолжения установки\n"
+#~ "без этого накопителя.\n"
+#~ "\n"
+#~ "\n"
+#~ "Некоторые компоненты, имеющиеся на следующем CD, не ограничиваются\n"
+#~ "Лицензией GPL или подобными соглашениями. Каждый такой компонент\n"
+#~ "ограничен условиями его собственного лицензионного соглашения. \n"
+#~ "Пожалуйста, внимательно прочтите и соблюдайте правила таких особых\n"
+#~ "лицензионных соглашений перед использованием или дальнейшем\n"
+#~ "распространением оговоренных компонентов. \n"
+#~ "Такие лицензионные соглашения в основном будут предупреждать передачу,\n"
+#~ "копирование (за исключением создания резервных копий), дальнейшее\n"
+#~ "распространение, обратную разработку, дизассемблирование, декомпиляцию\n"
+#~ "или изменение компонента.\n"
+#~ "Любое нарушение соглашения немедленно аннулирует ваши права по\n"
+#~ "указанному лицензионному соглашению. Пока определенное лицензионное\n"
+#~ "соглашение не обеспечит вас такими правами, вы, обычно, не можете\n"
+#~ "устанавливать программы более, чем на одну систему, или применять их\n"
+#~ "для сетевого использования. Если сомневаетесь, пожалуйста, свяжитесь\n"
+#~ "непосредственно с распространителем или редактором компонента. \n"
+#~ "Передача третьим лицам или копирование таких компонентов, включая\n"
+#~ "документацию, зачастую запрещено.\n"
+#~ "\n"
+#~ "Все права на компоненты следующего накопителя CD принадлежат их\n"
+#~ "непосредственным авторам и защищены законами об интеллектуальной\n"
+#~ "собственности и авторских правах применительно к программному\n"
+#~ "обеспечению.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Использовать libsafe для серверов"
+
 #~ msgid ""
 #~ "A library which defends against buffer overflow and format string attacks."
 #~ msgstr ""
 #~ "Библиотека, защищающая от атак переполнения буфера и формата строки."
-
diff --git a/perl-install/share/po/sc.po b/perl-install/share/po/sc.po
index ffef1f813..59893bae5 100644
--- a/perl-install/share/po/sc.po
+++ b/perl-install/share/po/sc.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-sc\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2005-09-14 11:29+0100\n"
 "Last-Translator: Antoni Pistis <antonio.pistis@virgilio.it>\n"
 "Language-Team: Sardu\n"
@@ -1397,18 +1397,14 @@ msgstr "Sçobera un'atra pratzidura"
 msgid "Choose a partition"
 msgstr "Sçobera una pratzidura"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Modalidadi normali"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Modalidadi sperta"
+msgid "More"
+msgstr "Atru"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "Assètiu"
@@ -1460,13 +1456,17 @@ msgstr "Lìmpia totu"
 msgid "Auto allocate"
 msgstr "Pratziduramentu automàtigu"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Atru"
+msgid "Toggle to normal mode"
+msgstr "Modalidadi normali"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Modalidadi sperta"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Scedas discu tostau"
@@ -1519,7 +1519,12 @@ msgstr "Açungi a RAID"
 msgid "Add to LVM"
 msgstr "Açungi a LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ID umperadori"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Burra"
@@ -1534,7 +1539,12 @@ msgstr "Burra de RAID"
 msgid "Remove from LVM"
 msgstr "Burra de LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Burra de LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Muda RAID"
@@ -1705,7 +1715,27 @@ msgid ""
 "filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Crai de cuadura de su filesystem"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Sçobera sa crai de cuadura de su filesystem"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Crai de cuadura"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Sçobera unu RAID ki jai dui est po d'açungi"
@@ -1817,7 +1847,12 @@ msgstr "Depis torrai a allui innantis ki sa muda tenjat efetu"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Megu a scrìiri sa tàula de pratzidura de su trastu %s in su discu"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formatu sa pratzidura %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Apustis formatada sa pratzidura %s, as a perdi totu su ki dui est"
@@ -1949,7 +1984,27 @@ msgstr "Carrigau\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Crai de cuadura"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2049,12 +2104,7 @@ msgstr "Tipu de tàula de is pratziduras: %s\n"
 msgid "on channel %d id %d\n"
 msgstr ""
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Crai de cuadura de su filesystem"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Sçobera sa crai de cuadura de su filesystem"
@@ -2070,12 +2120,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Is crais de cuadura no cunsonant"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Crai de cuadura"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Crai de cuadura (torra)"
@@ -2186,11 +2231,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Depis tenni una pratzidura FAT carrigada in /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formatu sa pratzidura %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4520,7 +4560,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4528,8 +4571,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4549,52 +4592,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4608,9 +4656,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4631,7 +4679,55 @@ msgid ""
 "For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4643,38 +4739,54 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
+#: messages.pm:123
 #, c-format
 msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
 "\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
 "\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
 "\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
 "\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
diff --git a/perl-install/share/po/sk.po b/perl-install/share/po/sk.po
index 75ffc973d..ab97fe570 100644
--- a/perl-install/share/po/sk.po
+++ b/perl-install/share/po/sk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2005-09-21 14:03+0100\n"
 "Last-Translator: Tibor Pittich <Tibor.Pittich@mandriva.org>\n"
 "Language-Team:  <i18n@mandrake.sk>\n"
@@ -1410,18 +1410,14 @@ msgstr "Zvoľte iný oddiel"
 msgid "Choose a partition"
 msgstr "Zvoľte oddiel"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Prepni do normálneho režimu"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Prepni do expert režimu"
+msgid "More"
+msgstr "Viac"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "Konfigurácia"
@@ -1472,13 +1468,17 @@ msgstr "Zmazať všetko"
 msgid "Auto allocate"
 msgstr "Automaticky prerozdeliť"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Viac"
+msgid "Toggle to normal mode"
+msgstr "Prepni do normálneho režimu"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Prepni do expert režimu"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Informácie o pevnom disku"
@@ -1532,7 +1532,12 @@ msgstr "Pridať do RAID"
 msgid "Add to LVM"
 msgstr "Pridať do LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ID používateľa"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Zrušiť"
@@ -1547,7 +1552,12 @@ msgstr "Odobrať z RAID"
 msgid "Remove from LVM"
 msgstr "Odober z LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Odober z LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Modifikuj RAID"
@@ -1720,7 +1730,27 @@ msgstr ""
 "Pre kontrolu integrity po zmene veľkosti oblasti/oblastí bude\n"
 "spustená kontrola súborového systému pri najbližšom štarte Windows(TM)"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Kryptovací kľúč súborového systému"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Zvoľte kryptovací kľúč súborového systému"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Kryptovací kľúč"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Vyberte existujúci RAID pre pridanie"
@@ -1834,7 +1864,12 @@ msgstr "Aby sa úpravy prejavili, musíte reštartovať počítač"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Tabuľka rozdelenia disku zariadenia %s sa zapíše na disk"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formátuje sa oddiel %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Ak naformátujete oddiel %s,všetky predošlé údaje sa na ňom stratia"
@@ -1966,7 +2001,27 @@ msgstr "Pripojené\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Kryptovací kľúč"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2070,12 +2125,7 @@ msgstr "Typ tabuľky rozdelenia disku: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "na kanály %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Kryptovací kľúč súborového systému"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Zvoľte kryptovací kľúč súborového systému"
@@ -2092,12 +2142,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "kryptovacie kľúče nesúhlasia"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Kryptovací kľúč"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Kryptovací kľúč (znovu)"
@@ -2213,11 +2258,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Musíte mať FAT oddiel pripojený na /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formátuje sa oddiel %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4642,7 +4682,7 @@ msgstr "Zavádzač nemôže použiť /boot na viacerých fyzických oddieloch"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4652,7 +4692,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4660,8 +4703,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4681,52 +4724,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4740,9 +4788,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4885,7 +4933,55 @@ msgstr ""
 "akékoľvek otázky k tomuto\n"
 "dokumentu, prosíme, kontaktujte Mandriva S.A.\n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4905,69 +5001,55 @@ msgstr ""
 "podrobnosti) Ak ste si nie istí či sa patenty môžu dotýkať aj vás, poradťe s "
 "právnikom."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Upozornenie\n"
-"\n"
-"Prosíme vás, aby ste si pozorne prečítali podmienky uvedené nižšie.\n"
-"Ak nesúhlasíte s niektorou časťou, nie je prípustné, aby ste inštalovali \n"
-"softvér z ďalšieho CD média. Stlačte 'Odmietam' pre pokračovanie \n"
-"inštalácie bez použitia týchto médií.\n"
-"\n"
-"\n"
-"Niektoré komponenty nachádzajúce sa na ďalších CD médiách nie sú\n"
-"uvoľnené pod GPL licenciou alebo jej podobnými dohodami. Každý takýto\n"
-"komponent je uvoľnený pod podmienkami svojej osobitnej licencie. \n"
-"Prosíme vás, aby ste si pozorne prečítali podmienky týchto licencií \n"
-"skôr, než budete používať alebo šíriť tieto komponenty. \n"
-"Takéto licencie vo všeobecnosti zakazujú prevod, duplikáciu (s výnimkou \n"
-"zálohy), šírenie, reverzné inžinierstvo, disassemblovanie a dekompiláciu \n"
-"alebo modifikáciu komponentu. \n"
-"Akékoľvek porušenie licenčnej zmluvy vám s okamžitou platnosťou odoberá \n"
-"Vaše práva vymedzené takouto licenciou. Pokiaľ vám takáto špecifická \n"
-"licencia neudelí takéto práva, obvykle nemôžete inštalovať programy na \n"
-"viac ako jeden systém alebo ich prispôsobiť na sieťové použitie viacerými\n"
-"systémami. V prípade akýchkoľvek pochybností, prosíme kontaktujte priamo \n"
-"distribútora alebo vydavateľa komponentu. \n"
-"Prevod tretím stranám alebo kopírovanie takéhoto komponentu, vrátane \n"
-"dokumentácie, sú obvykle zakázané.\n"
-"\n"
-"\n"
-"Všetky práva ku komponentom na ďalších CD médiách prináležia ich \n"
-"vlastníkom a sú chránené zákonmi na ochranu duševného vlastníctva \n"
-"a vlastníckych práv použiteľných na softvérové programy.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6879,6 +6961,72 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Inštalácia zlyhala"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Upozornenie\n"
+#~ "\n"
+#~ "Prosíme vás, aby ste si pozorne prečítali podmienky uvedené nižšie.\n"
+#~ "Ak nesúhlasíte s niektorou časťou, nie je prípustné, aby ste "
+#~ "inštalovali \n"
+#~ "softvér z ďalšieho CD média. Stlačte 'Odmietam' pre pokračovanie \n"
+#~ "inštalácie bez použitia týchto médií.\n"
+#~ "\n"
+#~ "\n"
+#~ "Niektoré komponenty nachádzajúce sa na ďalších CD médiách nie sú\n"
+#~ "uvoľnené pod GPL licenciou alebo jej podobnými dohodami. Každý takýto\n"
+#~ "komponent je uvoľnený pod podmienkami svojej osobitnej licencie. \n"
+#~ "Prosíme vás, aby ste si pozorne prečítali podmienky týchto licencií \n"
+#~ "skôr, než budete používať alebo šíriť tieto komponenty. \n"
+#~ "Takéto licencie vo všeobecnosti zakazujú prevod, duplikáciu (s výnimkou \n"
+#~ "zálohy), šírenie, reverzné inžinierstvo, disassemblovanie a "
+#~ "dekompiláciu \n"
+#~ "alebo modifikáciu komponentu. \n"
+#~ "Akékoľvek porušenie licenčnej zmluvy vám s okamžitou platnosťou odoberá \n"
+#~ "Vaše práva vymedzené takouto licenciou. Pokiaľ vám takáto špecifická \n"
+#~ "licencia neudelí takéto práva, obvykle nemôžete inštalovať programy na \n"
+#~ "viac ako jeden systém alebo ich prispôsobiť na sieťové použitie "
+#~ "viacerými\n"
+#~ "systémami. V prípade akýchkoľvek pochybností, prosíme kontaktujte "
+#~ "priamo \n"
+#~ "distribútora alebo vydavateľa komponentu. \n"
+#~ "Prevod tretím stranám alebo kopírovanie takéhoto komponentu, vrátane \n"
+#~ "dokumentácie, sú obvykle zakázané.\n"
+#~ "\n"
+#~ "\n"
+#~ "Všetky práva ku komponentom na ďalších CD médiách prináležia ich \n"
+#~ "vlastníkom a sú chránené zákonmi na ochranu duševného vlastníctva \n"
+#~ "a vlastníckych práv použiteľných na softvérové programy.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Použiť libsafe pre server"
 
diff --git a/perl-install/share/po/sl.po b/perl-install/share/po/sl.po
index 11c737d9b..ef134af57 100644
--- a/perl-install/share/po/sl.po
+++ b/perl-install/share/po/sl.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sl\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-09-14 04:19+0200\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
@@ -1427,18 +1427,14 @@ msgstr "Izberite drug razdelek"
 msgid "Choose a partition"
 msgstr "Izberite razdelek"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Preklopi v normalni način"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Preklopi v napredni način"
+msgid "More"
+msgstr "Več"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Potrditev"
@@ -1491,13 +1487,17 @@ msgstr "Izbriši vse"
 msgid "Auto allocate"
 msgstr "Samodejno dodeljevanje"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Več"
+msgid "Toggle to normal mode"
+msgstr "Preklopi v normalni način"
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Preklopi v napredni način"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Podatki o trdem disku"
@@ -1551,7 +1551,12 @@ msgstr "Dodaj v RAID"
 msgid "Add to LVM"
 msgstr "Dodaj v LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ID uporabnika"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Izbriši"
@@ -1566,7 +1571,12 @@ msgstr "Odstrani iz RAID"
 msgid "Remove from LVM"
 msgstr "Odstrani iz LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Odstrani iz LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Spremeni RAID"
@@ -1740,7 +1750,27 @@ msgstr ""
 "Ko boste naslednjič zagnali Windows, se bo\n"
 "zagnal program za preverjanje datotečnega sistema."
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Šifrirni ključ datotečnega sistema: "
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Izberite šifrirni ključ datotečnega sistema"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Šifrirni ključ"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Izberite obstoječ RAID za dodajanje"
@@ -1856,7 +1886,12 @@ msgstr "Da bi uveljavili spremembe, morate ponovno zagnati računalnik."
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Razdelitvena tabela pogona %s bo zapisana na disk"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formatiranje razdelka %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1995,7 +2030,27 @@ msgstr "Priklopljeno\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Šifrirni ključ"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2096,12 +2151,7 @@ msgstr "Vrsta razdelitvene tabele: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "na kanalu %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Šifrirni ključ datotečnega sistema: "
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Izberite šifrirni ključ datotečnega sistema"
@@ -2118,12 +2168,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Šifrirna ključa se ne ujemata"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Šifrirni ključ"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Šifrirni ključ (ponovno)"
@@ -2237,11 +2282,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Imeti morate priklopljen FAT razdelek na /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formatiranje razdelka %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4674,7 +4714,7 @@ msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4684,7 +4724,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4692,8 +4735,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4713,52 +4756,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4772,9 +4820,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4903,7 +4951,55 @@ msgstr ""
 "Prosimo, da se glede vseh nejasnosti v zvezi s to pogodbo obrnete na "
 "Mandriva S.A.\n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4922,69 +5018,55 @@ msgstr ""
 "patentiranja programske\n"
 " opreme v državi, na katere ozemlju nameravate uporabljati programje."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Opozorilo!\n"
-"\n"
-"Prosimo, da pozorno preberete naslednje pogoje uporabe. Če se z njimi\n"
-" ne strinjate v celoti, programja z naslednje zgoščenke ne smete namestiti.\n"
-"V tem primeru kliknite na gumb 'Zavračam'\n"
-"in namestitev se bo nadaljevala brez programja s te zgoščenke.\n"
-"\n"
-"\n"
-"Nekatere sestavine programja z naslednje zgoščenke niso zaščitene s "
-"Splošnim\n"
-" dovoljenjem GPL ali s sorodnim dovoljenjem.\n"
-"Vsaka takšna sestavina je zaščitena pod pogoji posebnega dovoljenja,\n"
-"Naprošamo vas, da pozorno preberete pogoje vsakega takšnega dovoljenja,\n"
-" preden pričnete uporabljati ali razširjati programje, na katero se nanaša.\n"
-"Navadno takšna dovoljenja prepovedujejo vsako razširjanje, razmnoževanje\n"
-"(razen varnostnih kopij), spreminjanje, prilagajanje ali razstavljanje\n"
-" programja, na katero se nanašajo.\n"
-"Vsakršna kršitev pogodbe o takšnem dovoljenju bi imelo za posledico\n"
-" takojšnje prenehanje vseh pogodbenih pravic.\n"
-"Običajno omenjena dovoljenja dopuščajo namestitev programja\n"
-"na en sam računalnik in prepovedujejo, da bi bilo dostopno v omrežju.\n"
-"Če ste glede obsega pogodbenih pravic v dvomu, se obrnite na\n"
-"lastnika takšnega programja.\n"
-"Razširjanje takšnega programja vključno s pripadajočo dokumentacijo je "
-"običajno prepovedano.\n"
-"\n"
-"\n"
-"Vse pravice industrijske oziroma intelektualne lastnine, ki se nanašajo\n"
-"na programje z naslednje zgoščenke, pripadajo njihovim lastnikom.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6891,6 +6973,70 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Namestitev ni uspela"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Opozorilo!\n"
+#~ "\n"
+#~ "Prosimo, da pozorno preberete naslednje pogoje uporabe. Če se z njimi\n"
+#~ " ne strinjate v celoti, programja z naslednje zgoščenke ne smete "
+#~ "namestiti.\n"
+#~ "V tem primeru kliknite na gumb 'Zavračam'\n"
+#~ "in namestitev se bo nadaljevala brez programja s te zgoščenke.\n"
+#~ "\n"
+#~ "\n"
+#~ "Nekatere sestavine programja z naslednje zgoščenke niso zaščitene s "
+#~ "Splošnim\n"
+#~ " dovoljenjem GPL ali s sorodnim dovoljenjem.\n"
+#~ "Vsaka takšna sestavina je zaščitena pod pogoji posebnega dovoljenja,\n"
+#~ "Naprošamo vas, da pozorno preberete pogoje vsakega takšnega dovoljenja,\n"
+#~ " preden pričnete uporabljati ali razširjati programje, na katero se "
+#~ "nanaša.\n"
+#~ "Navadno takšna dovoljenja prepovedujejo vsako razširjanje, razmnoževanje\n"
+#~ "(razen varnostnih kopij), spreminjanje, prilagajanje ali razstavljanje\n"
+#~ " programja, na katero se nanašajo.\n"
+#~ "Vsakršna kršitev pogodbe o takšnem dovoljenju bi imelo za posledico\n"
+#~ " takojšnje prenehanje vseh pogodbenih pravic.\n"
+#~ "Običajno omenjena dovoljenja dopuščajo namestitev programja\n"
+#~ "na en sam računalnik in prepovedujejo, da bi bilo dostopno v omrežju.\n"
+#~ "Če ste glede obsega pogodbenih pravic v dvomu, se obrnite na\n"
+#~ "lastnika takšnega programja.\n"
+#~ "Razširjanje takšnega programja vključno s pripadajočo dokumentacijo je "
+#~ "običajno prepovedano.\n"
+#~ "\n"
+#~ "\n"
+#~ "Vse pravice industrijske oziroma intelektualne lastnine, ki se nanašajo\n"
+#~ "na programje z naslednje zgoščenke, pripadajo njihovim lastnikom.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Za strežnike uporabi libsafe"
 
diff --git a/perl-install/share/po/sq.po b/perl-install/share/po/sq.po
index 746b0def1..1f7115bf8 100644
--- a/perl-install/share/po/sq.po
+++ b/perl-install/share/po/sq.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX for MDK 9.2\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2004-09-15 13:33+0200\n"
 "Last-Translator: Naim Daka <naim70@freesurf.ch>\n"
 "Language-Team: Albanian <LL@li.org>\n"
@@ -1397,18 +1397,14 @@ msgstr "Zgjedheni një ndarje tjetër"
 msgid "Choose a partition"
 msgstr "Zgjedheni një ndarje"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Kalo në modë normal"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Kalo në modë expert"
+msgid "More"
+msgstr "Më shumë"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "Konfigurimi"
@@ -1458,13 +1454,17 @@ msgstr "Zhduki të gjitha ndarjet"
 msgid "Auto allocate"
 msgstr "Ndarje automatike"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Më shumë"
+msgid "Toggle to normal mode"
+msgstr "Kalo në modë normal"
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Kalo në modë expert"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Informacion mbi diskun e fort (hard drive)"
@@ -1518,7 +1518,12 @@ msgstr "Shto në RAID"
 msgid "Add to LVM"
 msgstr "Shto në LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ID i Përdoruesit"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Zhduke"
@@ -1533,7 +1538,12 @@ msgstr "Zhduke nga RAID"
 msgid "Remove from LVM"
 msgstr "Zhduke nga LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Zhduke nga LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Ndryshoje RAID"
@@ -1708,7 +1718,27 @@ msgstr ""
 "Për të siguruar intergrimin e të dhënave mbasë ndrajes(ve), sistemi\n"
 "verifikues i skedareve do të niset në nisjen tjetër boot mbi Windows(TM)"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Çelës kriptues i sistemit të skedareve"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Zgjedheni çelësin kriptues të sistemit të skedareve"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Çelës kriptues"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Zgjedheni një RAID ekzistues për ta shtuar në"
@@ -1823,7 +1853,12 @@ msgstr ""
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Tabela e ndarjeve %s tani do të shkruhet në diskë"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formatimi i ndarjes %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1957,7 +1992,27 @@ msgstr "Montuar\n"
 msgid "RAID %s\n"
 msgstr "I përketë RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Çelës kriptues"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2061,12 +2116,7 @@ msgstr "Tabelë e ndarjeve të tipit: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "në kanal %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Çelës kriptues i sistemit të skedareve"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Zgjedheni çelësin kriptues të sistemit të skedareve"
@@ -2083,12 +2133,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Çelësat kriptues nuk përputhen"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Çelës kriptues"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Çelës kriptues (vërtetim)"
@@ -2203,11 +2248,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Ju duhet të posedoni një ndarje FAT të montuar në /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formatimi i ndarjes %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4660,7 +4700,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4668,8 +4711,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4689,52 +4732,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4748,9 +4796,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4877,7 +4925,55 @@ msgstr ""
 "Për më shumë pyetje në lidhje me këtë dokument, ju lutemi kontaktone "
 "Mandriva S.A.  \n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4897,70 +4993,55 @@ msgstr ""
 "ështe e mundur të jetë aplikuese tek ju, për këtë duhet ta verifikoni ligjin "
 "lokal."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
-msgstr ""
-"\n"
-"Kujdes\n"
-"\n"
-"Ju lutemi lexone me vëmendje dokumentin e prezentuar. Në rats se nuk\n"
-"pajtoheni me të, ju nuk do jeni i detyruar t'instaloni cd-rom(et)\n"
-"me radhë. Në këtë rast, Klikoni mbi kopsën 'Refuzo' për të vazhduar\n"
-"instalimin pas këto media.\n"
-"\n"
-"\n"
-"Disa prej komponimeve të përmbajtura në CD-met e ardhshme, nuk janë\n"
-"ndër licencat e GPL apo diçka të tillë, që nuk mundëson kopjimin apo\n"
-"ndryshimin e të dhënave. Secili komponent i programeve është i shpërndarë\n"
-"ndër termet e licencës së tij personale. A keni dëshirë që të referoheni\n"
-"dhe ti nënshtroheni para se t'instaloni apo ti shpërndani. Zakonisht, këto\n"
-"licenca nuk autorizojnë kopjimin e (përveq regjistrimit të tyre),\n"
-"shpërdarjeve, dekompilimit, shpërbërjen, inxhinierim të mbrapëm dhe\n"
-"ndryshimin i programeve në të cilët përputhen. Të gjitha kundërshtimet\n"
-"me termet e licencës aplikuese, shtynë kah prishja e kontratës, pa\n"
-"kurrëfar kundërshtimi dhe çfarëdo të drejte tjetër, apo akcioni nga ana e "
-"juaj.\n"
-"Vetëm nëse kushti i licencës, ju autorizon një gjë të tillë, ju nuk mund\n"
-"t'instaloni ato programe, në ndonji kompjuter tjetër (d.m.th vetëm në një\n"
-"kompjuter), apo ti adaptoni programet për një përdorim në rrjet. Rasti\n"
-"i fundit, kontaktoni shpërndarësin (shitësin) e programit për ta pranuar\n"
-"licencën. Shpërndarja e një pjese të kopive të programeve, apo të\n"
-"dokumnetacionit, i cili gjindet në to, nuk lejohet.\n"
-"\n"
-"Të gjitha të drejtat, titujt dhe rëndësit e këtyre programeve janë\n"
-"pronësia në ekskluzivitet të autorëve të tyre, dhe njashtu janë të\n"
-"mbrojtur nga titujt, të drejtat intelektuale, dhe drejtë botimi aplikues\n"
-"i programeve.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
+msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6864,6 +6945,72 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Instalimi dështio"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Kujdes\n"
+#~ "\n"
+#~ "Ju lutemi lexone me vëmendje dokumentin e prezentuar. Në rats se nuk\n"
+#~ "pajtoheni me të, ju nuk do jeni i detyruar t'instaloni cd-rom(et)\n"
+#~ "me radhë. Në këtë rast, Klikoni mbi kopsën 'Refuzo' për të vazhduar\n"
+#~ "instalimin pas këto media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Disa prej komponimeve të përmbajtura në CD-met e ardhshme, nuk janë\n"
+#~ "ndër licencat e GPL apo diçka të tillë, që nuk mundëson kopjimin apo\n"
+#~ "ndryshimin e të dhënave. Secili komponent i programeve është i "
+#~ "shpërndarë\n"
+#~ "ndër termet e licencës së tij personale. A keni dëshirë që të referoheni\n"
+#~ "dhe ti nënshtroheni para se t'instaloni apo ti shpërndani. Zakonisht, "
+#~ "këto\n"
+#~ "licenca nuk autorizojnë kopjimin e (përveq regjistrimit të tyre),\n"
+#~ "shpërdarjeve, dekompilimit, shpërbërjen, inxhinierim të mbrapëm dhe\n"
+#~ "ndryshimin i programeve në të cilët përputhen. Të gjitha kundërshtimet\n"
+#~ "me termet e licencës aplikuese, shtynë kah prishja e kontratës, pa\n"
+#~ "kurrëfar kundërshtimi dhe çfarëdo të drejte tjetër, apo akcioni nga ana e "
+#~ "juaj.\n"
+#~ "Vetëm nëse kushti i licencës, ju autorizon një gjë të tillë, ju nuk mund\n"
+#~ "t'instaloni ato programe, në ndonji kompjuter tjetër (d.m.th vetëm në "
+#~ "një\n"
+#~ "kompjuter), apo ti adaptoni programet për një përdorim në rrjet. Rasti\n"
+#~ "i fundit, kontaktoni shpërndarësin (shitësin) e programit për ta pranuar\n"
+#~ "licencën. Shpërndarja e një pjese të kopive të programeve, apo të\n"
+#~ "dokumnetacionit, i cili gjindet në to, nuk lejohet.\n"
+#~ "\n"
+#~ "Të gjitha të drejtat, titujt dhe rëndësit e këtyre programeve janë\n"
+#~ "pronësia në ekskluzivitet të autorëve të tyre, dhe njashtu janë të\n"
+#~ "mbrojtur nga titujt, të drejtat intelektuale, dhe drejtë botimi aplikues\n"
+#~ "i programeve.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Përdoroje libsafe për server"
 
diff --git a/perl-install/share/po/sr.po b/perl-install/share/po/sr.po
index 4095eb4b3..72df28d5d 100644
--- a/perl-install/share/po/sr.po
+++ b/perl-install/share/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2004-09-15 13:33+0200\n"
 "Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -1392,18 +1392,14 @@ msgstr "Изаберите другу партицију"
 msgid "Choose a partition"
 msgstr "Изаберите партицију"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Пређи на нормални мод"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Пређи на експерт мод"
+msgid "More"
+msgstr "Још"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Потврђивање"
@@ -1451,13 +1447,17 @@ msgstr "Очисти све"
 msgid "Auto allocate"
 msgstr "Ауто дислоцирање"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Још"
+msgid "Toggle to normal mode"
+msgstr "Пређи на нормални мод"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Пређи на експерт мод"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Информације о хард диску"
@@ -1511,7 +1511,12 @@ msgstr "Додај на RAID"
 msgid "Add to LVM"
 msgstr "Додај на LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Корисников ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Обриши"
@@ -1526,7 +1531,12 @@ msgstr "Уклони са RAID-а"
 msgid "Remove from LVM"
 msgstr "Уклони са LVM-а"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Уклони са LVM-а"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Промени RAID"
@@ -1700,7 +1710,27 @@ msgstr ""
 "провера фајл система ће бити покренута када се следећи пут улогујете у "
 "Windows(TM)"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Кључ за енкрипцију фајл система"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Изаберите кључ за енкрипцију фајл система"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Кључ за енкрипцију"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Изабери постојећи RAID за додавање"
@@ -1812,7 +1842,12 @@ msgstr "Морате рестартовати рачунар да би се из
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Табела партиција за уређај %s ће бити записана на диск"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Форматирање партиције %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1945,7 +1980,27 @@ msgstr "Монтирано\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Кључ за енкрипцију"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2049,12 +2104,7 @@ msgstr "Тип табеле партиција: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "на каналу %d ID %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Кључ за енкрипцију фајл система"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Изаберите кључ за енкрипцију фајл система"
@@ -2071,12 +2121,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Неподударност енкрипционих кључева (лозинки)"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Кључ за енкрипцију"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Кључ за енкрипцију (поново)"
@@ -2192,11 +2237,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Морате имати FAT партицију монтирану у /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Форматирање партиције %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4625,7 +4665,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4633,8 +4676,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4654,52 +4697,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4713,9 +4761,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4849,7 +4897,55 @@ msgstr ""
 "За било које питање које је везано за овај документ, контактирајте  Mandriva "
 "S.A.  \n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4861,72 +4957,55 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Упозорење !\n"
-"\n"
-"Пажљиво прочитајте доле наведене услове. Уколико се не слажете са било "
-"којим \n"
-"делом, онда немате одобрење за инсталирање следећег CD-а. Притисните "
-"'Одбијам' \n"
-"да би наставили инсталацију без употребе тих CD медија.\n"
-"\n"
-"\n"
-"Неке компоненте садржане у следећим CD медијама нису под\n"
-"GPL Лиценцом или сличним уговорима. Свака таква компонента је онда "
-"условљена\n"
-"условима и уговорима сопстевене линценце. \n"
-"Пажљиво прочитајте и упознајте се са таквим специфичним лиценцама пре \n"
-"него уотребите или редистрибуирате поменуте компоненте. \n"
-"Такве лиценце ће у главном забрањивати трансфер, копирање \n"
-"(осим за сврху backup-а података), редисрибуцију, нахнадну промену, \n"
-"растављање, де-компајлирање или мењање компоненти. \n"
-"Било који део уговора који није испоштован истовремено уклања и остала ваша "
-"права\n"
-"у датој лиценци. Уколико вам одређена лиценца не гарантује таква\n"
-"права, обично не можете инсталирати програме на више од једаног\n"
-"аиатема, или их прилагодити да се могу користити на мрежи. Уколико сте у "
-"дилеми, молимо вас да директно \n"
-"контактирате дистрибутера или едитора компоненте. \n"
-"Пренос на треће програме или копирање таквих компоненти укључујући и\n"
-"документацију је обично забрањен.\n"
-"\n"
-"\n"
-"Сва права на компоненте на следећим CD медијама припадају њиховим \n"
-"респектативним ауторима и заштићене су законима о интелектуаној својини и \n"
-"правима који се примењују на софтверске програме.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6915,6 +6994,72 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Инсталација није успела"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Упозорење !\n"
+#~ "\n"
+#~ "Пажљиво прочитајте доле наведене услове. Уколико се не слажете са било "
+#~ "којим \n"
+#~ "делом, онда немате одобрење за инсталирање следећег CD-а. Притисните "
+#~ "'Одбијам' \n"
+#~ "да би наставили инсталацију без употребе тих CD медија.\n"
+#~ "\n"
+#~ "\n"
+#~ "Неке компоненте садржане у следећим CD медијама нису под\n"
+#~ "GPL Лиценцом или сличним уговорима. Свака таква компонента је онда "
+#~ "условљена\n"
+#~ "условима и уговорима сопстевене линценце. \n"
+#~ "Пажљиво прочитајте и упознајте се са таквим специфичним лиценцама пре \n"
+#~ "него уотребите или редистрибуирате поменуте компоненте. \n"
+#~ "Такве лиценце ће у главном забрањивати трансфер, копирање \n"
+#~ "(осим за сврху backup-а података), редисрибуцију, нахнадну промену, \n"
+#~ "растављање, де-компајлирање или мењање компоненти. \n"
+#~ "Било који део уговора који није испоштован истовремено уклања и остала "
+#~ "ваша права\n"
+#~ "у датој лиценци. Уколико вам одређена лиценца не гарантује таква\n"
+#~ "права, обично не можете инсталирати програме на више од једаног\n"
+#~ "аиатема, или их прилагодити да се могу користити на мрежи. Уколико сте у "
+#~ "дилеми, молимо вас да директно \n"
+#~ "контактирате дистрибутера или едитора компоненте. \n"
+#~ "Пренос на треће програме или копирање таквих компоненти укључујући и\n"
+#~ "документацију је обично забрањен.\n"
+#~ "\n"
+#~ "\n"
+#~ "Сва права на компоненте на следећим CD медијама припадају њиховим \n"
+#~ "респектативним ауторима и заштићене су законима о интелектуаној својини "
+#~ "и \n"
+#~ "правима који се примењују на софтверске програме.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Користи libsafe за сервере"
 
diff --git a/perl-install/share/po/sr@Latn.po b/perl-install/share/po/sr@Latn.po
index 73506f1c6..a1e74e4bc 100644
--- a/perl-install/share/po/sr@Latn.po
+++ b/perl-install/share/po/sr@Latn.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2004-09-15 13:34+0200\n"
 "Last-Translator: Toma Jankovic_<tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -1392,18 +1392,14 @@ msgstr "Izaberite drugu particiju"
 msgid "Choose a partition"
 msgstr "Izaberite particiju"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Pređi na normalni mod"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Pređi na ekspert mod"
+msgid "More"
+msgstr "Još"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Potvrđivanje"
@@ -1451,13 +1447,17 @@ msgstr "Očisti sve"
 msgid "Auto allocate"
 msgstr "Auto dislociranje"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Još"
+msgid "Toggle to normal mode"
+msgstr "Pređi na normalni mod"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Pređi na ekspert mod"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Informacije o hard disku"
@@ -1511,7 +1511,12 @@ msgstr "Dodaj na RAID"
 msgid "Add to LVM"
 msgstr "Dodaj na LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Korisnikov ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Obriši"
@@ -1526,7 +1531,12 @@ msgstr "Ukloni sa RAID-a"
 msgid "Remove from LVM"
 msgstr "Ukloni sa LVM-a"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Ukloni sa LVM-a"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Promeni RAID"
@@ -1700,7 +1710,27 @@ msgstr ""
 "provera fajl sistema će biti pokrenuta kada se sledeći put ulogujete u "
 "Windows(TM)"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Ključ za enkripciju fajl sistema"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Izaberite ključ za enkripciju fajl sistema"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Ključ za enkripciju"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Izaberi postojeći RAID za dodavanje"
@@ -1812,7 +1842,12 @@ msgstr "Morate restartovati računar da bi se izmene izvršile"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Tabela particija za uređaj %s će biti zapisana na disk"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formatiranje particije %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1946,7 +1981,27 @@ msgstr "Montirano\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Ključ za enkripciju"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2050,12 +2105,7 @@ msgstr "Tip tabele particija: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "na kanalu %d ID %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Ključ za enkripciju fajl sistema"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Izaberite ključ za enkripciju fajl sistema"
@@ -2072,12 +2122,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Nepodudarnost enkripcionih ključeva (lozinki)"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Ključ za enkripciju"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Ključ za enkripciju (ponovo)"
@@ -2193,11 +2238,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Morate imati FAT particiju montiranu u /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formatiranje particije %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4626,7 +4666,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4634,8 +4677,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4655,52 +4698,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4714,9 +4762,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4850,7 +4898,55 @@ msgstr ""
 "Za bilo koje pitanje koje je vezano za ovaj dokument, kontaktirajte  "
 "Mandriva S.A.  \n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4862,72 +4958,55 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Upozorenje !\n"
-"\n"
-"Pažljivo pročitajte dole navedene uslove. Ukoliko se ne slažete sa bilo "
-"kojim \n"
-"delom, onda nemate odobrenje za instaliranje sledećeg CD-a. Pritisnite "
-"'Odbijam' \n"
-"da bi nastavili instalaciju bez upotrebe tih CD medija.\n"
-"\n"
-"\n"
-"Neke komponente sadržane u sledećim CD medijama nisu pod\n"
-"GPL Licencom ili sličnim ugovorima. Svaka takva komponenta je onda "
-"uslovljena\n"
-"uslovima i ugovorima sopstevene lincence. \n"
-"Pažljivo pročitajte i upoznajte se sa takvim specifičnim licencama pre \n"
-"nego uotrebite ili redistribuirate pomenute komponente. \n"
-"Takve licence će u glavnom zabranjivati transfer, kopiranje \n"
-"(osim za svrhu backup-a podataka), redisribuciju, nahnadnu promenu, \n"
-"rastavljanje, de-kompajliranje ili menjanje komponenti. \n"
-"Bilo koji deo ugovora koji nije ispoštovan istovremeno uklanja i ostala vaša "
-"prava\n"
-"u datoj licenci. Ukoliko vam određena licenca ne garantuje takva\n"
-"prava, obično ne možete instalirati programe na više od jedanog\n"
-"aiatema, ili ih prilagoditi da se mogu koristiti na mreži. Ukoliko ste u "
-"dilemi, molimo vas da direktno \n"
-"kontaktirate distributera ili editora komponente. \n"
-"Prenos na treće programe ili kopiranje takvih komponenti uključujući i\n"
-"dokumentaciju je obično zabranjen.\n"
-"\n"
-"\n"
-"Sva prava na komponente na sledećim CD medijama pripadaju njihovim \n"
-"respektativnim autorima i zaštićene su zakonima o intelektuanoj svojini i \n"
-"pravima koji se primenjuju na softverske programe.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6920,6 +6999,72 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Instalacija nije uspela"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Upozorenje !\n"
+#~ "\n"
+#~ "Pažljivo pročitajte dole navedene uslove. Ukoliko se ne slažete sa bilo "
+#~ "kojim \n"
+#~ "delom, onda nemate odobrenje za instaliranje sledećeg CD-a. Pritisnite "
+#~ "'Odbijam' \n"
+#~ "da bi nastavili instalaciju bez upotrebe tih CD medija.\n"
+#~ "\n"
+#~ "\n"
+#~ "Neke komponente sadržane u sledećim CD medijama nisu pod\n"
+#~ "GPL Licencom ili sličnim ugovorima. Svaka takva komponenta je onda "
+#~ "uslovljena\n"
+#~ "uslovima i ugovorima sopstevene lincence. \n"
+#~ "Pažljivo pročitajte i upoznajte se sa takvim specifičnim licencama pre \n"
+#~ "nego uotrebite ili redistribuirate pomenute komponente. \n"
+#~ "Takve licence će u glavnom zabranjivati transfer, kopiranje \n"
+#~ "(osim za svrhu backup-a podataka), redisribuciju, nahnadnu promenu, \n"
+#~ "rastavljanje, de-kompajliranje ili menjanje komponenti. \n"
+#~ "Bilo koji deo ugovora koji nije ispoštovan istovremeno uklanja i ostala "
+#~ "vaša prava\n"
+#~ "u datoj licenci. Ukoliko vam određena licenca ne garantuje takva\n"
+#~ "prava, obično ne možete instalirati programe na više od jedanog\n"
+#~ "aiatema, ili ih prilagoditi da se mogu koristiti na mreži. Ukoliko ste u "
+#~ "dilemi, molimo vas da direktno \n"
+#~ "kontaktirate distributera ili editora komponente. \n"
+#~ "Prenos na treće programe ili kopiranje takvih komponenti uključujući i\n"
+#~ "dokumentaciju je obično zabranjen.\n"
+#~ "\n"
+#~ "\n"
+#~ "Sva prava na komponente na sledećim CD medijama pripadaju njihovim \n"
+#~ "respektativnim autorima i zaštićene su zakonima o intelektuanoj svojini "
+#~ "i \n"
+#~ "pravima koji se primenjuju na softverske programe.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Koristi libsafe za servere"
 
diff --git a/perl-install/share/po/sv.po b/perl-install/share/po/sv.po
index 6ca35cf0e..0b4794660 100644
--- a/perl-install/share/po/sv.po
+++ b/perl-install/share/po/sv.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libDrakX-sv\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-09-07 03:04+0300\n"
 "Last-Translator: Thomas Backlund <tmb@mandriva.org>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -1426,18 +1426,14 @@ msgstr "Välj en annan partition"
 msgid "Choose a partition"
 msgstr "Välj en partition"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Byt till normalläge"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Byt till expertläge"
+msgid "More"
+msgstr "Mer"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Bekräftelse"
@@ -1490,13 +1486,17 @@ msgstr "Nollställ"
 msgid "Auto allocate"
 msgstr "Allokera automatiskt"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Mer"
+msgid "Toggle to normal mode"
+msgstr "Byt till normalläge"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Byt till expertläge"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Information om hårddisk"
@@ -1550,7 +1550,12 @@ msgstr "Addera till RAID"
 msgid "Add to LVM"
 msgstr "Addera till LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Användar-id"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Ta bort"
@@ -1565,7 +1570,12 @@ msgstr "Ta bort från RAID"
 msgid "Remove from LVM"
 msgstr "Ta bort från LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Ta bort från LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Ändra RAID"
@@ -1740,7 +1750,27 @@ msgstr ""
 "För att säkerställa dataintegritet efter storleksändring av partitioner \n"
 "kommer filsystemskontroller att köras vid nästa Windows(TM)-start."
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Krypteringsnyckel för filsystem"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Välj krypteringsnyckel för filsystemet"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Krypteringsnyckel"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Välj en existerande RAID att addera till"
@@ -1854,7 +1884,12 @@ msgstr "Du behöver starta om datorn innan ändringarna kan verkställas."
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Partitionstabellen på disk %s kommer att skrivas till disk."
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formaterar partition %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1994,7 +2029,27 @@ msgstr "Monterad\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Krypteringsnyckel"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2098,12 +2153,7 @@ msgstr "Partitionstabellstyp: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "på kanal %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Krypteringsnyckel för filsystem"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Välj krypteringsnyckel för filsystemet"
@@ -2119,12 +2169,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Krypteringsnycklarna matchar inte"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Krypteringsnyckel"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Krypteringsnyckel (igen)"
@@ -2239,11 +2284,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Du måste ha en FAT-partition monterad i /boot/efi."
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formaterar partition %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4683,7 +4723,7 @@ msgstr "Starthanteraren kan inte hantera /boot på flera fysiska volymer"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4693,7 +4733,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4701,8 +4744,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4722,52 +4765,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4781,9 +4829,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4905,7 +4953,55 @@ msgstr ""
 " För alla frågor rörande denna text, kontakta Mandriva\n"
 "S.A.\n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4924,67 +5020,55 @@ msgstr ""
 "gällande lagstiftning,\n"
 "Lagstiftningen kring mjukvarupatent är under omarbetande inom EU."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Varning\n"
-"\n"
-"Läs reglerna nedan noga. Om du inte godkänner dem, får du\n"
-"inte installera program från nästa cd. Klicka på Accepterar inte för att\n"
-"fortsätta installationen utan programmen från nästa cd.\n"
-"\n"
-"\n"
-"Några av komponenterna på nästa cd är inte licensierade under GPL\n"
-"eller någon liknande licens. Varje sådan komponent är i stället\n"
-"licensierad under sitt eget licensavtal. Läs och godkänn varje\n"
-"enskild sådan licens före användning eller distribuering av dessa\n"
-"komponenter. De flesta av dessa licenser förbjuder överföring,\n"
-"kopiering (utom för säkerhetskopieringsändamål), distribuering samt "
-"modifiering av\n"
-"komponenten. Alla brott mot reglerna under någon av dessa licenser,\n"
-"förverkar omedelbart dina rättigheter under licensen i fråga. Utom i\n"
-"de fall licensen för en komponent uttryckligen ger dig den rättigheten,\n"
-"får du inte installera komponenten på mer än ett system, eller för\n"
-"användning på ett nätverk. Om du är osäker, kontakta\n"
-"tillverkaren av komponenten i fråga. Kopiering till tredje part av\n"
-"sådana komponenter, inkluderat deras dokumentation, är normalt sett\n"
-"förbjuden.\n"
-"\n"
-"\n"
-"Alla rättigheter till komponenterna på nästa cd tillhör deras\n"
-"respektive upphovsmän, och är skyddade av\n"
-"imaterialrätt/copyright-lagstiftning som kan appliceras på mjukvara.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6887,6 +6971,66 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Installationen misslyckades"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Varning\n"
+#~ "\n"
+#~ "Läs reglerna nedan noga. Om du inte godkänner dem, får du\n"
+#~ "inte installera program från nästa cd. Klicka på Accepterar inte för att\n"
+#~ "fortsätta installationen utan programmen från nästa cd.\n"
+#~ "\n"
+#~ "\n"
+#~ "Några av komponenterna på nästa cd är inte licensierade under GPL\n"
+#~ "eller någon liknande licens. Varje sådan komponent är i stället\n"
+#~ "licensierad under sitt eget licensavtal. Läs och godkänn varje\n"
+#~ "enskild sådan licens före användning eller distribuering av dessa\n"
+#~ "komponenter. De flesta av dessa licenser förbjuder överföring,\n"
+#~ "kopiering (utom för säkerhetskopieringsändamål), distribuering samt "
+#~ "modifiering av\n"
+#~ "komponenten. Alla brott mot reglerna under någon av dessa licenser,\n"
+#~ "förverkar omedelbart dina rättigheter under licensen i fråga. Utom i\n"
+#~ "de fall licensen för en komponent uttryckligen ger dig den rättigheten,\n"
+#~ "får du inte installera komponenten på mer än ett system, eller för\n"
+#~ "användning på ett nätverk. Om du är osäker, kontakta\n"
+#~ "tillverkaren av komponenten i fråga. Kopiering till tredje part av\n"
+#~ "sådana komponenter, inkluderat deras dokumentation, är normalt sett\n"
+#~ "förbjuden.\n"
+#~ "\n"
+#~ "\n"
+#~ "Alla rättigheter till komponenterna på nästa cd tillhör deras\n"
+#~ "respektive upphovsmän, och är skyddade av\n"
+#~ "imaterialrätt/copyright-lagstiftning som kan appliceras på mjukvara.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Använd \"libsafe\" för servrar"
 
diff --git a/perl-install/share/po/ta.po b/perl-install/share/po/ta.po
index 5c36fe81d..c619aeb50 100644
--- a/perl-install/share/po/ta.po
+++ b/perl-install/share/po/ta.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX 1.0\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2002-09-06 00:35+0800\n"
 "Last-Translator: prabu anand <prabu_anand2000@yahoo.com>\n"
 "Language-Team: Tamil <tamilinix@yahoogroups.com>\n"
@@ -1391,18 +1391,14 @@ msgstr "வேறு வகிர் ஒன்றை தேர்வுச் �
 msgid "Choose a partition"
 msgstr "வகிர் ஒன்றை தேர்வுச் செய்"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "சாதாரனர் முறைமைக்கு மாறு"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "அறிஞர் முறைமைக்கு மாறு"
+msgid "More"
+msgstr "மேலும்"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "வடிவமைப்புகள்"
@@ -1450,13 +1446,17 @@ msgstr "அனைத்ைதயும் மாற்றியமை"
 msgid "Auto allocate"
 msgstr "தானியக்க வகுத்தல்"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "மேலும்"
+msgid "Toggle to normal mode"
+msgstr "சாதாரனர் முறைமைக்கு மாறு"
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "அறிஞர் முறைமைக்கு மாறு"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "வன்தட்ைட பற்றிய தகவல்"
@@ -1510,7 +1510,12 @@ msgstr "RAID உடன் சேர்"
 msgid "Add to LVM"
 msgstr "LVM உடன் சேர்"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "உபயோகிப்பாளர் அடையாளம்"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "நீக்கு"
@@ -1525,7 +1530,12 @@ msgstr "RAID இருந்து நீக்கு"
 msgid "Remove from LVM"
 msgstr "LVM இருந்து நீக்கு"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "LVM இருந்து நீக்கு"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "RAID மாற்று"
@@ -1694,7 +1704,27 @@ msgid ""
 "filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "கோப்பமைப்பு மறைக்குறியீட்டுச் சாவி"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "உங்கள் கோப்பமைப்புக்கு மறைக்குறியீட்டுச் சாவியை தேர்வுச் செய்"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "மறைக்குறியீட்டுச் சாவி"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "ஏற்கனவே இருக்கும் RAID உடன் சேர்"
@@ -1806,7 +1836,12 @@ msgstr "நீங்கள் செய்த மாற்றங்கள் வ
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "%s வட்டின் வகிர் அமைப்பு தட்டில் எழுதப்படவுள்ளது"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "%s வகிர் வடிவூட்டப்படுகிறது"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1940,7 +1975,27 @@ msgstr "ஏற்றப்பட்டுள்ளது\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "மறைக்குறியீட்டுச் சாவி"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2044,12 +2099,7 @@ msgstr "வகிர் அமைப்பின் வகை: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "%d தடத்தில் %d உள்ளது\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "கோப்பமைப்பு மறைக்குறியீட்டுச் சாவி"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "உங்கள் கோப்பமைப்புக்கு மறைக்குறியீட்டுச் சாவியை தேர்வுச் செய்"
@@ -2064,12 +2114,7 @@ msgstr "இந்த மறைக்குறியீட்டுச் சா�
 msgid "The encryption keys do not match"
 msgstr "மறைக்குறியீட்டுச் சாவிகள் இரண்டும் ஒன்றாக இல்ைல"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "மறைக்குறியீட்டுச் சாவி"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "மறைக்குறியீட்டுச் சாவி(மீண்டும்)"
@@ -2180,11 +2225,6 @@ msgstr "பிழை நேர்ந்துள்ளது -உங்கள்
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "FAT வடிவூட்டப்பட்ட வகிர் /boot/efi என்ற இடத்தில் ஏற்றப்பட வேண்டும்"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "%s வகிர் வடிவூட்டப்படுகிறது"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4534,7 +4574,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4542,8 +4585,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4563,52 +4606,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4622,9 +4670,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4763,7 +4811,55 @@ msgstr ""
 "Paris - France.\n"
 "For any question on this document, please contact Mandriva S.A.  \n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4775,48 +4871,55 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
+#: messages.pm:123
 #, c-format
 msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
 "\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
 "\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
 "\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
 "\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"எச்சரிக்ைக\n"
-"\n"
-"பின்வரும் விவரங்களை கவனமாக படிக்கவும். இதில் உங்களுக்கு\n"
-"உடன்பாடு இல்ைலயென்றால் அடுத்து வரும்\n"
-"சிடியை நிறுவ கூடாது\n"
-"\n"
-"\n"
-"அடுத்து வரும் சிடியில் சில நிரல்கள் GPL உரிமைப்படி இல்ைல\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6468,6 +6571,47 @@ msgstr ""
 msgid "Installation failed"
 msgstr "நிறுவுதலில் பிழை நேர்ந்துள்ளது"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "எச்சரிக்ைக\n"
+#~ "\n"
+#~ "பின்வரும் விவரங்களை கவனமாக படிக்கவும். இதில் உங்களுக்கு\n"
+#~ "உடன்பாடு இல்ைலயென்றால் அடுத்து வரும்\n"
+#~ "சிடியை நிறுவ கூடாது\n"
+#~ "\n"
+#~ "\n"
+#~ "அடுத்து வரும் சிடியில் சில நிரல்கள் GPL உரிமைப்படி இல்ைல\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "libsafe என்ற நூலகநிரலை  பரிமாறிகளில் பயன்படுத்துங்கள்"
 
diff --git a/perl-install/share/po/tg.po b/perl-install/share/po/tg.po
index 4b44aeaa2..2f97f0b60 100644
--- a/perl-install/share/po/tg.po
+++ b/perl-install/share/po/tg.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-tg\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2005-09-17 16:03+0500\n"
 "Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n"
 "Language-Team: Tajik\n"
@@ -1436,18 +1436,14 @@ msgstr "Дигар бахшро интихоб кунед"
 msgid "Choose a partition"
 msgstr "Бахшро интихоб кунед"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Зомин ба усули мӯътадил"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Зомин ба усули мутахассис"
+msgid "More"
+msgstr "Зиёдтар"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "Батанзимдарорӣ"
@@ -1501,13 +1497,17 @@ msgstr "Тоза кардани ҳамааш"
 msgid "Auto allocate"
 msgstr "Худ ғунҷонӣ"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Зиёдтар"
+msgid "Toggle to normal mode"
+msgstr "Зомин ба усули мӯътадил"
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Зомин ба усули мутахассис"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Маълумоти сахтгардон"
@@ -1561,7 +1561,12 @@ msgstr "Илова ба RAID"
 msgid "Add to LVM"
 msgstr "Илова ба LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Корванди ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Нобуд кардан"
@@ -1576,7 +1581,12 @@ msgstr "Хориҷ аз RAID"
 msgid "Remove from LVM"
 msgstr "Хориҷ аз LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Хориҷ аз LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Ивази RAID"
@@ -1748,7 +1758,27 @@ msgstr ""
 "санҷиши системи файлӣ ҳангоми худборшавии навбатӣ дар Windows(TM) корандозӣ "
 "хоҳад гардид"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Калиди рамздоштаи Файлсистем"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Калиди ба рамздарории системи файлии худро интихоб намоед"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Калиди Encryption"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Барои илова RAID-и вуҷуддоштаро интихоб кунед"
@@ -1861,7 +1891,12 @@ msgstr "Пеш аз ҷой гирифтани таъғирёбиҳо шумо б
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Ҷадвали бахши гардони %s дар диск навишта мешавад"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Шаклбандии бахши %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Баъди шаклбандии бахши  %s, ҳама додаҳо дар ин қисм гум хоҳад шуд"
@@ -1993,7 +2028,27 @@ msgstr "Васл шуда\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Калиди Encryption"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2097,12 +2152,7 @@ msgstr "Навъи ҷадвали бахшҳо: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "дар канали %d шиносномаи %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Калиди рамздоштаи Файлсистем"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Калиди ба рамздарории системи файлии худро интихоб намоед"
@@ -2119,12 +2169,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Калидҳои рамздошта мувофиқ нестанд"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Калиди Encryption"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Калиди Encryption (боз)"
@@ -2243,11 +2288,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Шояд шумо қисми FAT-ро дошта бошед, ки дар /boot/efi васл шудааст"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Шаклбандии бахши %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4693,7 +4733,7 @@ msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4703,7 +4743,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4711,8 +4754,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4732,52 +4775,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4791,9 +4839,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4911,7 +4959,55 @@ msgstr ""
 "вопросам, касающимся этого документа, пожалуйста, свяжитесь\n"
 "с Mandriva S.A.\n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4932,74 +5028,55 @@ msgstr ""
 "онгоҳ\n"
 "онро бо қонунҳо маҳаллии худ муқоиса намоед."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
-msgstr ""
-"\n"
-"Огоҳӣ\n"
-"\n"
-"Лутфан бо диққат шартҳои дар поён овардашударо хонед. Агар шумо бо яке аз\n"
-"қисмҳои он розӣ набошед, онгоҳ ба шумо иҷозат дода намешавад, то ки шумо "
-"расонаи\n"
-"навбатии CD-ро кор гузоред. Ба 'Рад кардан' ангушт занед, то ки коргузории "
-"онро бе\n"
-"расонаи мазкур давом диҳед.\n"
-"\n"
-"\n"
-"Якчанд қисматҳои дар CD-и навбатӣ мавҷуд буда бо Лисензияи GPL ё ин ки бо\n"
-"созишномаҳои монанд маҳдуд намешавад. Ҳар яки қисмати мазкур бо шартҳои\n"
-"созишномаи лисензионии худ маҳдуд аст. Лутфан бо диққат қоидаҳои "
-"созишномаҳои\n"
-"лисензионии махсусро пеш аз истифода ва паҳни навбатии қисматҳои\n"
-"гуфташуда хонед ва риоя намоед. \n"
-"Чунин созишномаҳои лисензионӣ асосан супоридан, нусхабардорӣ (ба ғайр аз\n"
-"офаридани нусхаҳои эҳтиётӣ), паҳни навбатӣ, коркарди баръакс ва тағироти\n"
-"қисматро пешгирӣ хоҳад кард.\n"
-"Риоя накардани созишнома боиси ба таври фаврӣ бекор кардани ҳуқуқи шумо ба\n"
-"лисензияи мазкур мегардад. То он даме ки созишномаи муаяйни лисензионӣ ба "
-"шумо\n"
-"ин ҳуқуқҳоро намедиҳад, шумо наметавонед, ки барномаҳоро зиёда барои\n"
-"як систем кор гузоред ё ин ки онҳоро барои истифодаи шабакавӣ равона "
-"намоед.\n"
-"Агар шубҳа намоед, онгоҳ бевосита бо паҳнкунанда ё таҳриргари ин қисмат дар\n"
-"тамос бошед \n"
-"Супоридани қисматҳои мазкур ба ашхоси сеюм ё нусхабардории онҳо, инчунин\n"
-"ҳуҷҷатҳо одатан манъ карда мешавад.\n"
-"\n"
-"\n"
-"Ҳамаи ҳуқуқҳо ба қисматҳои расонаи навбатии CD ба муаллифони бевоситаи онҳо\n"
-"мансубанд ва бо қонунҳои моликияти фикрӣ нисбати таъминоти барномавӣ ҳимоя\n"
-"мегарданд.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
+msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6972,6 +7049,79 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Коргузорӣ бо нокомӣ анҷомид"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Огоҳӣ\n"
+#~ "\n"
+#~ "Лутфан бо диққат шартҳои дар поён овардашударо хонед. Агар шумо бо яке "
+#~ "аз\n"
+#~ "қисмҳои он розӣ набошед, онгоҳ ба шумо иҷозат дода намешавад, то ки шумо "
+#~ "расонаи\n"
+#~ "навбатии CD-ро кор гузоред. Ба 'Рад кардан' ангушт занед, то ки "
+#~ "коргузории онро бе\n"
+#~ "расонаи мазкур давом диҳед.\n"
+#~ "\n"
+#~ "\n"
+#~ "Якчанд қисматҳои дар CD-и навбатӣ мавҷуд буда бо Лисензияи GPL ё ин ки "
+#~ "бо\n"
+#~ "созишномаҳои монанд маҳдуд намешавад. Ҳар яки қисмати мазкур бо шартҳои\n"
+#~ "созишномаи лисензионии худ маҳдуд аст. Лутфан бо диққат қоидаҳои "
+#~ "созишномаҳои\n"
+#~ "лисензионии махсусро пеш аз истифода ва паҳни навбатии қисматҳои\n"
+#~ "гуфташуда хонед ва риоя намоед. \n"
+#~ "Чунин созишномаҳои лисензионӣ асосан супоридан, нусхабардорӣ (ба ғайр аз\n"
+#~ "офаридани нусхаҳои эҳтиётӣ), паҳни навбатӣ, коркарди баръакс ва тағироти\n"
+#~ "қисматро пешгирӣ хоҳад кард.\n"
+#~ "Риоя накардани созишнома боиси ба таври фаврӣ бекор кардани ҳуқуқи шумо "
+#~ "ба\n"
+#~ "лисензияи мазкур мегардад. То он даме ки созишномаи муаяйни лисензионӣ ба "
+#~ "шумо\n"
+#~ "ин ҳуқуқҳоро намедиҳад, шумо наметавонед, ки барномаҳоро зиёда барои\n"
+#~ "як систем кор гузоред ё ин ки онҳоро барои истифодаи шабакавӣ равона "
+#~ "намоед.\n"
+#~ "Агар шубҳа намоед, онгоҳ бевосита бо паҳнкунанда ё таҳриргари ин қисмат "
+#~ "дар\n"
+#~ "тамос бошед \n"
+#~ "Супоридани қисматҳои мазкур ба ашхоси сеюм ё нусхабардории онҳо, инчунин\n"
+#~ "ҳуҷҷатҳо одатан манъ карда мешавад.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ҳамаи ҳуқуқҳо ба қисматҳои расонаи навбатии CD ба муаллифони бевоситаи "
+#~ "онҳо\n"
+#~ "мансубанд ва бо қонунҳои моликияти фикрӣ нисбати таъминоти барномавӣ "
+#~ "ҳимоя\n"
+#~ "мегарданд.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Барои хидматрасонҳо libsafe-ро истифода намудан"
 
diff --git a/perl-install/share/po/th.po b/perl-install/share/po/th.po
index 058c323b9..979af704b 100644
--- a/perl-install/share/po/th.po
+++ b/perl-install/share/po/th.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2001-09-10 14:24GMT+7\n"
 "Last-Translator: Wachara Chinsettawong <wachara@yahoo.com>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -1363,18 +1363,14 @@ msgstr "สร้างพาร์ติชั่นใหม่"
 msgid "Choose a partition"
 msgstr "เลือกกิจกรรม"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "สำหรับผู้ชำนาญ > ปกติ"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "ปกติ > สำหรับผู้ชำนาญ"
+msgid "More"
+msgstr "More"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "ปรับแต่งค่า"
@@ -1422,13 +1418,17 @@ msgstr "ล้างทั้งหมด"
 msgid "Auto allocate"
 msgstr "กำหนดแบบอัตโนมัติ"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "More"
+msgid "Toggle to normal mode"
+msgstr "สำหรับผู้ชำนาญ > ปกติ"
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "ปกติ > สำหรับผู้ชำนาญ"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, fuzzy, c-format
 msgid "Hard drive information"
 msgstr "การตรวจหาฮาร์ดไดรว์"
@@ -1482,7 +1482,12 @@ msgstr "เพิ่มให้ RAID"
 msgid "Add to LVM"
 msgstr "เพิ่มให้ LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "รหัสผู้ใช้"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "ลบ"
@@ -1497,7 +1502,12 @@ msgstr "ลบออกจาก RAID"
 msgid "Remove from LVM"
 msgstr "ลบออกจาก LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "ลบออกจาก LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "แก้ไข RAID"
@@ -1663,7 +1673,27 @@ msgid ""
 "filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, fuzzy, c-format
+msgid "Filesystem encryption key"
+msgstr "ประเภทของระบบไฟล์: "
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "ประเภทของระบบไฟล์: "
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr ""
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "เลือก RAID เพื่อเพิ่มเข้าไป"
@@ -1775,7 +1805,12 @@ msgstr "คุณจะต้องทำการรีบูตระบบก
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "ตารางพาร์ติชั่นของไดรฟ์ %s จะถูกบันทึกลงไปในดิสก์"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "ฟอร์แมตพาร์ติชั่น %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "หลังจาก format พาร์ติชั่น %s ข้อมูลทั้งหมดในพาร์ติชั่นนี้จะถูกลบทิ้ง"
@@ -1907,7 +1942,27 @@ msgstr "เม้าท์\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid "Encrypted"
+msgstr ""
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, fuzzy, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2009,12 +2064,7 @@ msgstr "ชนิดตารางพาร์ติชั่น: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "บนบัส %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, fuzzy, c-format
-msgid "Filesystem encryption key"
-msgstr "ประเภทของระบบไฟล์: "
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr ""
@@ -2029,12 +2079,7 @@ msgstr "รหัสลับง่ายเกินไป (ต้องมี�
 msgid "The encryption keys do not match"
 msgstr "รหัสผ่านไม่เหมือนกัน"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr ""
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr ""
@@ -2149,11 +2194,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "คุณจะต้องมีพาร์ติชั่นสวอป"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "ฟอร์แมตพาร์ติชั่น %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4493,7 +4533,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4501,8 +4544,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4522,52 +4565,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4581,9 +4629,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4721,7 +4769,55 @@ msgstr ""
 "Paris - France.\n"
 "For any question on this document, please contact Mandriva S.A.  \n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4733,38 +4829,54 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
+#: messages.pm:123
 #, c-format
 msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
 "\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
 "\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
 "\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
 "\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
diff --git a/perl-install/share/po/tl.po b/perl-install/share/po/tl.po
index 2b1cf7c95..3afef5456 100644
--- a/perl-install/share/po/tl.po
+++ b/perl-install/share/po/tl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-tl\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2004-09-15 13:35+0200\n"
 "Last-Translator: Arys P. Deloso <arys@deloso.org>\n"
 "Language-Team: Filipino <salinpinoy@comitus.net>\n"
@@ -1404,18 +1404,14 @@ msgstr "Pumili ng ibang partisyon"
 msgid "Choose a partition"
 msgstr "Pumili ng partisyon"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Gamitin ang karaniwang paraan"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Gamitin ang bihasang paraan"
+msgid "More"
+msgstr "Marami pa"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "Configuration"
@@ -1465,13 +1461,17 @@ msgstr "Liwanagin lahat"
 msgid "Auto allocate"
 msgstr "Auto allocate"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Marami pa"
+msgid "Toggle to normal mode"
+msgstr "Gamitin ang karaniwang paraan"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Gamitin ang bihasang paraan"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Inpormasyon sa \"hard drive\""
@@ -1525,7 +1525,12 @@ msgstr "Idagdag sa RAID"
 msgid "Add to LVM"
 msgstr "Idagdag sa LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "User ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Tanggalin"
@@ -1540,7 +1545,12 @@ msgstr "Alisin sa RAID"
 msgid "Remove from LVM"
 msgstr "Alisin sa LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Alisin sa LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Baguhin ang RAID"
@@ -1715,7 +1725,27 @@ msgstr ""
 "magsasagawa ng pagsusuri ng filesystem sa susunod ninyong pag-boot sa Windows"
 "(TM)"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "\"Encryption key\" ng filesystem"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Piliin ang \"encryption key\" ng inyong filesystem"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "\"Encryption key\""
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Pumili ng mayroon ng RAID na daragdagan"
@@ -1827,7 +1857,12 @@ msgstr "Kailangan ninyong mag-reboot bago gumana ang mga pagbabago"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Ang \"partition table\" ng drive na %s ay isusulat sa disk"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Fino-format ang partition na %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Matapos i-format ang  partsyon nan %s,lahat ng data nito ay mawawalat"
@@ -1959,7 +1994,27 @@ msgstr "Na-mount\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "\"Encryption key\""
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2064,12 +2119,7 @@ msgstr "Uri ng \"partition table\": %s\n"
 msgid "on channel %d id %d\n"
 msgstr "sa channel %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "\"Encryption key\" ng filesystem"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Piliin ang \"encryption key\" ng inyong filesystem"
@@ -2086,12 +2136,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Ang mga \"encryption key\" ay hindi magkatumbas"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "\"Encryption key\""
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "\"Encryption key\" (ulit)"
@@ -2209,11 +2254,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Dapat mayroon kayong partisyon ng FAT na naka-mount sa /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Fino-format ang partition na %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4666,7 +4706,7 @@ msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4676,7 +4716,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4684,8 +4727,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4705,52 +4748,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4764,9 +4812,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4921,7 +4969,55 @@ msgstr ""
 "Para sa kahit anong katanungan sa dokumentong ito, makipag-alam sa Mandriva "
 "S.A.  \n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4940,70 +5036,55 @@ msgstr ""
 "hindi nakakasiguro kung ang patent ay sumasakop sa inyo, suriin ang inyong\n"
 "mga local na batas."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Babala\n"
-"\n"
-"Pakibasa ng mabuti ang mga nasasaad sa ilalim. Kung kayo ay hindi\n"
-"sumasang-ayon sa kahit anong bahagi, wala kayong pahintulot na i-install\n"
-"ang kasunod na CD media. Pindutin ang 'Tanggihan' para magpatuloy ng\n"
-"pag-i-install na hindi gagamitin ang mga media na ito.\n"
-"\n"
-"\n"
-"Ilang bahagi na nilalaman ng kasunod na CD media ay sakop ng lisensiya\n"
-"ng GPL o mga kahawig na kasunduan. Bawat siyang bahagi ay sakop\n"
-"naman ng mga nasasaad at kondisyon sa kani-kanilang lisensiya. Pakibasa\n"
-"ng mabuti at sumunod sa mga lisensiyang ito bago ninyo gamitin o\n"
-"ikalat ang mga nasabing bahagi. Ang mga lisensiyang ito ay, sa\n"
-"karaniwan, nagpipigil ng paglipat, pagkopya (maliban sa layuning\n"
-"mag-backup), pagpapakalat, pag-reverse engineer, pag-disassemble,\n"
-"pag-decompile o pagbago ng bahagi. Kahit anong paglabag ng\n"
-"kasunduan ay kaaagad na magpapawalang bisa sa inyong mga\n"
-"karapatan sa ilalim ng natatanging lisensiya. Maliban kung ipinagkakaloob\n"
-"ng natatanging lisensiya sa inyo ang gayong mga karapatan, karaniwan\n"
-"ay hindi ninyo maaaring i-install sa mahigit isang sistema, o i-adapt ito\n"
-"para magamit sa network. Kung may alinlangan, makipag-ugnayan sa\n"
-"\"distributor\" o \"editor\" ng bahagi (\"component\"). Ang paglipat sa\n"
-"ibang tao o pagkopya ng gayong mga bahagi pati ang dokumentasyon\n"
-"ay karaniwang ipinagbabawal.\n"
-"\n"
-"\n"
-"Lahat ng mga karapatan sa mga bahagi ng kasunod na CD media ay\n"
-"pag-aari ng kani-kanilang mga may-katha at protektado ng batas ng\n"
-"\"intellectual property\" at \"copyright\" na magagamit sa mga \"software\n"
-"program.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6954,6 +7035,72 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Pag-i-install nabigo"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Babala\n"
+#~ "\n"
+#~ "Pakibasa ng mabuti ang mga nasasaad sa ilalim. Kung kayo ay hindi\n"
+#~ "sumasang-ayon sa kahit anong bahagi, wala kayong pahintulot na i-install\n"
+#~ "ang kasunod na CD media. Pindutin ang 'Tanggihan' para magpatuloy ng\n"
+#~ "pag-i-install na hindi gagamitin ang mga media na ito.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ilang bahagi na nilalaman ng kasunod na CD media ay sakop ng lisensiya\n"
+#~ "ng GPL o mga kahawig na kasunduan. Bawat siyang bahagi ay sakop\n"
+#~ "naman ng mga nasasaad at kondisyon sa kani-kanilang lisensiya. Pakibasa\n"
+#~ "ng mabuti at sumunod sa mga lisensiyang ito bago ninyo gamitin o\n"
+#~ "ikalat ang mga nasabing bahagi. Ang mga lisensiyang ito ay, sa\n"
+#~ "karaniwan, nagpipigil ng paglipat, pagkopya (maliban sa layuning\n"
+#~ "mag-backup), pagpapakalat, pag-reverse engineer, pag-disassemble,\n"
+#~ "pag-decompile o pagbago ng bahagi. Kahit anong paglabag ng\n"
+#~ "kasunduan ay kaaagad na magpapawalang bisa sa inyong mga\n"
+#~ "karapatan sa ilalim ng natatanging lisensiya. Maliban kung "
+#~ "ipinagkakaloob\n"
+#~ "ng natatanging lisensiya sa inyo ang gayong mga karapatan, karaniwan\n"
+#~ "ay hindi ninyo maaaring i-install sa mahigit isang sistema, o i-adapt "
+#~ "ito\n"
+#~ "para magamit sa network. Kung may alinlangan, makipag-ugnayan sa\n"
+#~ "\"distributor\" o \"editor\" ng bahagi (\"component\"). Ang paglipat sa\n"
+#~ "ibang tao o pagkopya ng gayong mga bahagi pati ang dokumentasyon\n"
+#~ "ay karaniwang ipinagbabawal.\n"
+#~ "\n"
+#~ "\n"
+#~ "Lahat ng mga karapatan sa mga bahagi ng kasunod na CD media ay\n"
+#~ "pag-aari ng kani-kanilang mga may-katha at protektado ng batas ng\n"
+#~ "\"intellectual property\" at \"copyright\" na magagamit sa mga "
+#~ "\"software\n"
+#~ "program.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Gamitin ang libsafe para sa mga server"
 
diff --git a/perl-install/share/po/tr.po b/perl-install/share/po/tr.po
index e53cfce90..846ce843c 100644
--- a/perl-install/share/po/tr.po
+++ b/perl-install/share/po/tr.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2004-09-15 13:35+0200\n"
 "Last-Translator: Ömer Fadıl USTA <omer_fad@hotmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -1408,18 +1408,14 @@ msgstr "Bir başka disk bölümü seçiniz"
 msgid "Choose a partition"
 msgstr "Bir disk bölümü seçiniz"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Normal kipe geç"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Uzman kipine geç"
+msgid "More"
+msgstr "Ayrıntı"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "Yapılandırma"
@@ -1469,13 +1465,17 @@ msgstr "Tümünü Temizle"
 msgid "Auto allocate"
 msgstr "Otomatik bölümle"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Ayrıntı"
+msgid "Toggle to normal mode"
+msgstr "Normal kipe geç"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Uzman kipine geç"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Sabit Disk bilgisi"
@@ -1528,7 +1528,12 @@ msgstr "RAID'e ekle"
 msgid "Add to LVM"
 msgstr "LVM'e ekle"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Kullanıcı ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Sil"
@@ -1543,7 +1548,12 @@ msgstr "RAID'den kaldır"
 msgid "Remove from LVM"
 msgstr "LVM'den kaldır"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "LVM'den kaldır"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "RAID'i değiştir"
@@ -1715,7 +1725,27 @@ msgid ""
 "filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Dosya sistemi parolası"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Dosya sisteminizin parolasını seçiniz"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "parola"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Eklemek için mevcut bir RAID seçin"
@@ -1827,7 +1857,12 @@ msgstr "Yeni ayarların etkinleşmesi için sistemi yeniden başlatmalısınız"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "%s sürücüsünün bölümlendirme tablosu diske yazılacak"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Biçemlendirilen bölüm: %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "%s bölümü biçemlendirilirken üzerinde ki tüm bilgiler silinecektir"
@@ -1959,7 +1994,27 @@ msgstr "Bağlandı\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "parola"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2063,12 +2118,7 @@ msgstr "Bölümlendirme tablosu türü: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "veriyolu %d ve %d kimlikli\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Dosya sistemi parolası"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Dosya sisteminizin parolasını seçiniz"
@@ -2083,12 +2133,7 @@ msgstr "Bu parola çok basit (en az %d karakterlik olmalı)"
 msgid "The encryption keys do not match"
 msgstr "Parolalar uyuşmuyor"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "parola"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Parola (tekrar)"
@@ -2202,11 +2247,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "/boot/efi ye bağlanmış bir FAT bölümüne ihtiyacınız var"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Biçemlendirilen bölüm: %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4606,7 +4646,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4614,8 +4657,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4635,52 +4678,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4694,9 +4742,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4801,7 +4849,55 @@ msgstr ""
 "Paris Mahkemesi tarafından görüşülecektir. Bu doküman hakkında herhangi bir\n"
 "soru için lütfen Mandriva S.A'ya başvurun.\n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4813,68 +4909,55 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Uyarı\n"
-"\n"
-"Aşağıdaki maddeleri lütfen dikkatle okuyun. Herhangi birine\n"
-"katılmıyorsanız, bir sonraki CD ortamından kurulum yapmanız mümkün\n"
-"değildir. Bu ortamdan kurulum yapmadan devam edebilmek için 'Red'de\n"
-"basınız.\n"
-"\n"
-"\n"
-"Bir sonraki CD'deki bazı uygulamalar GPL Lisansı'na ya da benzer "
-"anlaşmalara\n"
-"tabi değildir. Her parça kendine ait bir lisansın şartları ve durumları\n"
-"tarafından yönlendirilir. Lütfen ilgili lisansı dikkatle okuyup kabul "
-"etmeden\n"
-"bu parçaların dağıtımını yapmayınız.\n"
-"Genel olarak bu tür lisanslar ilgili uygulamanın transferi, kopyalanması\n"
-" (yedekleme amacı dışında nedenlerle), dağıtımı, kodlarının incelenmesi ve\n"
-"değiştirilmesini engeller. Herhangi bir anlaşmazlık, ilgili lisans\n"
-"tarafından verilen haklarınızı yok eder. Özel bir lisans anlaşmasıyla hak\n"
-"sahibi olmadıysanız, ilgili parçaları birden fazla sisteme kuramaz, ağ\n"
-"ortamında çalışmaya adapte edemezsiniz. Herhangi bir şüphe durumunda\n"
-"doğrudan dağıtıcı, ya da uygulamanın yazarıyla iletişim kurunuz.\n"
-"Üçüncü şahıslara transfer ya da dokümanlar da dahil herhangi bir kopyalama\n"
-"genel olarak mümkün değildir.\n"
-"\n"
-"\n"
-"Bir sonraki CD ortamındaki parçaların tüm hakları her bir uygulamanın kendi\n"
-"yazarına aittir. Bu haklar bilgisayar programlarına uygulanan entellektüel\n"
-"özgünlük ve telif hakkı yasalarıyla korunmaktadır.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6639,6 +6722,72 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Kurulum başarısız!"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Uyarı\n"
+#~ "\n"
+#~ "Aşağıdaki maddeleri lütfen dikkatle okuyun. Herhangi birine\n"
+#~ "katılmıyorsanız, bir sonraki CD ortamından kurulum yapmanız mümkün\n"
+#~ "değildir. Bu ortamdan kurulum yapmadan devam edebilmek için 'Red'de\n"
+#~ "basınız.\n"
+#~ "\n"
+#~ "\n"
+#~ "Bir sonraki CD'deki bazı uygulamalar GPL Lisansı'na ya da benzer "
+#~ "anlaşmalara\n"
+#~ "tabi değildir. Her parça kendine ait bir lisansın şartları ve durumları\n"
+#~ "tarafından yönlendirilir. Lütfen ilgili lisansı dikkatle okuyup kabul "
+#~ "etmeden\n"
+#~ "bu parçaların dağıtımını yapmayınız.\n"
+#~ "Genel olarak bu tür lisanslar ilgili uygulamanın transferi, kopyalanması\n"
+#~ " (yedekleme amacı dışında nedenlerle), dağıtımı, kodlarının incelenmesi "
+#~ "ve\n"
+#~ "değiştirilmesini engeller. Herhangi bir anlaşmazlık, ilgili lisans\n"
+#~ "tarafından verilen haklarınızı yok eder. Özel bir lisans anlaşmasıyla "
+#~ "hak\n"
+#~ "sahibi olmadıysanız, ilgili parçaları birden fazla sisteme kuramaz, ağ\n"
+#~ "ortamında çalışmaya adapte edemezsiniz. Herhangi bir şüphe durumunda\n"
+#~ "doğrudan dağıtıcı, ya da uygulamanın yazarıyla iletişim kurunuz.\n"
+#~ "Üçüncü şahıslara transfer ya da dokümanlar da dahil herhangi bir "
+#~ "kopyalama\n"
+#~ "genel olarak mümkün değildir.\n"
+#~ "\n"
+#~ "\n"
+#~ "Bir sonraki CD ortamındaki parçaların tüm hakları her bir uygulamanın "
+#~ "kendi\n"
+#~ "yazarına aittir. Bu haklar bilgisayar programlarına uygulanan "
+#~ "entellektüel\n"
+#~ "özgünlük ve telif hakkı yasalarıyla korunmaktadır.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Sunucular için libsafe kullanılsın"
 
diff --git a/perl-install/share/po/uk.po b/perl-install/share/po/uk.po
index 71d6581be..703da7f9d 100644
--- a/perl-install/share/po/uk.po
+++ b/perl-install/share/po/uk.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-uk\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2005-03-01 01:29+0200\n"
 "Last-Translator: Taras Boychuk <btr1@ukrpost.net>\n"
 "Language-Team: ukrainian <uk@li.org>\n"
@@ -1421,18 +1421,14 @@ msgstr "Створити інший розділ"
 msgid "Choose a partition"
 msgstr "Виберіть розділ"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Перемикнути в нормальний режим"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Перемикнути в режим експерта"
+msgid "More"
+msgstr "Ще"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "Конфігурація"
@@ -1486,13 +1482,17 @@ msgstr "Очистити все"
 msgid "Auto allocate"
 msgstr "Автоматично розподілити"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Ще"
+msgid "Toggle to normal mode"
+msgstr "Перемикнути в нормальний режим"
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Перемикнути в режим експерта"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Інформація про твердий диск"
@@ -1545,7 +1545,12 @@ msgstr "Додати до RAID"
 msgid "Add to LVM"
 msgstr "Додати до LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Код користувача"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Видалити"
@@ -1560,7 +1565,12 @@ msgstr "Видалити з RAID"
 msgid "Remove from LVM"
 msgstr "Видалити з LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Видалити з LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Змінити RAID"
@@ -1733,7 +1743,27 @@ msgstr ""
 "розділу(ів), при наступному завантаженні Windows(TM)\n"
 "буде здійснено перевірку файлової системи"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Ключ шифрування файлової системи"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Виберіть ключ шифрування Вашої файлової системи"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Ключ шифрування"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Виберіть існуючий RAID, до якого додати"
@@ -1847,7 +1877,12 @@ msgstr "Щоб зміни почали діяти, Вам слід переза�
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Таблицю розділів диску %s буде записано на диск"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Форматування розділу %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Після форматування розділу %s всі дані на ньому будуть втрачені"
@@ -1979,7 +2014,27 @@ msgstr "Змонтований\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Ключ шифрування"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2083,12 +2138,7 @@ msgstr "Тип таблиці розділів: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "на каналі %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Ключ шифрування файлової системи"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Виберіть ключ шифрування Вашої файлової системи"
@@ -2104,12 +2154,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Ключі шифрування не співпадають"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Ключ шифрування"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Ключ шифрування (знову)"
@@ -2226,11 +2271,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Ви повинні мати розділ FAT, змонтований в /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Форматування розділу %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4664,7 +4704,7 @@ msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4674,7 +4714,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4682,8 +4725,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4703,52 +4746,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4762,9 +4810,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4879,7 +4927,55 @@ msgstr ""
 "З будь-якими питаннями щодо цього документа звертайтеся, будь ласка,\n"
 "до Mandriva S.A.\n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4897,67 +4993,55 @@ msgstr ""
 "детальнішого ознайомлення. Якщо Ви не впевнені, чи патент годиться для Вас,\n"
 "проконсультуйтесь про законодавство Вашої країни."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
-msgstr ""
-"\n"
-"Попередження\n"
-"\n"
-"Будь ласка, уважно прочитайте умови, подані далі. Якщо Ви не\n"
-"погоджуєтесь з будь-якою частиною, Вам не дозволяється встановлювати\n"
-"наступний компакт-диск. Натисніть на Відмовитися для того, щоб\n"
-"продовжити встановлення без використання цього носія.\n"
-"\n"
-"Деякі компоненти на наступному компакт-диску не керуються ліцензією\n"
-"GPL чи подібною до неї. В такому випадку кожен із компонентів\n"
-"керується своєю специфічною ліцензією. Будь ласка, прочитайте уважно і\n"
-"дотримуйтесь умов такої специфічної ліцензії перш, ніж користуватися\n"
-"або перерозповсюджувати таку компоненту. Такі ліцензії у більшості\n"
-"випадків забороняють передачу, копіювання (крім створення резервної\n"
-"копії), перерозповсюдження, зворотню інженерію, дизасемблювання,\n"
-"декомпіляцію чи модифікацію компоненти. Будь-яке порушення ліцензії\n"
-"негайно припиняє Ваші права щодо компоненти. Якщо специфічно не\n"
-"вказано про надання таких прав, Ви не маєте права встановлювати ці\n"
-"програми на більш, ніж одній системі, або пристосовувати їх для\n"
-"установки в мережі. Якщо Ви маєте сумніви щодо ліцензії, зверніться\n"
-"безпосередньо до дистриб'ютора чи редактора такої компоненти. Передача\n"
-"таких компонент (включаючи документацію) третім особам у більшості\n"
-"випадків заборонена. \n"
-"\n"
-"Всі авторські права компонент на наступному компакт-диску застережені\n"
-"за їх відповідними авторами і захищаються законами про охорону\n"
-"авторських прав, які мають право застосовуватися до програмних\n"
-"продуктів.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
+msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6881,6 +6965,66 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Встановлення завершилося невдало"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Попередження\n"
+#~ "\n"
+#~ "Будь ласка, уважно прочитайте умови, подані далі. Якщо Ви не\n"
+#~ "погоджуєтесь з будь-якою частиною, Вам не дозволяється встановлювати\n"
+#~ "наступний компакт-диск. Натисніть на Відмовитися для того, щоб\n"
+#~ "продовжити встановлення без використання цього носія.\n"
+#~ "\n"
+#~ "Деякі компоненти на наступному компакт-диску не керуються ліцензією\n"
+#~ "GPL чи подібною до неї. В такому випадку кожен із компонентів\n"
+#~ "керується своєю специфічною ліцензією. Будь ласка, прочитайте уважно і\n"
+#~ "дотримуйтесь умов такої специфічної ліцензії перш, ніж користуватися\n"
+#~ "або перерозповсюджувати таку компоненту. Такі ліцензії у більшості\n"
+#~ "випадків забороняють передачу, копіювання (крім створення резервної\n"
+#~ "копії), перерозповсюдження, зворотню інженерію, дизасемблювання,\n"
+#~ "декомпіляцію чи модифікацію компоненти. Будь-яке порушення ліцензії\n"
+#~ "негайно припиняє Ваші права щодо компоненти. Якщо специфічно не\n"
+#~ "вказано про надання таких прав, Ви не маєте права встановлювати ці\n"
+#~ "програми на більш, ніж одній системі, або пристосовувати їх для\n"
+#~ "установки в мережі. Якщо Ви маєте сумніви щодо ліцензії, зверніться\n"
+#~ "безпосередньо до дистриб'ютора чи редактора такої компоненти. Передача\n"
+#~ "таких компонент (включаючи документацію) третім особам у більшості\n"
+#~ "випадків заборонена. \n"
+#~ "\n"
+#~ "Всі авторські права компонент на наступному компакт-диску застережені\n"
+#~ "за їх відповідними авторами і захищаються законами про охорону\n"
+#~ "авторських прав, які мають право застосовуватися до програмних\n"
+#~ "продуктів.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Використовувати libsafe для сервера"
 
diff --git a/perl-install/share/po/uz.po b/perl-install/share/po/uz.po
index 0e2815bb1..47ea62a14 100644
--- a/perl-install/share/po/uz.po
+++ b/perl-install/share/po/uz.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: uz@cyrillic\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-08-24 01:24+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -1373,18 +1373,14 @@ msgstr "Diskning boshqa qismini tanlash"
 msgid "Choose a partition"
 msgstr "Diskning qismini tanlash"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Odiy usuliga oʻtish"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Ekspert usuliga oʻtish"
+msgid "More"
+msgstr "Koʻproq"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Tasdiqlash"
@@ -1437,13 +1433,17 @@ msgstr "Hammasini tozalash"
 msgid "Auto allocate"
 msgstr "Avto-taqsimlash"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Koʻproq"
+msgid "Toggle to normal mode"
+msgstr "Odiy usuliga oʻtish"
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Ekspert usuliga oʻtish"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Qattiq disk haqida maʼlumot"
@@ -1496,7 +1496,12 @@ msgstr "RAID'ga qoʻshish"
 msgid "Add to LVM"
 msgstr "LVM'ga qoʻshish"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Foydalanuvchi ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Oʻchirish"
@@ -1511,7 +1516,12 @@ msgstr "RAID'dan olib tashlash"
 msgid "Remove from LVM"
 msgstr "LVM'dan olib tashlash"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "LVM'dan olib tashlash"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "RAID'ni oʻzgartirish"
@@ -1683,7 +1693,27 @@ msgid ""
 "filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Fayl tizimining kodlash kaliti"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Fayl tizimining kodlash kalitini tanlang"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Kodlash kaliti"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Qoʻshish uchun mavjud boʻlgan RAID'ni tanlang"
@@ -1796,7 +1826,12 @@ msgstr ""
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "%s diskining qismlar jadvali diskga saqlanish arafasida"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Diskning qismi (%s) format qilinmoqda"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1929,7 +1964,27 @@ msgstr "Ulangan\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Kodlash kaliti"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2027,12 +2082,7 @@ msgstr "Disk qismlar jadvalining turi: %s\n"
 msgid "on channel %d id %d\n"
 msgstr ""
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Fayl tizimining kodlash kaliti"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Fayl tizimining kodlash kalitini tanlang"
@@ -2048,12 +2098,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Kodlash kalitlari mos kelmaydi"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Kodlash kaliti"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Kodlash kaliti (yana)"
@@ -2164,11 +2209,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Sizda /boot/efi nuqtasiga ulangan diskning FAT qismi boʻlishi shart"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Diskning qismi (%s) format qilinmoqda"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4528,7 +4568,7 @@ msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4538,7 +4578,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4546,8 +4589,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4567,52 +4610,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4626,9 +4674,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4778,7 +4826,55 @@ msgstr ""
 "Iltimos, mazkur hujjatga oid har qanday savollar boʻyicha Mandriva S.A. "
 "bilan bogʻlaning.\n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4790,38 +4886,54 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
+#: messages.pm:123
 #, c-format
 msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
 "\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
 "\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
 "\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
 "\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
diff --git a/perl-install/share/po/uz@cyrillic.po b/perl-install/share/po/uz@cyrillic.po
index 465275acb..75a07af1a 100644
--- a/perl-install/share/po/uz@cyrillic.po
+++ b/perl-install/share/po/uz@cyrillic.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: uz@cyrillic\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-08-24 01:24+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -1371,18 +1371,14 @@ msgstr "Дискнинг бошқа қисмини танлаш"
 msgid "Choose a partition"
 msgstr "Дискнинг қисмини танлаш"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Одий усулига ўтиш"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Эксперт усулига ўтиш"
+msgid "More"
+msgstr "Кўпроқ"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Тасдиқлаш"
@@ -1435,13 +1431,17 @@ msgstr "Ҳаммасини тозалаш"
 msgid "Auto allocate"
 msgstr "Авто-тақсимлаш"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Кўпроқ"
+msgid "Toggle to normal mode"
+msgstr "Одий усулига ўтиш"
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Эксперт усулига ўтиш"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Қаттиқ диск ҳақида маълумот"
@@ -1493,7 +1493,12 @@ msgstr "RAID'га қўшиш"
 msgid "Add to LVM"
 msgstr "LVM'га қўшиш"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "Фойдаланувчи ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Ўчириш"
@@ -1508,7 +1513,12 @@ msgstr "RAID'дан олиб ташлаш"
 msgid "Remove from LVM"
 msgstr "LVM'дан олиб ташлаш"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "LVM'дан олиб ташлаш"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "RAID'ни ўзгартириш"
@@ -1680,7 +1690,27 @@ msgid ""
 "filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Файл тизимининг кодлаш калити"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Файл тизимининг кодлаш калитини танланг"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Кодлаш калити"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Қўшиш учун мавжуд бўлган RAID'ни танланг"
@@ -1792,7 +1822,12 @@ msgstr "Ўзгаришлар амалда қўлланилиши учун ком
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "%s дискининг қисмлар жадвали дискга сақланиш арафасида"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Дискнинг қисми (%s) формат қилинмоқда"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1925,7 +1960,27 @@ msgstr "Уланган\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Кодлаш калити"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2023,12 +2078,7 @@ msgstr "Диск қисмлар жадвалининг тури: %s\n"
 msgid "on channel %d id %d\n"
 msgstr ""
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Файл тизимининг кодлаш калити"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Файл тизимининг кодлаш калитини танланг"
@@ -2043,12 +2093,7 @@ msgstr "Кодлаш калити жуда содда (у энг ками %d б�
 msgid "The encryption keys do not match"
 msgstr "Кодлаш калитлари мос келмайди"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Кодлаш калити"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Кодлаш калити (яна)"
@@ -2159,11 +2204,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Сизда /boot/efi нуқтасига уланган дискнинг FAT қисми бўлиши шарт"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Дискнинг қисми (%s) формат қилинмоқда"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4518,7 +4558,7 @@ msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4528,7 +4568,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4536,8 +4579,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4557,52 +4600,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4616,9 +4664,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4764,7 +4812,55 @@ msgstr ""
 "Илтимос, мазкур ҳужжатга оид ҳар қандай саволлар бўйича Mandriva S.A. билан "
 "боғланинг.\n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4776,38 +4872,54 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
+#: messages.pm:123
 #, c-format
 msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
 "\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
 "\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
 "\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
 "\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
diff --git a/perl-install/share/po/vi.po b/perl-install/share/po/vi.po
index 0fb327d61..e9c62888f 100644
--- a/perl-install/share/po/vi.po
+++ b/perl-install/share/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-vi version\n"
 "Report-Msgid-Bugs-To: tmthanh@yahoo.com\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2005-06-02 21:17+0700\n"
 "Last-Translator: Larry Nguyen <larry@vnlinux.org>\n"
 "Language-Team:  <gnomevi-list@lists.sourceforge.net>\n"
@@ -1407,18 +1407,14 @@ msgstr "Chọn phân vùng khác"
 msgid "Choose a partition"
 msgstr "Chọn phân vùng"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Chuyển sang chế độ bình thường"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Chuyển sang chế độ Chuyên gia"
+msgid "More"
+msgstr "Thêm"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, fuzzy, c-format
 msgid "Confirmation"
 msgstr "Cấu hình"
@@ -1469,13 +1465,17 @@ msgstr "Xóa hết"
 msgid "Auto allocate"
 msgstr "Phân chia tự động"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Thêm"
+msgid "Toggle to normal mode"
+msgstr "Chuyển sang chế độ bình thường"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Chuyển sang chế độ Chuyên gia"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Thông tin đĩa cứng"
@@ -1529,7 +1529,12 @@ msgstr "Thêm vào RAID"
 msgid "Add to LVM"
 msgstr "Thêm vào LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ID Người Dùng"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Xóa"
@@ -1544,7 +1549,12 @@ msgstr "Gỡ bỏ khỏi RAID"
 msgid "Remove from LVM"
 msgstr "Gỡ bỏ khỏi LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Gỡ bỏ khỏi LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Thay đổi RAID"
@@ -1716,7 +1726,27 @@ msgstr ""
 "thước (các) phân vùng, việc kiểm tra hệ thống tập tin sẽ được chạy khi khởi "
 "động vào Windows(TM)"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Khóa mã hóa hệ thống tập tin"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Chọn khóa mã hóa hệ thống tập tin"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Khóa mã hóa"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Hãy chọn RAID đang tồn tại để thêm vào"
@@ -1828,7 +1858,12 @@ msgstr "Bạn cần khởi động lại trước khi thay đổi có tác dụn
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Bảng phân vùng của drive %s sắp được ghi lên đĩa"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Đang format phân vùng %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Sau khi format phân vùng %s, mọi dữ liệu trên đó sẽ bị mất"
@@ -1960,7 +1995,27 @@ msgstr "Đã được gắn kết\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Khóa mã hóa"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2064,12 +2119,7 @@ msgstr "Kiểu bảng phân vùng: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "trên kênh %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Khóa mã hóa hệ thống tập tin"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Chọn khóa mã hóa hệ thống tập tin"
@@ -2084,12 +2134,7 @@ msgstr "Khóa mã hóa này đơn giản quá (phải có độ dài ít nhất
 msgid "The encryption keys do not match"
 msgstr "Các khóa mã hóa không khớp nhau"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Khóa mã hóa"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Khóa mã hoá (nhập lại)"
@@ -2202,11 +2247,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Bạn phải có một phân vùng FAT được gắn kết vào /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Đang format phân vùng %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4633,7 +4673,7 @@ msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4643,7 +4683,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4651,8 +4694,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4672,52 +4715,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4731,9 +4779,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4839,7 +4887,55 @@ msgstr ""
 "Paris - France.\n"
 "For any question on this document, please contact Mandriva S.A.  \n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4856,68 +4952,55 @@ msgstr ""
 "http://www.mp3licensing.com ). Nếu bạn không nắm rõ, hãy tham khảo luật\n"
 "nơi bạn ở. "
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Cảnh Báo\n"
-"\n"
-"Hãy đọc kỹ các điều khoản dưới đây. Nếu bạn không chấp thuận với bất\n"
-"cứ phần nào, bạn sẽ không được phép cài đặt đĩa CD tiếp theo. Nhấp vào\n"
-"'Từ chối' để tiếp tục cài đặt và không sử dụng các đĩa này.\n"
-"\n"
-"\n"
-"Một số thành phần trong CD tiếp theo không tuân theo \n"
-"GPL License hoặc tương tự. Mỗi một thành phần này lại \n"
-"tuân theo các điều kiện và điều khoản trong giấy phép riêng của nó. \n"
-"Hãy đọc kỹ và chấp thuận các giấy phép đi kèm trước khi bạn \n"
-"sử dụng hoặc phân phối lại các thành phần đã được đề cập. \n"
-"Các giấy phép này nói chung sẽ ngăn chặn việc trao đổi, sao \n"
-"chép (trừ các mục đích sao lưu dự phòng), phân phối lại, đảo \n"
-"lộn, tháo rời, bỏ biên dịch hoặc thay đổi thành phần. \n"
-"Bất kỳ một phạm vi chấp thuận nào cũng sẽ chấm dứt quyền \n"
-"của bạn theo như giấy phép. Chỉ khi các điều khoản trong giấy phép\n"
-"cho phép, bạn mới có thể cài đặt các chương trình cho nhiều \n"
-"máy tính, hoặc sửa chữa để có thể dùng trong một mạng. Nếu có vấn đề gì "
-"không \n"
-"rõ, hãy liên hệ trực tiếp với nhà phân phối hoặc người viết chương trình. \n"
-"Chuyển giao cho bên thứ ba hoặc sao chép các thành phần này luôn là\n"
-"trái phép.\n"
-"\n"
-"\n"
-"Mọi quyền sử dụng các thành phần ở CD tiếp theo thuộc sở hữu \n"
-"của các tác giả và được bảo vệ bởi luật sở hữu trí tuệ và luật bản quyền \n"
-"được áp dụng cho các chương trình phần mềm.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6808,6 +6891,69 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Không cài đặt được"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Cảnh Báo\n"
+#~ "\n"
+#~ "Hãy đọc kỹ các điều khoản dưới đây. Nếu bạn không chấp thuận với bất\n"
+#~ "cứ phần nào, bạn sẽ không được phép cài đặt đĩa CD tiếp theo. Nhấp vào\n"
+#~ "'Từ chối' để tiếp tục cài đặt và không sử dụng các đĩa này.\n"
+#~ "\n"
+#~ "\n"
+#~ "Một số thành phần trong CD tiếp theo không tuân theo \n"
+#~ "GPL License hoặc tương tự. Mỗi một thành phần này lại \n"
+#~ "tuân theo các điều kiện và điều khoản trong giấy phép riêng của nó. \n"
+#~ "Hãy đọc kỹ và chấp thuận các giấy phép đi kèm trước khi bạn \n"
+#~ "sử dụng hoặc phân phối lại các thành phần đã được đề cập. \n"
+#~ "Các giấy phép này nói chung sẽ ngăn chặn việc trao đổi, sao \n"
+#~ "chép (trừ các mục đích sao lưu dự phòng), phân phối lại, đảo \n"
+#~ "lộn, tháo rời, bỏ biên dịch hoặc thay đổi thành phần. \n"
+#~ "Bất kỳ một phạm vi chấp thuận nào cũng sẽ chấm dứt quyền \n"
+#~ "của bạn theo như giấy phép. Chỉ khi các điều khoản trong giấy phép\n"
+#~ "cho phép, bạn mới có thể cài đặt các chương trình cho nhiều \n"
+#~ "máy tính, hoặc sửa chữa để có thể dùng trong một mạng. Nếu có vấn đề gì "
+#~ "không \n"
+#~ "rõ, hãy liên hệ trực tiếp với nhà phân phối hoặc người viết chương "
+#~ "trình. \n"
+#~ "Chuyển giao cho bên thứ ba hoặc sao chép các thành phần này luôn là\n"
+#~ "trái phép.\n"
+#~ "\n"
+#~ "\n"
+#~ "Mọi quyền sử dụng các thành phần ở CD tiếp theo thuộc sở hữu \n"
+#~ "của các tác giả và được bảo vệ bởi luật sở hữu trí tuệ và luật bản "
+#~ "quyền \n"
+#~ "được áp dụng cho các chương trình phần mềm.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "Dùng libsafe cho các máy chủ"
 
diff --git a/perl-install/share/po/wa.po b/perl-install/share/po/wa.po
index ecc11bef3..7f5b40955 100644
--- a/perl-install/share/po/wa.po
+++ b/perl-install/share/po/wa.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2006-09-05 23:14+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -1420,18 +1420,14 @@ msgstr "Tchoezixhoz ene ôte pårticion"
 msgid "Choose a partition"
 msgstr "Tchoezixhoz ene pårticion"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "Candjî pol môde normå"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "Candjî pol môde sipepieus"
+msgid "More"
+msgstr "Co des ôtes"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "Acertinaedje"
@@ -1483,13 +1479,17 @@ msgstr "Tot netyî"
 msgid "Auto allocate"
 msgstr "Grandeu otomatike"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "Co des ôtes"
+msgid "Toggle to normal mode"
+msgstr "Candjî pol môde normå"
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Candjî pol môde sipepieus"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "Informåcion sol deure plake"
@@ -1543,7 +1543,12 @@ msgstr "Radjouter å RAID"
 msgid "Add to LVM"
 msgstr "Radjouter å LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "ID uzeu"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "Disfacer"
@@ -1558,7 +1563,12 @@ msgstr "Bodjî foû do RAID"
 msgid "Remove from LVM"
 msgstr "Bodjî foû do LVM"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "Bodjî foû do LVM"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "Candjî l' RAID"
@@ -1733,7 +1743,27 @@ msgstr ""
 "d' grandeu del pårticion, on verifiaedje do sistinme di fitchî serè-st \n"
 "enondé li côp ki vént ki Windows™ serè-st enondé"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Clé d' ecriptaedje do sistinme di fitchîs"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "Tchoezixhoz vosse clé d' ecriptaedje pol sistinme di fitchîs"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "Clé d' ecriptaedje"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Tchoezi on RAID ki egzistêye dedja po î radjouter"
@@ -1849,7 +1879,12 @@ msgstr ""
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "Li tåvlea di pårtixhaedje del plake %s va esse sicrîte sol plake"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Abwesnant li pårticion %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
@@ -1988,7 +2023,27 @@ msgstr "Montêye\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "Clé d' ecriptaedje"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2095,12 +2150,7 @@ msgstr "Sôre di tåvlea di pårtixhaedje: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "sol canå %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "Clé d' ecriptaedje do sistinme di fitchîs"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Tchoezixhoz vosse clé d' ecriptaedje pol sistinme di fitchîs"
@@ -2116,12 +2166,7 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Les clés d' ecriptaedje ni sont nén les minmes"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "Clé d' ecriptaedje"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Clé d' ecriptaedje (co ene feye)"
@@ -2234,11 +2279,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Vos dvoz aveur ene pårticion FAT montêye so /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Abwesnant li pårticion %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4698,7 +4738,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4706,8 +4749,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4727,52 +4770,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4786,9 +4834,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4809,7 +4857,55 @@ msgid ""
 "For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4827,38 +4923,54 @@ msgstr ""
 "racsegnes). Si vos n' estoz nén seur si ene patinte s' aplike ou nén por\n"
 "vos, acertinez vs tot rwaitant vos lwès locåles."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index 3163fcdf8..b944bfd6f 100644
--- a/perl-install/share/po/zh_CN.po
+++ b/perl-install/share/po/zh_CN.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: zh_CN\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-03-29 21:33+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -1388,18 +1388,14 @@ msgstr "选择其它分区"
 msgid "Choose a partition"
 msgstr "选择分区"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "切换到正常模式"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "切换到专家模式"
+msgid "More"
+msgstr "更多"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "确认"
@@ -1450,13 +1446,17 @@ msgstr "全部清除"
 msgid "Auto allocate"
 msgstr "自动分配"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "更多"
+msgid "Toggle to normal mode"
+msgstr "切换到正常模式"
+
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "切换到专家模式"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "硬盘信息"
@@ -1508,7 +1508,12 @@ msgstr "加入 RAID"
 msgid "Add to LVM"
 msgstr "加入 LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "用户 ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "删除"
@@ -1523,7 +1528,12 @@ msgstr "从 RAID 中移除"
 msgid "Remove from LVM"
 msgstr "从 LVM 中移除"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "从 LVM 中移除"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "修改 RAID"
@@ -1694,7 +1704,27 @@ msgstr ""
 "为了保证更改分区大小之后的数据完整性, 在您下次启动进入 Microsoft Windows® 时"
 "可能会自动运行文件系统检查。"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "文件系统加密密钥"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "选择该文件系统的加密密钥"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "加密密钥"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "选择加入一个已存在的 RAID"
@@ -1808,7 +1838,12 @@ msgstr "修改要等到重新启动后才能生效"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "驱动器 %s 的分区表将会写入磁盘中！"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "正在格式化分区 %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "格式化分区 %s 之后, 该分区上的所有数据都将丢失"
@@ -1945,7 +1980,27 @@ msgstr "已挂载\n"
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "加密密钥"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2047,12 +2102,7 @@ msgstr "分区表类型: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "通道 %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "文件系统加密密钥"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "选择该文件系统的加密密钥"
@@ -2067,12 +2117,7 @@ msgstr "这个加密密钥太简单了(至少要有 %d 个字符)"
 msgid "The encryption keys do not match"
 msgstr "两次加密密钥不符"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "加密密钥"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "加密密钥(再输入一次)"
@@ -2184,11 +2229,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "您必须有一个FAT分区载入 /boot/efi"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "正在格式化分区 %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4586,7 +4626,7 @@ msgstr "引导程序无法识别多个物理卷上的 /boot"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -4596,7 +4636,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4604,8 +4647,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4625,52 +4668,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4684,9 +4732,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4768,7 +4816,55 @@ msgstr ""
 "\n"
 "以上中文翻译仅为方便您理解, 不能作为法律用途, 请以协议英文文本为准。\n"
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4784,58 +4880,55 @@ msgstr ""
 "mp3licensing.com 以获得更多信息)。如果您对专利是否适用于您感到疑惑, 请查看当"
 "地的法律。"
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"警告\n"
-"\n"
-"请仔细阅读下列的条款。如果您不同意其中任何部分, 您就不可以安装下一个光盘上的"
-"软件。选择“拒绝”将继续安装其它介质上的软件。\n"
-"\n"
-"\n"
-"下一个光盘的部分内容的许可协议不是 GPL 或类似的协议。每个这样的内容受到各自不"
-"同的条件和条款的限制。在您使用或重新分发该内容之前, 请仔细阅读并遵守其特定的"
-"许可协议。\n"
-"通常这些协议会限制对该内容进行转换, 复制(备份目的除外), 再次分发, 反向工程, "
-"反汇编, 反编译或其它修改。如果违背任何协议的条款, 协议赋予您的权利也立即终"
-"止。除非协议中有特定的条款赋予您相关权利, 您通常不能在超过一台系统中安装该程"
-"序, 或者把它应用在网络上。如果有疑问, 请直接与该内容的发行者或作者联系。\n"
-"向第三方转让或复制这些内容, 包括其文档通常是被禁止的。\n"
-"\n"
-"\n"
-"下一个光盘的内容的全部权利分别属于它们各自的作者, 并受到可应用与软件程序的知"
-"识产权和版权法律的保护。\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6652,6 +6745,58 @@ msgstr ""
 msgid "Installation failed"
 msgstr "安装失败"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "警告\n"
+#~ "\n"
+#~ "请仔细阅读下列的条款。如果您不同意其中任何部分, 您就不可以安装下一个光盘上"
+#~ "的软件。选择“拒绝”将继续安装其它介质上的软件。\n"
+#~ "\n"
+#~ "\n"
+#~ "下一个光盘的部分内容的许可协议不是 GPL 或类似的协议。每个这样的内容受到各"
+#~ "自不同的条件和条款的限制。在您使用或重新分发该内容之前, 请仔细阅读并遵守其"
+#~ "特定的许可协议。\n"
+#~ "通常这些协议会限制对该内容进行转换, 复制(备份目的除外), 再次分发, 反向工"
+#~ "程, 反汇编, 反编译或其它修改。如果违背任何协议的条款, 协议赋予您的权利也立"
+#~ "即终止。除非协议中有特定的条款赋予您相关权利, 您通常不能在超过一台系统中安"
+#~ "装该程序, 或者把它应用在网络上。如果有疑问, 请直接与该内容的发行者或作者联"
+#~ "系。\n"
+#~ "向第三方转让或复制这些内容, 包括其文档通常是被禁止的。\n"
+#~ "\n"
+#~ "\n"
+#~ "下一个光盘的内容的全部权利分别属于它们各自的作者, 并受到可应用与软件程序的"
+#~ "知识产权和版权法律的保护。\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "服务器使用 libsafe"
 
diff --git a/perl-install/share/po/zh_TW.po b/perl-install/share/po/zh_TW.po
index ed2abd99c..1d5ee8ecb 100644
--- a/perl-install/share/po/zh_TW.po
+++ b/perl-install/share/po/zh_TW.po
@@ -18,7 +18,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2008-09-15 17:25+0200\n"
+"POT-Creation-Date: 2008-09-19 14:51+0200\n"
 "PO-Revision-Date: 2008-03-12 22:25+0800\n"
 "Last-Translator: You-Cheng Hsieh <yochenhsieh@gmail.com>\n"
 "Language-Team: Traditional Chinese <zh@li.org>\n"
@@ -1402,18 +1402,14 @@ msgstr "選擇另一個分割區"
 msgid "Choose a partition"
 msgstr "選擇一個分割區"
 
-#: diskdrake/interactive.pm:259
-#, c-format
-msgid "Toggle to normal mode"
-msgstr "切換到一般模式"
-
-#: diskdrake/interactive.pm:259
+#: diskdrake/interactive.pm:270 diskdrake/interactive.pm:376
+#: interactive/curses.pm:512
 #, c-format
-msgid "Toggle to expert mode"
-msgstr "切換到專家模式"
+msgid "More"
+msgstr "更多"
 
-#: diskdrake/interactive.pm:267 diskdrake/interactive.pm:277
-#: diskdrake/interactive.pm:1103
+#: diskdrake/interactive.pm:278 diskdrake/interactive.pm:288
+#: diskdrake/interactive.pm:1173
 #, c-format
 msgid "Confirmation"
 msgstr "確認"
@@ -1464,13 +1460,17 @@ msgstr "全部清除"
 msgid "Auto allocate"
 msgstr "自動分配"
 
-#: diskdrake/interactive.pm:304 diskdrake/interactive.pm:352
-#: interactive/curses.pm:512
+#: diskdrake/interactive.pm:320
 #, c-format
-msgid "More"
-msgstr "更多"
+msgid "Toggle to normal mode"
+msgstr "切換到一般模式"
 
-#: diskdrake/interactive.pm:309
+#: diskdrake/interactive.pm:320
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "切換到專家模式"
+
+#: diskdrake/interactive.pm:332
 #, c-format
 msgid "Hard drive information"
 msgstr "硬碟資訊"
@@ -1522,7 +1522,12 @@ msgstr "加入到磁碟陣列"
 msgid "Add to LVM"
 msgstr "加入到 LVM"
 
-#: diskdrake/interactive.pm:383
+#: diskdrake/interactive.pm:406
+#, fuzzy, c-format
+msgid "Use"
+msgstr "使用者 ID"
+
+#: diskdrake/interactive.pm:408
 #, c-format
 msgid "Delete"
 msgstr "刪除"
@@ -1537,7 +1542,12 @@ msgstr "由磁碟陣列中移除"
 msgid "Remove from LVM"
 msgstr "由 LVM 中移除"
 
-#: diskdrake/interactive.pm:386
+#: diskdrake/interactive.pm:411
+#, fuzzy, c-format
+msgid "Remove from dm"
+msgstr "由 LVM 中移除"
+
+#: diskdrake/interactive.pm:412
 #, c-format
 msgid "Modify RAID"
 msgstr "變更磁碟陣列"
@@ -1708,7 +1718,27 @@ msgstr ""
 "為確保重新調整分割區大小後的資料正確性，當您下次從 Windows(TM)\n"
 "開機時便會執行檔案系統檢查。"
 
-#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:826 diskdrake/interactive.pm:1370
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "檔案系統加密金鑰"
+
+#: diskdrake/interactive.pm:827
+#, fuzzy, c-format
+msgid "Enter your filesystem encryption key"
+msgstr "選擇您檔案系統所使用的加密金鑰"
+
+#: diskdrake/interactive.pm:828 diskdrake/interactive.pm:1378
+#, c-format
+msgid "Encryption key"
+msgstr "加密金鑰"
+
+#: diskdrake/interactive.pm:835
+#, c-format
+msgid "Invalid key"
+msgstr ""
+
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "選取一存在的磁碟陣列加入到"
@@ -1822,7 +1852,12 @@ msgstr "您需要重新開機以便於讓異動的設定生效"
 msgid "Partition table of drive %s is going to be written to disk"
 msgstr "正在準備將要寫入磁碟 %s 的硬碟分割表！"
 
-#: diskdrake/interactive.pm:1098
+#: diskdrake/interactive.pm:1151 fs/format.pm:63 fs/format.pm:70
+#, c-format
+msgid "Formatting partition %s"
+msgstr "正在格式化分割區 %s"
+
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "在對分割區 %s 進行格式化的動作以後，所有在這個分割區上的資料都會遺失"
@@ -1959,7 +1994,27 @@ msgstr "已掛載\n"
 msgid "RAID %s\n"
 msgstr "磁碟陣列 %s\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1281
+#, fuzzy, c-format
+msgid "Encrypted"
+msgstr "加密金鑰"
+
+#: diskdrake/interactive.pm:1281
+#, c-format
+msgid " (mapped on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1282
+#, c-format
+msgid " (to map on %s)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1283
+#, c-format
+msgid " (inactive)"
+msgstr ""
+
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2062,12 +2117,7 @@ msgstr "硬碟分割表形式：%s\n"
 msgid "on channel %d id %d\n"
 msgstr "位在通道 %d id %d\n"
 
-#: diskdrake/interactive.pm:1295
-#, c-format
-msgid "Filesystem encryption key"
-msgstr "檔案系統加密金鑰"
-
-#: diskdrake/interactive.pm:1296
+#: diskdrake/interactive.pm:1371
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "選擇您檔案系統所使用的加密金鑰"
@@ -2082,12 +2132,7 @@ msgstr "這個加密金鑰太簡單了 (至少要有 %d 個字元才行)"
 msgid "The encryption keys do not match"
 msgstr "輸入的加密金鑰不符合"
 
-#: diskdrake/interactive.pm:1303
-#, c-format
-msgid "Encryption key"
-msgstr "加密金鑰"
-
-#: diskdrake/interactive.pm:1304
+#: diskdrake/interactive.pm:1379
 #, c-format
 msgid "Encryption key (again)"
 msgstr "再次輸入加密金鑰"
@@ -2200,11 +2245,6 @@ msgstr ""
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "您必須有一個掛載於 /boot/efi 的 FAT 分割區"
 
-#: fs/format.pm:63 fs/format.pm:70
-#, c-format
-msgid "Formatting partition %s"
-msgstr "正在格式化分割區 %s"
-
 #: fs/format.pm:67
 #, c-format
 msgid "Creating and formatting file %s"
@@ -4606,7 +4646,10 @@ msgid ""
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandriva Linux distribution.\n"
+"system and the different components of the Mandriva Linux distribution, and "
+"any applications \n"
+"distributed with these products provided by Mandriva's licensors or "
+"suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4614,8 +4657,8 @@ msgid ""
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
+"By installing, duplicating or using any of the Software Products in any "
+"manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
 "License. \n"
 "If you disagree with any portion of the License, you are not allowed to "
@@ -4635,52 +4678,57 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
-"damages.\n"
+"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"circumstances and to the extent \n"
+"permitted by law, be liable for any special, incidental, direct or indirect "
+"damages whatsoever \n"
+"(including without limitation damages for loss of business, interruption of "
+"business, financial \n"
+"loss, legal fees and penalties resulting from a court judgment, or any other "
+"consequential loss) \n"
+"arising out of  the use or inability to use the Software Products, even if "
+"Mandriva S.A. or its \n"
+"licensors or suppliers have been advised of the possibility or occurrence of "
+"such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
+"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"suppliers or\n"
+"distributors will, in any circumstances, be liable for any special, "
+"incidental, direct or indirect \n"
+"damages whatsoever (including without limitation damages for loss of "
+"business, interruption of \n"
+"business, financial loss, legal fees and penalties resulting from a court "
+"judgment, or any \n"
+"other consequential loss) arising out of the possession and use of software "
+"components or \n"
+"arising out of  downloading software components from one of Mandriva Linux "
+"sites which are \n"
+"prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
 "included in the Software Products.\n"
+"However, because some jurisdictions do not allow the exclusion or limitation "
+"or liability for \n"
+"consequential or incidental damages, the above limitation may not apply to "
+"you.  \n"
+"\n"
+"%s\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
 "The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
+"entities. %s\n"
+"Most of these licenses allow you to use, duplicate, adapt or redistribute "
+"the components which \n"
+"they cover. Please read carefully the terms and conditions of the license "
+"agreement for each component \n"
+"before using any component. Any question on a component license should be "
+"addressed to the component \n"
+"licensor or supplier and not to Mandriva.\n"
 "The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
 "by Mandriva S.A. is governed by a specific license. Please refer to the "
@@ -4694,9 +4742,9 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
-"parts, by all means and for all purposes.\n"
+"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"modify or adapt the Software \n"
+"Products, as a whole or in parts, by all means and for all purposes.\n"
 "\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
@@ -4717,7 +4765,55 @@ msgid ""
 "For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
-#: messages.pm:90
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: messages.pm:93
+#, c-format
+msgid ""
+"You agree not to (i) sell, export, re-export, transfer, divert, disclose "
+"technical data, or \n"
+"dispose of, any Software to any person, entity, or destination prohibited by "
+"US export laws \n"
+"or regulations including, without limitation, Cuba, Iran, North Korea, Sudan "
+"and Syria; or \n"
+"(ii) use any Software for any use prohibited by the laws or regulations of "
+"the United States.\n"
+"\n"
+"U.S. GOVERNMENT RESTRICTED RIGHTS. \n"
+"\n"
+"The Software Products and any accompanying documentation are and shall be "
+"deemed to be \n"
+"\"commercial computer software\" and \"commercial computer software "
+"documentation,\" respectively, \n"
+"as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, "
+"modification, reproduction, \n"
+"release, performance, display or disclosure of the Software and any "
+"accompanying documentation \n"
+"by the United States Government shall be governed solely by the terms of "
+"this Agreement and any \n"
+"other applicable licence agreements and shall be prohibited except to the "
+"extent expressly permitted \n"
+"by the terms of this Agreement."
+msgstr ""
+
+#: messages.pm:107
+#, c-format
+msgid ""
+"Most of these components, but excluding the applications and software "
+"provided by Google Inc. or \n"
+"its subsidiaries (\"Google Software\"), are governed under the terms and "
+"conditions of the GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:110
+#, c-format
+msgid ""
+"Most of these components are governed under the terms and conditions of the "
+"GNU \n"
+"General Public Licence, hereafter called \"GPL\", or of similar licenses."
+msgstr ""
+
+#: messages.pm:115
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -4729,67 +4825,55 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: messages.pm:98
-#, c-format
-msgid ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+#: messages.pm:123
+#, c-format
+msgid ""
+"6. Additional provisions applicable to those Software Products provided by "
+"Google Inc. (\"Google Software\")\n"
+"\n"
+"(a)  You acknowledge that Google or third parties own all rights, title and "
+"interest in and to the Google \n"
+"Software, portions thereof, or software provided through or in conjunction "
+"with the Google Software, including\n"
+"without limitation all Intellectual Property Rights. \"Intellectual Property "
+"Rights\" means any and all rights \n"
+"existing from time to time under patent law, copyright law, trade secret "
+"law, trademark law, unfair competition \n"
+"law, database rights and any and all other proprietary rights, and any and "
+"all applications, renewals, extensions \n"
+"and restorations thereof, now or hereafter in force and effect worldwide. "
+"You agree not to modify, adapt, \n"
+"translate, prepare derivative works from, decompile, reverse engineer, "
+"disassemble or otherwise attempt to derive \n"
+"source code from Google Software. You also agree to not remove, obscure, or "
+"alter Google's or any third party's \n"
+"copyright notice, trademarks, or other proprietary rights notices affixed to "
+"or contained within or accessed in \n"
+"conjunction with or through the Google Software.  \n"
+"\n"
+"(b)  The Google Software is made available to you for your personal, non-"
+"commercial use only.\n"
+"You may not use the Google Software in any manner that could damage, "
+"disable, overburden, or impair Google's \n"
+"search services (e.g., you may not use the Google Software in an automated "
+"manner), nor may you use Google \n"
+"Software in any manner that could interfere with any other party's use and "
+"enjoyment of Google's search services\n"
+"or the services and products of the third party licensors of the Google "
+"Software.\n"
+"\n"
+"(c)  Some of the Google Software is designed to be used in conjunction with "
+"Google's search and other services.\n"
+"Accordingly, your use of such Google Software is also defined by Google's "
+"Terms of Service located at \n"
+"http://www.google.com/terms_of_service.html and Google's Toolbar Privacy "
+"Policy located at \n"
+"http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n"
+"\n"
+"(d)  Google Inc. and each of its subsidiaries and affiliates are third party "
+"beneficiaries of this contract \n"
+"and may enforce its terms."
 msgstr ""
-"\n"
-"Warning\n"
-"\n"
-"Please read carefully the terms below. If you disagree with any\n"
-"portion, you are not allowed to install the next CD media. Press 'Refuse' \n"
-"to continue the installation without using these media.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: messages.pm:131
@@ -6516,6 +6600,67 @@ msgstr ""
 msgid "Installation failed"
 msgstr "安裝失敗"
 
+#~ msgid ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Warning\n"
+#~ "\n"
+#~ "Please read carefully the terms below. If you disagree with any\n"
+#~ "portion, you are not allowed to install the next CD media. Press "
+#~ "'Refuse' \n"
+#~ "to continue the installation without using these media.\n"
+#~ "\n"
+#~ "\n"
+#~ "Some components contained in the next CD media are not governed\n"
+#~ "by the GPL License or similar agreements. Each such component is then\n"
+#~ "governed by the terms and conditions of its own specific license. \n"
+#~ "Please read carefully and comply with such specific licenses before \n"
+#~ "you use or redistribute the said components. \n"
+#~ "Such licenses will in general prevent the transfer,  duplication \n"
+#~ "(except for backup purposes), redistribution, reverse engineering, \n"
+#~ "de-assembly, de-compilation or modification of the component. \n"
+#~ "Any breach of agreement will immediately terminate your rights under \n"
+#~ "the specific license. Unless the specific license terms grant you such\n"
+#~ "rights, you usually cannot install the programs on more than one\n"
+#~ "system, or adapt it to be used on a network. In doubt, please contact \n"
+#~ "directly the distributor or editor of the component. \n"
+#~ "Transfer to third parties or copying of such components including the \n"
+#~ "documentation is usually forbidden.\n"
+#~ "\n"
+#~ "\n"
+#~ "All rights to the components of the next CD media belong to their \n"
+#~ "respective authors and are protected by intellectual property and \n"
+#~ "copyright laws applicable to software programs.\n"
+
 #~ msgid "Use libsafe for servers"
 #~ msgstr "啟用「libsafe」防護功能"