sync with code

1 files changed, 96 insertions, 91 deletions

diff --git a/perl-install/share/po/libDrakX.pot b/perl-install/share/po/libDrakX.pot
index 2bdadb213..7cb082d78 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-08-12 17:53+0200\n"
+"POT-Creation-Date: 2008-08-18 18:01+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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: any.pm:245 diskdrake/interactive.pm:554 diskdrake/interactive.pm:741 diskdrake/interactive.pm:785 diskdrake/interactive.pm:843 diskdrake/interactive.pm:1133 do_pkgs.pm:220 do_pkgs.pm:262 harddrake/sound.pm:285 interactive.pm:580
+#: any.pm:245 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:580
 #, c-format
 msgid "Please wait"
 msgstr ""
@@ -471,7 +471,7 @@ msgstr ""
 msgid "Release Notes"
 msgstr ""
 
-#: any.pm:878 any.pm:1214 interactive/gtk.pm:766
+#: any.pm:878 any.pm:1217 interactive/gtk.pm:774
 #, c-format
 msgid "Close"
 msgstr ""
@@ -486,27 +486,27 @@ msgstr ""
 msgid "Quit"
 msgstr ""
 
-#: any.pm:923
+#: any.pm:925
 #, c-format
-msgid "Accept"
+msgid "Do you accept this license ?"
 msgstr ""
 
-#: any.pm:923
+#: any.pm:926
 #, c-format
-msgid "Refuse"
+msgid "Accept"
 msgstr ""
 
-#: any.pm:943 any.pm:1009
+#: any.pm:926
 #, c-format
-msgid "Please choose a language to use."
+msgid "Refuse"
 msgstr ""
 
-#: any.pm:944 any.pm:1010
+#: any.pm:947 any.pm:1012
 #, c-format
-msgid "Language choice"
+msgid "Please choose a language to use."
 msgstr ""
 
-#: any.pm:973
+#: any.pm:976
 #, c-format
 msgid ""
 "Mandriva Linux can support multiple languages. Select\n"
@@ -514,72 +514,77 @@ msgid ""
 "when your installation is complete and you restart your system."
 msgstr ""
 
-#: any.pm:976
+#: any.pm:979
 #, c-format
 msgid "Multi languages"
 msgstr ""
 
-#: any.pm:987 any.pm:1018
+#: any.pm:990 any.pm:1021
 #, c-format
 msgid "Old compatibility (non UTF-8) encoding"
 msgstr ""
 
-#: any.pm:989
+#: any.pm:992
 #, c-format
 msgid "All languages"
 msgstr ""
 
-#: any.pm:1065
+#: any.pm:1013
+#, c-format
+msgid "Language choice"
+msgstr ""
+
+#: any.pm:1068
 #, c-format
 msgid "Country / Region"
 msgstr ""
 
-#: any.pm:1066
+#: any.pm:1069
 #, c-format
 msgid "Please choose your country."
 msgstr ""
 
-#: any.pm:1068
+#: any.pm:1071
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr ""
 
-#: any.pm:1069
+#: any.pm:1072
 #, c-format
 msgid "Other Countries"
 msgstr ""
 
-#: any.pm:1069 interactive.pm:481
+#: any.pm:1072 interactive.pm:481
 #, c-format
 msgid "Advanced"
 msgstr ""
 
-#: any.pm:1075
+#: any.pm:1078
 #, c-format
 msgid "Input method:"
 msgstr ""
 
-#: any.pm:1078
+#: any.pm:1081
 #, c-format
 msgid "None"
 msgstr ""
 
-#: any.pm:1159
+#: any.pm:1162
 #, c-format
 msgid "No sharing"
 msgstr ""
 
-#: any.pm:1159
+#: any.pm:1162
 #, c-format
 msgid "Allow all users"
 msgstr ""
 
-#: any.pm:1159
+#: any.pm:1162
 #, c-format
 msgid "Custom"
 msgstr ""
 
-#: any.pm:1163
+#: any.pm:1166
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -589,79 +594,79 @@ msgid ""
 ""
 msgstr ""
 
-#: any.pm:1175
+#: any.pm:1178
 #, c-format
 msgid "NFS: the traditional Unix file sharing system, with less support on Mac and Windows."
 msgstr ""
 
-#: any.pm:1178
+#: any.pm:1181
 #, c-format
 msgid "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux systems."
 msgstr ""
 
-#: any.pm:1186
+#: any.pm:1189
 #, c-format
 msgid "You can export using NFS or SMB. Please select which you would like to use."
 msgstr ""
 
-#: any.pm:1214
+#: any.pm:1217
 #, c-format
 msgid "Launch userdrake"
 msgstr ""
 
-#: any.pm:1216
+#: any.pm:1219
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
 "You can use userdrake to add a user to this group."
 msgstr ""
 
-#: any.pm:1308
+#: any.pm:1311
 #, c-format
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr ""
 
-#: any.pm:1312
+#: any.pm:1315
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
 msgstr ""
 
-#: any.pm:1347
+#: any.pm:1350
 #, c-format
 msgid "Timezone"
 msgstr ""
 
-#: any.pm:1347
+#: any.pm:1350
 #, c-format
 msgid "Which is your timezone?"
 msgstr ""
 
-#: any.pm:1370 any.pm:1372
+#: any.pm:1373 any.pm:1375
 #, c-format
 msgid "Date, Clock & Time Zone Settings"
 msgstr ""
 
-#: any.pm:1373
+#: any.pm:1376
 #, c-format
 msgid "What is the best time?"
 msgstr ""
 
-#: any.pm:1377
+#: any.pm:1380
 #, c-format
 msgid "%s (hardware clock set to UTC)"
 msgstr ""
 
-#: any.pm:1378
+#: any.pm:1381
 #, c-format
 msgid "%s (hardware clock set to local time)"
 msgstr ""
 
-#: any.pm:1380
+#: any.pm:1383
 #, c-format
 msgid "NTP Server"
 msgstr ""
 
-#: any.pm:1381
+#: any.pm:1384
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr ""
@@ -1100,12 +1105,12 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
-#: diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:164 diskdrake/removable.pm:26 diskdrake/smbnfs_gtk.pm:82 interactive/http.pm:151
+#: diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:167 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:113 diskdrake/hd_gtk.pm:263 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
+#: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:113 diskdrake/hd_gtk.pm:265 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"
 msgstr ""
@@ -1140,6 +1145,11 @@ msgstr ""
 msgid "Partitioning"
 msgstr ""
 
+#: diskdrake/hd_gtk.pm:66
+#, c-format
+msgid "Click on a partition, choose a filesystem type then choose an action"
+msgstr ""
+
 #: diskdrake/hd_gtk.pm:93 diskdrake/interactive.pm:1010 diskdrake/interactive.pm:1020 diskdrake/interactive.pm:1073
 #, c-format
 msgid "Read carefully!"
@@ -1167,17 +1177,12 @@ msgid ""
 "at the beginning of the disk"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:160 interactive.pm:644 interactive/gtk.pm:744 interactive/gtk.pm:759 interactive/gtk.pm:779 ugtk2.pm:938 ugtk2.pm:939
+#: diskdrake/hd_gtk.pm:163 interactive.pm:644 interactive/gtk.pm:752 interactive/gtk.pm:767 interactive/gtk.pm:787 ugtk2.pm:942 ugtk2.pm:943
 #, c-format
 msgid "Help"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:195
-#, c-format
-msgid "Choose action"
-msgstr ""
-
-#: diskdrake/hd_gtk.pm:199
+#: diskdrake/hd_gtk.pm:201
 #, c-format
 msgid ""
 "You have one big Microsoft Windows partition.\n"
@@ -1185,92 +1190,92 @@ msgid ""
 "(click on it, then click on \"Resize\")"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:201
+#: diskdrake/hd_gtk.pm:203
 #, c-format
 msgid "Please click on a partition"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:215 diskdrake/smbnfs_gtk.pm:63
+#: diskdrake/hd_gtk.pm:217 diskdrake/smbnfs_gtk.pm:63
 #, c-format
 msgid "Details"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:263
+#: diskdrake/hd_gtk.pm:265
 #, c-format
 msgid "No hard drives found"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:290
+#: diskdrake/hd_gtk.pm:292
 #, c-format
 msgid "Unknown"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:352
+#: diskdrake/hd_gtk.pm:354
 #, c-format
 msgid "Ext3"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:352
+#: diskdrake/hd_gtk.pm:354
 #, c-format
 msgid "XFS"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:352
+#: diskdrake/hd_gtk.pm:354
 #, c-format
 msgid "Swap"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:352
+#: diskdrake/hd_gtk.pm:354
 #, c-format
 msgid "SunOS"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:352
+#: diskdrake/hd_gtk.pm:354
 #, c-format
 msgid "HFS"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:352
+#: diskdrake/hd_gtk.pm:354
 #, c-format
 msgid "Windows"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:353 services.pm:158
+#: diskdrake/hd_gtk.pm:355 services.pm:158
 #, c-format
 msgid "Other"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:353 diskdrake/interactive.pm:1195
+#: diskdrake/hd_gtk.pm:355 diskdrake/interactive.pm:1195
 #, c-format
 msgid "Empty"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:357
+#: diskdrake/hd_gtk.pm:362
 #, c-format
 msgid "Filesystem types:"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:381 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:383 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 ""
 
-#: diskdrake/hd_gtk.pm:381
+#: diskdrake/hd_gtk.pm:383
 #, c-format
 msgid "This partition is already empty"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:390
+#: diskdrake/hd_gtk.pm:392
 #, c-format
 msgid "Use ``Unmount'' first"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:390
+#: diskdrake/hd_gtk.pm:392
 #, c-format
 msgid "Use ``%s'' instead (in expert mode)"
 msgstr ""
 
-#: diskdrake/hd_gtk.pm:390 diskdrake/interactive.pm:374 diskdrake/interactive.pm:548 diskdrake/interactive.pm:1026 diskdrake/removable.pm:25 diskdrake/removable.pm:48
+#: diskdrake/hd_gtk.pm:392 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 ""
@@ -1979,7 +1984,7 @@ msgstr ""
 msgid "Change type"
 msgstr ""
 
-#: diskdrake/smbnfs_gtk.pm:81 interactive.pm:126 interactive.pm:543 interactive/curses.pm:260 interactive/http.pm:104 interactive/http.pm:160 interactive/stdio.pm:39 interactive/stdio.pm:148 ugtk2.pm:409 ugtk2.pm:511 ugtk2.pm:520 ugtk2.pm:803
+#: diskdrake/smbnfs_gtk.pm:81 interactive.pm:126 interactive.pm:543 interactive/curses.pm:260 interactive/http.pm:104 interactive/http.pm:160 interactive/stdio.pm:39 interactive/stdio.pm:148 ugtk2.pm:411 ugtk2.pm:513 ugtk2.pm:522 ugtk2.pm:807
 #, c-format
 msgid "Cancel"
 msgstr ""
@@ -2051,12 +2056,12 @@ msgid ""
 ""
 msgstr ""
 
-#: do_pkgs.pm:220
+#: do_pkgs.pm:221
 #, c-format
 msgid "Installing packages..."
 msgstr ""
 
-#: do_pkgs.pm:262
+#: do_pkgs.pm:267
 #, c-format
 msgid "Removing packages..."
 msgstr ""
@@ -2364,7 +2369,7 @@ msgid ""
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: fs/partitioning_wizard.pm:165 interactive.pm:542 interactive/curses.pm:263 ugtk2.pm:513
+#: fs/partitioning_wizard.pm:165 interactive.pm:542 interactive/curses.pm:263 ugtk2.pm:515
 #, c-format
 msgid "Next"
 msgstr ""
@@ -3005,17 +3010,17 @@ msgstr ""
 msgid "Tuner type:"
 msgstr ""
 
-#: interactive.pm:125 interactive.pm:542 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:415 ugtk2.pm:513 ugtk2.pm:803 ugtk2.pm:826
+#: interactive.pm:125 interactive.pm:542 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:417 ugtk2.pm:515 ugtk2.pm:807 ugtk2.pm:830
 #, c-format
 msgid "Ok"
 msgstr ""
 
-#: interactive.pm:224 modules/interactive.pm:71 ugtk2.pm:802 wizards.pm:156
+#: interactive.pm:224 modules/interactive.pm:71 ugtk2.pm:806 wizards.pm:156
 #, c-format
 msgid "Yes"
 msgstr ""
 
-#: interactive.pm:224 modules/interactive.pm:71 ugtk2.pm:802 wizards.pm:156
+#: interactive.pm:224 modules/interactive.pm:71 ugtk2.pm:806 wizards.pm:156
 #, c-format
 msgid "No"
 msgstr ""
@@ -3025,32 +3030,32 @@ msgstr ""
 msgid "Choose a file"
 msgstr ""
 
-#: interactive.pm:383 interactive/gtk.pm:420
+#: interactive.pm:383 interactive/gtk.pm:428
 #, c-format
 msgid "Add"
 msgstr ""
 
-#: interactive.pm:383 interactive/gtk.pm:420
+#: interactive.pm:383 interactive/gtk.pm:428
 #, c-format
 msgid "Modify"
 msgstr ""
 
-#: interactive.pm:383 interactive/gtk.pm:420
+#: interactive.pm:383 interactive/gtk.pm:428
 #, c-format
 msgid "Remove"
 msgstr ""
 
-#: interactive.pm:542 interactive/curses.pm:263 ugtk2.pm:513
+#: interactive.pm:542 interactive/curses.pm:263 ugtk2.pm:515
 #, c-format
 msgid "Finish"
 msgstr ""
 
-#: interactive.pm:543 interactive/curses.pm:260 ugtk2.pm:511
+#: interactive.pm:543 interactive/curses.pm:260 ugtk2.pm:513
 #, c-format
 msgid "Previous"
 msgstr ""
 
-#: interactive/gtk.pm:548
+#: interactive/gtk.pm:556
 #, c-format
 msgid "Beware, Caps Lock is enabled"
 msgstr ""
@@ -5721,7 +5726,7 @@ msgid ""
 "about this service, sorry."
 msgstr ""
 
-#: services.pm:221 ugtk2.pm:913
+#: services.pm:221 ugtk2.pm:917
 #, c-format
 msgid "Info"
 msgstr ""
@@ -5955,47 +5960,47 @@ msgstr ""
 msgid "Yugoslavia"
 msgstr ""
 
-#: ugtk2.pm:803
+#: ugtk2.pm:807
 #, c-format
 msgid "Is this correct?"
 msgstr ""
 
-#: ugtk2.pm:863
+#: ugtk2.pm:867
 #, c-format
 msgid "No file chosen"
 msgstr ""
 
-#: ugtk2.pm:865
+#: ugtk2.pm:869
 #, c-format
 msgid "You have chosen a file, not a directory"
 msgstr ""
 
-#: ugtk2.pm:867
+#: ugtk2.pm:871
 #, c-format
 msgid "You have chosen a directory, not a file"
 msgstr ""
 
-#: ugtk2.pm:869
+#: ugtk2.pm:873
 #, c-format
 msgid "No such directory"
 msgstr ""
 
-#: ugtk2.pm:869
+#: ugtk2.pm:873
 #, c-format
 msgid "No such file"
 msgstr ""
 
-#: ugtk2.pm:948
+#: ugtk2.pm:952
 #, c-format
 msgid "Expand Tree"
 msgstr ""
 
-#: ugtk2.pm:949
+#: ugtk2.pm:953
 #, c-format
 msgid "Collapse Tree"
 msgstr ""
 
-#: ugtk2.pm:950
+#: ugtk2.pm:954
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr ""