update pot file and merge with po files

5 files changed, 699 insertions, 329 deletions

diff --git a/po/es.po b/po/es.po
index 55884d4..2395996 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: transfugdrake 0.2\n"
-"POT-Creation-Date: 2002-11-28 14:34+0100\n"
+"POT-Creation-Date: 2007-09-04 23:17+0200\n"
 "PO-Revision-Date: 2002-02-21 15:00-0300\n"
 "Last-Translator: Fabian Mandelbaum <fabman@mandrakesoft.com>\n"
 "Language-Team: spanish <i18n@mandrakesoft.com>\n"
@@ -12,95 +12,143 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../transfugdrake.pm_.c:98
-msgid "No Windows Partition"
+#: ../transfugdrake:37
+#, c-format
+msgid "Migration wizard"
 msgstr ""
 
-#: ../transfugdrake.pm_.c:98
-msgid "No Windows Partition found"
+#: ../transfugdrake:40
+#, c-format
+msgid ""
+"This wizard will help you to import Windows documents and settings in your %"
+"s distribution."
 msgstr ""
 
-#: ../transfugdrake.pm_.c:100
-msgid "Select your windows partition"
+#: ../transfugdrake:40
+#, c-format
+msgid ""
+"It allows two differents migration methods: you can either import all "
+"documents and settings by copying them, or share them between operating "
+"systems."
 msgstr ""
 
-#: ../transfugdrake.pm_.c:101
-msgid "Please specify your windows partition from the following list"
+#: ../transfugdrake:49
+#, c-format
+msgid ""
+"Multiple users have been detected, please select a user in the list below."
 msgstr ""
 
-#: ../transfugdrake.pm_.c:105
-msgid "$fat_parts[0] is found as your Windows partition"
+#: ../transfugdrake:52
+#, c-format
+msgid "Windows user"
 msgstr ""
 
-#: ../transfugdrake.pm_.c:105
-msgid "Your Windows Partition"
+#: ../transfugdrake:58
+#, c-format
+msgid "Linux user"
 msgstr ""
 
-#: ../transfugdrake_.c:64 ../transfugdrake_.c:83 ../transfugdrake_.c:156
-#: ../transfugdrake_.c:194 ../transfugdrake_.c:214
-msgid "Transfugdrake"
+#: ../transfugdrake:72
+#, c-format
+msgid ""
+"You can migrate Windows documents to your home directory. Documents can be "
+"imported by copying them, or they can be shared with the other operating "
+"system"
 msgstr ""
 
-#: ../transfugdrake_.c:84
-msgid ""
-"Welcome to Transfugdrake! I will help you to ease the step windows-linux\n"
-"by migrating your documents, mails and address books"
+#: ../transfugdrake:78
+#, c-format
+msgid "Import documents (recommended)"
 msgstr ""
 
-#: ../transfugdrake_.c:107
-msgid "Can't find documents folder!"
+#: ../transfugdrake:79
+#, fuzzy, c-format
+msgid "Share documents"
+msgstr "Mis Documentos"
+
+#: ../transfugdrake:80 ../transfugdrake:100 ../transfugdrake:119
+#, c-format
+msgid "Skip step"
 msgstr ""
 
-#: ../transfugdrake_.c:108
-msgid "Can't find the folder where the documents are located. Exiting..."
+#: ../transfugdrake:85
+#, c-format
+msgid "Migration of documents in progress"
 msgstr ""
 
-#: ../transfugdrake_.c:135
-msgid "No mail migration available"
+#: ../transfugdrake:91
+#, c-format
+msgid "You can migrate browser bookmarks."
 msgstr ""
 
-#: ../transfugdrake_.c:136
-msgid ""
-"Warning: Windows XP detected. No mail migration available yet for your "
-"Windows version."
+#: ../transfugdrake:97
+#, c-format
+msgid "Import bookmarks (recommended)"
 msgstr ""
 
-#: ../transfugdrake_.c:151
-msgid "No user found!"
+#: ../transfugdrake:99
+#, c-format
+msgid "Share bookmarks"
 msgstr ""
 
-#: ../transfugdrake_.c:152
-msgid ""
-"Can't find any user on your Windows partition. Will copy all documents from "
-"Windows"
+#: ../transfugdrake:105
+#, c-format
+msgid "Migration of bookmarks in progress"
 msgstr ""
 
-#: ../transfugdrake_.c:157
-msgid ""
-"You have the following users in Windows. Which one do you want to use for "
-"migration?"
+#: ../transfugdrake:111
+#, c-format
+msgid "You can migrate mail bookmarks."
 msgstr ""
 
-#: ../transfugdrake_.c:195
-msgid ""
-"Welcome to TransfugDrake! You are now able to ease\n"
-" the step Windows-Linux with many migrations. Please choose what you\n"
-" want to do:"
+#: ../transfugdrake:116
+#, c-format
+msgid "Import mail (recommended)"
 msgstr ""
 
-#: ../transfugdrake_.c:215
-msgid "Do you want to copy other files from another folder?"
+#: ../transfugdrake:118
+#, c-format
+msgid "Share mail"
 msgstr ""
 
-#: ../transfugdrake_.c:225
-msgid "Transfug"
+#: ../transfugdrake:124
+#, c-format
+msgid "Migration of mail in progress"
 msgstr ""
 
-#: ../transfugdrake_.c:226
-msgid ""
-"We will bring back your Outlook Mailboxes to a standard unix mbox\n"
-"\n"
-"NB: This feature works only with Outlook Express 4.5 and 5"
+#: ../transfugdrake:130
+#, c-format
+msgid "You can migrate your desktop background."
+msgstr ""
+
+#: ../transfugdrake:135
+#, c-format
+msgid "Use Mandriva background"
+msgstr ""
+
+#: ../transfugdrake:136
+#, c-format
+msgid "Import background"
+msgstr ""
+
+#: ../transfugdrake:141
+#, c-format
+msgid "Migration of background in progress"
+msgstr ""
+
+#: ../transfugdrake:147
+#, c-format
+msgid "Congratulations, your migration is now completed!"
+msgstr ""
+
+#: ../transfugdrake:151
+#, c-format
+msgid "No Windows installation has been detected."
+msgstr ""
+
+#: ../transfugdrake:155
+#, c-format
+msgid "No documents and settings have been detected."
 msgstr ""
 
 #~ msgid "Copying files..."
@@ -112,9 +160,6 @@ msgstr ""
 #~ "Copiando todos los archivos de $source a $dest. Esto puede tomar varios "
 #~ "minutos."
 
-#~ msgid "My Documents"
-#~ msgstr "Mis Documentos"
-
 #~ msgid "Documents and Settings"
 #~ msgstr "Documents and Settings"
 
diff --git a/po/et.po b/po/et.po
index 633cc15..d44697f 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: transfugdrake\n"
-"POT-Creation-Date: 2002-11-28 14:34+0100\n"
+"POT-Creation-Date: 2007-09-04 23:17+0200\n"
 "PO-Revision-Date: 2007-08-14 18:57+0200\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <linux-ee@lists.eenet.ee>\n"
@@ -14,109 +14,229 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../transfugdrake.pm_.c:98
-msgid "No Windows Partition"
-msgstr "Windowsi partitsioon puudub"
-
-#: ../transfugdrake.pm_.c:98
-msgid "No Windows Partition found"
-msgstr "Windowsi partitsiooni ei leitud"
+#: ../transfugdrake:37
+#, c-format
+msgid "Migration wizard"
+msgstr ""
 
-#: ../transfugdrake.pm_.c:100
-msgid "Select your windows partition"
-msgstr "Valige Windowsi partitsioon"
+#: ../transfugdrake:40
+#, c-format
+msgid ""
+"This wizard will help you to import Windows documents and settings in your %"
+"s distribution."
+msgstr ""
 
-#: ../transfugdrake.pm_.c:101
-msgid "Please specify your windows partition from the following list"
-msgstr "Palun täpsustage oma Windowsi partitsioon järgnevast loendist"
+#: ../transfugdrake:40
+#, c-format
+msgid ""
+"It allows two differents migration methods: you can either import all "
+"documents and settings by copying them, or share them between operating "
+"systems."
+msgstr ""
 
-#: ../transfugdrake.pm_.c:105
-msgid "$fat_parts[0] is found as your Windows partition"
-msgstr "Windowsi partitsioonina leiti $fat_parts[0]"
+#: ../transfugdrake:49
+#, c-format
+msgid ""
+"Multiple users have been detected, please select a user in the list below."
+msgstr ""
 
-#: ../transfugdrake.pm_.c:105
-msgid "Your Windows Partition"
-msgstr "Teie Windowsi partitsioon"
+#: ../transfugdrake:52
+#, c-format
+msgid "Windows user"
+msgstr ""
 
-#: ../transfugdrake_.c:64 ../transfugdrake_.c:83 ../transfugdrake_.c:156
-#: ../transfugdrake_.c:194 ../transfugdrake_.c:214
-msgid "Transfugdrake"
-msgstr "Kolimisdrake"
+#: ../transfugdrake:58
+#, c-format
+msgid "Linux user"
+msgstr ""
 
-#: ../transfugdrake_.c:84
+#: ../transfugdrake:72
+#, c-format
 msgid ""
-"Welcome to Transfugdrake! I will help you to ease the step windows-linux\n"
-"by migrating your documents, mails and address books"
+"You can migrate Windows documents to your home directory. Documents can be "
+"imported by copying them, or they can be shared with the other operating "
+"system"
 msgstr ""
-"KolimisDrake tervitab Teid! See rakendus aitab teil hõlpsamini kolida\n"
-"Windowsist Linuxisse oma dokumendid, kirjad ja aadressiraamatud"
 
-#: ../transfugdrake_.c:107
-msgid "Can't find documents folder!"
-msgstr "Dokumentide kataloogi ei leitud!"
+#: ../transfugdrake:78
+#, c-format
+msgid "Import documents (recommended)"
+msgstr ""
 
-#: ../transfugdrake_.c:108
-msgid "Can't find the folder where the documents are located. Exiting..."
+#: ../transfugdrake:79
+#, c-format
+msgid "Share documents"
 msgstr ""
-"Ei õnnestunud leida kataloogi, kus asuvad dokumendid. Seetõttu loobutakse..."
 
-#: ../transfugdrake_.c:135
-msgid "No mail migration available"
-msgstr "Kirjade kolimine ei ole võimalik"
+#: ../transfugdrake:80 ../transfugdrake:100 ../transfugdrake:119
+#, c-format
+msgid "Skip step"
+msgstr ""
 
-#: ../transfugdrake_.c:136
-msgid ""
-"Warning: Windows XP detected. No mail migration available yet for your "
-"Windows version."
+#: ../transfugdrake:85
+#, c-format
+msgid "Migration of documents in progress"
 msgstr ""
-"Hoiatus: tuvastati Windows XP. Teie Windowsi versiooni puhul ei ole kirjade "
-"kolimine toetatud."
 
-#: ../transfugdrake_.c:151
-msgid "No user found!"
-msgstr "Ãœhtegi kasutajat ei leitud!"
+#: ../transfugdrake:91
+#, c-format
+msgid "You can migrate browser bookmarks."
+msgstr ""
 
-#: ../transfugdrake_.c:152
-msgid ""
-"Can't find any user on your Windows partition. Will copy all documents from "
-"Windows"
+#: ../transfugdrake:97
+#, c-format
+msgid "Import bookmarks (recommended)"
 msgstr ""
-"Windowsi partitsioonilt ei leitud ühtegi kasutajat. Windowsist kopeeritakse "
-"kõik dokumendid"
 
-#: ../transfugdrake_.c:157
-msgid ""
-"You have the following users in Windows. Which one do you want to use for "
-"migration?"
+#: ../transfugdrake:99
+#, c-format
+msgid "Share bookmarks"
 msgstr ""
-"Windowsis on olemas järgmised kasutajad. Millist neist kasutada kolimisel?"
 
-#: ../transfugdrake_.c:195
-msgid ""
-"Welcome to TransfugDrake! You are now able to ease\n"
-" the step Windows-Linux with many migrations. Please choose what you\n"
-" want to do:"
+#: ../transfugdrake:105
+#, c-format
+msgid "Migration of bookmarks in progress"
 msgstr ""
-"KolimisDrake tervitab Teid! Selle rakenduse abiga saate hõlpsasti\n"
-" siirduda Windowsist Linuxisse. Palun valige, mida soovite ette võtta:"
 
-#: ../transfugdrake_.c:215
-msgid "Do you want to copy other files from another folder?"
-msgstr "Kas soovite kopeerida muid faile muust kataloogist?"
+#: ../transfugdrake:111
+#, c-format
+msgid "You can migrate mail bookmarks."
+msgstr ""
 
-#: ../transfugdrake_.c:225
-msgid "Transfug"
-msgstr "Kolija"
+#: ../transfugdrake:116
+#, c-format
+msgid "Import mail (recommended)"
+msgstr ""
 
-#: ../transfugdrake_.c:226
-msgid ""
-"We will bring back your Outlook Mailboxes to a standard unix mbox\n"
-"\n"
-"NB: This feature works only with Outlook Express 4.5 and 5"
+#: ../transfugdrake:118
+#, c-format
+msgid "Share mail"
+msgstr ""
+
+#: ../transfugdrake:124
+#, c-format
+msgid "Migration of mail in progress"
+msgstr ""
+
+#: ../transfugdrake:130
+#, c-format
+msgid "You can migrate your desktop background."
+msgstr ""
+
+#: ../transfugdrake:135
+#, c-format
+msgid "Use Mandriva background"
+msgstr ""
+
+#: ../transfugdrake:136
+#, c-format
+msgid "Import background"
+msgstr ""
+
+#: ../transfugdrake:141
+#, c-format
+msgid "Migration of background in progress"
+msgstr ""
+
+#: ../transfugdrake:147
+#, c-format
+msgid "Congratulations, your migration is now completed!"
+msgstr ""
+
+#: ../transfugdrake:151
+#, c-format
+msgid "No Windows installation has been detected."
 msgstr ""
-"Outlooki meiliboksid muudetakse standardseteks UNIX-i mbox-ideks\n"
-"\n"
-"NB: see toimib ainult Outlook Express 4.5 ja 5 korral"
+
+#: ../transfugdrake:155
+#, c-format
+msgid "No documents and settings have been detected."
+msgstr ""
+
+#~ msgid "No Windows Partition"
+#~ msgstr "Windowsi partitsioon puudub"
+
+#~ msgid "No Windows Partition found"
+#~ msgstr "Windowsi partitsiooni ei leitud"
+
+#~ msgid "Select your windows partition"
+#~ msgstr "Valige Windowsi partitsioon"
+
+#~ msgid "Please specify your windows partition from the following list"
+#~ msgstr "Palun täpsustage oma Windowsi partitsioon järgnevast loendist"
+
+#~ msgid "$fat_parts[0] is found as your Windows partition"
+#~ msgstr "Windowsi partitsioonina leiti $fat_parts[0]"
+
+#~ msgid "Your Windows Partition"
+#~ msgstr "Teie Windowsi partitsioon"
+
+#~ msgid "Transfugdrake"
+#~ msgstr "Kolimisdrake"
+
+#~ msgid ""
+#~ "Welcome to Transfugdrake! I will help you to ease the step windows-linux\n"
+#~ "by migrating your documents, mails and address books"
+#~ msgstr ""
+#~ "KolimisDrake tervitab Teid! See rakendus aitab teil hõlpsamini kolida\n"
+#~ "Windowsist Linuxisse oma dokumendid, kirjad ja aadressiraamatud"
+
+#~ msgid "Can't find documents folder!"
+#~ msgstr "Dokumentide kataloogi ei leitud!"
+
+#~ msgid "Can't find the folder where the documents are located. Exiting..."
+#~ msgstr ""
+#~ "Ei õnnestunud leida kataloogi, kus asuvad dokumendid. Seetõttu "
+#~ "loobutakse..."
+
+#~ msgid "No mail migration available"
+#~ msgstr "Kirjade kolimine ei ole võimalik"
+
+#~ msgid ""
+#~ "Warning: Windows XP detected. No mail migration available yet for your "
+#~ "Windows version."
+#~ msgstr ""
+#~ "Hoiatus: tuvastati Windows XP. Teie Windowsi versiooni puhul ei ole "
+#~ "kirjade kolimine toetatud."
+
+#~ msgid "No user found!"
+#~ msgstr "Ãœhtegi kasutajat ei leitud!"
+
+#~ msgid ""
+#~ "Can't find any user on your Windows partition. Will copy all documents "
+#~ "from Windows"
+#~ msgstr ""
+#~ "Windowsi partitsioonilt ei leitud ühtegi kasutajat. Windowsist "
+#~ "kopeeritakse kõik dokumendid"
+
+#~ msgid ""
+#~ "You have the following users in Windows. Which one do you want to use for "
+#~ "migration?"
+#~ msgstr ""
+#~ "Windowsis on olemas järgmised kasutajad. Millist neist kasutada kolimisel?"
+
+#~ msgid ""
+#~ "Welcome to TransfugDrake! You are now able to ease\n"
+#~ " the step Windows-Linux with many migrations. Please choose what you\n"
+#~ " want to do:"
+#~ msgstr ""
+#~ "KolimisDrake tervitab Teid! Selle rakenduse abiga saate hõlpsasti\n"
+#~ " siirduda Windowsist Linuxisse. Palun valige, mida soovite ette võtta:"
+
+#~ msgid "Do you want to copy other files from another folder?"
+#~ msgstr "Kas soovite kopeerida muid faile muust kataloogist?"
+
+#~ msgid "Transfug"
+#~ msgstr "Kolija"
+
+#~ msgid ""
+#~ "We will bring back your Outlook Mailboxes to a standard unix mbox\n"
+#~ "\n"
+#~ "NB: This feature works only with Outlook Express 4.5 and 5"
+#~ msgstr ""
+#~ "Outlooki meiliboksid muudetakse standardseteks UNIX-i mbox-ideks\n"
+#~ "\n"
+#~ "NB: see toimib ainult Outlook Express 4.5 ja 5 korral"
 
 #~ msgid "), 1) or goto step_7;"
 #~ msgstr "), 1) või edasi samm_7 juurde;"
diff --git a/po/fr.po b/po/fr.po
index d17e2b5..9d18547 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: transfugdrake 0.2\n"
-"POT-Creation-Date: 2002-11-28 14:34+0100\n"
+"POT-Creation-Date: 2007-09-04 23:17+0200\n"
 "PO-Revision-Date: 2002-01-10 09:49+0500\n"
 "Last-Translator: Christian Belisle <cbelisle@mandrakesoft.com>\n"
 "Language-Team: francais <i18n@mandrakesoft.com>\n"
@@ -12,99 +12,144 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../transfugdrake.pm_.c:98
-msgid "No Windows Partition"
+#: ../transfugdrake:37
+#, c-format
+msgid "Migration wizard"
 msgstr ""
 
-#: ../transfugdrake.pm_.c:98
-msgid "No Windows Partition found"
+#: ../transfugdrake:40
+#, c-format
+msgid ""
+"This wizard will help you to import Windows documents and settings in your %"
+"s distribution."
 msgstr ""
 
-#: ../transfugdrake.pm_.c:100
-msgid "Select your windows partition"
+#: ../transfugdrake:40
+#, c-format
+msgid ""
+"It allows two differents migration methods: you can either import all "
+"documents and settings by copying them, or share them between operating "
+"systems."
 msgstr ""
 
-#: ../transfugdrake.pm_.c:101
-msgid "Please specify your windows partition from the following list"
+#: ../transfugdrake:49
+#, c-format
+msgid ""
+"Multiple users have been detected, please select a user in the list below."
 msgstr ""
 
-#: ../transfugdrake.pm_.c:105
-msgid "$fat_parts[0] is found as your Windows partition"
+#: ../transfugdrake:52
+#, c-format
+msgid "Windows user"
 msgstr ""
 
-#: ../transfugdrake.pm_.c:105
-msgid "Your Windows Partition"
+#: ../transfugdrake:58
+#, c-format
+msgid "Linux user"
 msgstr ""
 
-#: ../transfugdrake_.c:64 ../transfugdrake_.c:83 ../transfugdrake_.c:156
-#: ../transfugdrake_.c:194 ../transfugdrake_.c:214
-msgid "Transfugdrake"
+#: ../transfugdrake:72
+#, c-format
+msgid ""
+"You can migrate Windows documents to your home directory. Documents can be "
+"imported by copying them, or they can be shared with the other operating "
+"system"
 msgstr ""
 
-#: ../transfugdrake_.c:84
-msgid ""
-"Welcome to Transfugdrake! I will help you to ease the step windows-linux\n"
-"by migrating your documents, mails and address books"
+#: ../transfugdrake:78
+#, c-format
+msgid "Import documents (recommended)"
 msgstr ""
 
-#: ../transfugdrake_.c:107
-msgid "Can't find documents folder!"
+#: ../transfugdrake:79
+#, fuzzy, c-format
+msgid "Share documents"
+msgstr "Mes Documents"
+
+#: ../transfugdrake:80 ../transfugdrake:100 ../transfugdrake:119
+#, c-format
+msgid "Skip step"
 msgstr ""
 
-#: ../transfugdrake_.c:108
-msgid "Can't find the folder where the documents are located. Exiting..."
+#: ../transfugdrake:85
+#, c-format
+msgid "Migration of documents in progress"
 msgstr ""
 
-#: ../transfugdrake_.c:135
-msgid "No mail migration available"
+#: ../transfugdrake:91
+#, c-format
+msgid "You can migrate browser bookmarks."
 msgstr ""
 
-#: ../transfugdrake_.c:136
-msgid ""
-"Warning: Windows XP detected. No mail migration available yet for your "
-"Windows version."
+#: ../transfugdrake:97
+#, c-format
+msgid "Import bookmarks (recommended)"
 msgstr ""
 
-#: ../transfugdrake_.c:151
-msgid "No user found!"
+#: ../transfugdrake:99
+#, c-format
+msgid "Share bookmarks"
 msgstr ""
 
-#: ../transfugdrake_.c:152
-msgid ""
-"Can't find any user on your Windows partition. Will copy all documents from "
-"Windows"
+#: ../transfugdrake:105
+#, c-format
+msgid "Migration of bookmarks in progress"
 msgstr ""
 
-#: ../transfugdrake_.c:157
-msgid ""
-"You have the following users in Windows. Which one do you want to use for "
-"migration?"
+#: ../transfugdrake:111
+#, c-format
+msgid "You can migrate mail bookmarks."
 msgstr ""
 
-#: ../transfugdrake_.c:195
-msgid ""
-"Welcome to TransfugDrake! You are now able to ease\n"
-" the step Windows-Linux with many migrations. Please choose what you\n"
-" want to do:"
+#: ../transfugdrake:116
+#, c-format
+msgid "Import mail (recommended)"
 msgstr ""
 
-#: ../transfugdrake_.c:215
-msgid "Do you want to copy other files from another folder?"
+#: ../transfugdrake:118
+#, c-format
+msgid "Share mail"
 msgstr ""
 
-#: ../transfugdrake_.c:225
-msgid "Transfug"
+#: ../transfugdrake:124
+#, c-format
+msgid "Migration of mail in progress"
 msgstr ""
 
-#: ../transfugdrake_.c:226
-msgid ""
-"We will bring back your Outlook Mailboxes to a standard unix mbox\n"
-"\n"
-"NB: This feature works only with Outlook Express 4.5 and 5"
+#: ../transfugdrake:130
+#, c-format
+msgid "You can migrate your desktop background."
 msgstr ""
 
-#~ msgid "My Documents"
-#~ msgstr "Mes Documents"
+#: ../transfugdrake:135
+#, c-format
+msgid "Use Mandriva background"
+msgstr ""
+
+#: ../transfugdrake:136
+#, c-format
+msgid "Import background"
+msgstr ""
+
+#: ../transfugdrake:141
+#, c-format
+msgid "Migration of background in progress"
+msgstr ""
+
+#: ../transfugdrake:147
+#, c-format
+msgid "Congratulations, your migration is now completed!"
+msgstr ""
+
+#: ../transfugdrake:151
+#, c-format
+msgid "No Windows installation has been detected."
+msgstr ""
+
+#: ../transfugdrake:155
+#, c-format
+msgid "No documents and settings have been detected."
+msgstr ""
 
 #~ msgid "Documents and Settings"
 #~ msgstr "Documents and Settings"
diff --git a/po/pl.po b/po/pl.po
index b582c15..c7eb028 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: transfugdrake\n"
-"POT-Creation-Date: 2002-11-28 14:34+0100\n"
+"POT-Creation-Date: 2007-09-04 23:17+0200\n"
 "PO-Revision-Date: 2002-04-15 03:00+0100\n"
 "Last-Translator: Arkadiusz Lipiec <alipiec@elka.pw.edu.pl>\n"
 "Language-Team: polish <pl@li.org>\n"
@@ -13,108 +13,228 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../transfugdrake.pm_.c:98
-msgid "No Windows Partition"
-msgstr "Brak partycji Windows"
-
-#: ../transfugdrake.pm_.c:98
-msgid "No Windows Partition found"
-msgstr "Nie znaleziono partycji Windows"
+#: ../transfugdrake:37
+#, c-format
+msgid "Migration wizard"
+msgstr ""
 
-#: ../transfugdrake.pm_.c:100
-msgid "Select your windows partition"
-msgstr "Wybierz partycjê systemu windows"
+#: ../transfugdrake:40
+#, c-format
+msgid ""
+"This wizard will help you to import Windows documents and settings in your %"
+"s distribution."
+msgstr ""
 
-#: ../transfugdrake.pm_.c:101
-msgid "Please specify your windows partition from the following list"
-msgstr "Wybierz partycjê windows z poni¿szej listy"
+#: ../transfugdrake:40
+#, c-format
+msgid ""
+"It allows two differents migration methods: you can either import all "
+"documents and settings by copying them, or share them between operating "
+"systems."
+msgstr ""
 
-#: ../transfugdrake.pm_.c:105
-msgid "$fat_parts[0] is found as your Windows partition"
-msgstr "$fat_parts[0] to twoja partycja Windows"
+#: ../transfugdrake:49
+#, c-format
+msgid ""
+"Multiple users have been detected, please select a user in the list below."
+msgstr ""
 
-#: ../transfugdrake.pm_.c:105
-msgid "Your Windows Partition"
-msgstr "Twoje partycje Windows"
+#: ../transfugdrake:52
+#, c-format
+msgid "Windows user"
+msgstr ""
 
-#: ../transfugdrake_.c:64 ../transfugdrake_.c:83 ../transfugdrake_.c:156
-#: ../transfugdrake_.c:194 ../transfugdrake_.c:214
-msgid "Transfugdrake"
-msgstr "Transfugdrake"
+#: ../transfugdrake:58
+#, c-format
+msgid "Linux user"
+msgstr ""
 
-#: ../transfugdrake_.c:84
+#: ../transfugdrake:72
+#, c-format
 msgid ""
-"Welcome to Transfugdrake! I will help you to ease the step windows-linux\n"
-"by migrating your documents, mails and address books"
-msgstr "Witaj w Transfugdrake! Program u³atwi ci podjêcie kroku windows-linux"
-"poprzez migracjê twoich dokuemntów, poczty i ksi±¿ek adresowych"
+"You can migrate Windows documents to your home directory. Documents can be "
+"imported by copying them, or they can be shared with the other operating "
+"system"
+msgstr ""
 
-#: ../transfugdrake_.c:107
-msgid "Can't find documents folder!"
-msgstr "Nie mo¿na znale¼æ foldera dokumentów!"
+#: ../transfugdrake:78
+#, c-format
+msgid "Import documents (recommended)"
+msgstr ""
 
-#: ../transfugdrake_.c:108
-msgid "Can't find the folder where the documents are located. Exiting..."
+#: ../transfugdrake:79
+#, c-format
+msgid "Share documents"
 msgstr ""
-"Nie mo¿na znale¼æ foldera, w którym znajduj± siê dokumenty. Wychodzenie..."
 
-#: ../transfugdrake_.c:135
-msgid "No mail migration available"
-msgstr "Migracja poczty nie jest dostêpna"
+#: ../transfugdrake:80 ../transfugdrake:100 ../transfugdrake:119
+#, c-format
+msgid "Skip step"
+msgstr ""
 
-#: ../transfugdrake_.c:136
-msgid ""
-"Warning: Windows XP detected. No mail migration available yet for your "
-"Windows version."
+#: ../transfugdrake:85
+#, c-format
+msgid "Migration of documents in progress"
 msgstr ""
-"Ostrze¿enie: wykryto Windows XP. Dla tej wersji Windows nie jest jeszcze "
-"dostêpna migracja poczty"
 
-#: ../transfugdrake_.c:151
-msgid "No user found!"
-msgstr "Nie znaleziono u¿ytkownika!"
+#: ../transfugdrake:91
+#, c-format
+msgid "You can migrate browser bookmarks."
+msgstr ""
 
-#: ../transfugdrake_.c:152
-msgid ""
-"Can't find any user on your Windows partition. Will copy all documents from "
-"Windows"
+#: ../transfugdrake:97
+#, c-format
+msgid "Import bookmarks (recommended)"
 msgstr ""
-"Nie mo¿na znale¼æ ¿adnego u¿ytkownika na partycji Windows. Skopiowane "
-"zostan± wszystkie dokumenty z Windows"
 
-#: ../transfugdrake_.c:157
-msgid ""
-"You have the following users in Windows. Which one do you want to use for "
-"migration?"
+#: ../transfugdrake:99
+#, c-format
+msgid "Share bookmarks"
 msgstr ""
-"Nastêpuj±cy u¿ytkownicy s± zdefiniowani w systemie Windows. Dla których z "
-"nich ma byæ dokonana migracja?"
 
-#: ../transfugdrake_.c:195
-msgid ""
-"Welcome to TransfugDrake! You are now able to ease\n"
-" the step Windows-Linux with many migrations. Please choose what you\n"
-" want to do:"
+#: ../transfugdrake:105
+#, c-format
+msgid "Migration of bookmarks in progress"
 msgstr ""
-"Witaj w TransfugDrake! Mo¿na uruchomiæ procedurê migracji\n"
-"miêdzy systemami Windows i Linux. Wybierz czynno¶æ,\n"
-"któr ma byæ wykonana:"
 
-#: ../transfugdrake_.c:215
-msgid "Do you want to copy other files from another folder?"
-msgstr "Czy chcesz skopiowaæ wszystkie pliki do innego foldera?"
+#: ../transfugdrake:111
+#, c-format
+msgid "You can migrate mail bookmarks."
+msgstr ""
 
-#: ../transfugdrake_.c:225
-msgid "Transfug"
-msgstr "Transfug"
+#: ../transfugdrake:116
+#, c-format
+msgid "Import mail (recommended)"
+msgstr ""
 
-#: ../transfugdrake_.c:226
-msgid ""
-"We will bring back your Outlook Mailboxes to a standard unix mbox\n"
-"\n"
-"NB: This feature works only with Outlook Express 4.5 and 5"
-msgstr ""
-"Twoje skrzynku pocztowe Outlook zostan± przeniesione dostandardowych "
-"skrzynek uniksa mbox\n"
-"\n"
-"NB: Ta funkcja dzia³a tylko z Outlook Express 4.5 i 5"
\ No newline at end of file
+#: ../transfugdrake:118
+#, c-format
+msgid "Share mail"
+msgstr ""
+
+#: ../transfugdrake:124
+#, c-format
+msgid "Migration of mail in progress"
+msgstr ""
+
+#: ../transfugdrake:130
+#, c-format
+msgid "You can migrate your desktop background."
+msgstr ""
+
+#: ../transfugdrake:135
+#, c-format
+msgid "Use Mandriva background"
+msgstr ""
+
+#: ../transfugdrake:136
+#, c-format
+msgid "Import background"
+msgstr ""
+
+#: ../transfugdrake:141
+#, c-format
+msgid "Migration of background in progress"
+msgstr ""
+
+#: ../transfugdrake:147
+#, c-format
+msgid "Congratulations, your migration is now completed!"
+msgstr ""
+
+#: ../transfugdrake:151
+#, c-format
+msgid "No Windows installation has been detected."
+msgstr ""
+
+#: ../transfugdrake:155
+#, c-format
+msgid "No documents and settings have been detected."
+msgstr ""
+
+#~ msgid "No Windows Partition"
+#~ msgstr "Brak partycji Windows"
+
+#~ msgid "No Windows Partition found"
+#~ msgstr "Nie znaleziono partycji Windows"
+
+#~ msgid "Select your windows partition"
+#~ msgstr "Wybierz partycjê systemu windows"
+
+#~ msgid "Please specify your windows partition from the following list"
+#~ msgstr "Wybierz partycjê windows z poni¿szej listy"
+
+#~ msgid "$fat_parts[0] is found as your Windows partition"
+#~ msgstr "$fat_parts[0] to twoja partycja Windows"
+
+#~ msgid "Your Windows Partition"
+#~ msgstr "Twoje partycje Windows"
+
+#~ msgid "Transfugdrake"
+#~ msgstr "Transfugdrake"
+
+#~ msgid ""
+#~ "Welcome to Transfugdrake! I will help you to ease the step windows-linux\n"
+#~ "by migrating your documents, mails and address books"
+#~ msgstr ""
+#~ "Witaj w Transfugdrake! Program u³atwi ci podjêcie kroku windows-"
+#~ "linuxpoprzez migracjê twoich dokuemntów, poczty i ksi±¿ek adresowych"
+
+#~ msgid "Can't find documents folder!"
+#~ msgstr "Nie mo¿na znale¼æ foldera dokumentów!"
+
+#~ msgid "Can't find the folder where the documents are located. Exiting..."
+#~ msgstr ""
+#~ "Nie mo¿na znale¼æ foldera, w którym znajduj± siê dokumenty. Wychodzenie..."
+
+#~ msgid "No mail migration available"
+#~ msgstr "Migracja poczty nie jest dostêpna"
+
+#~ msgid ""
+#~ "Warning: Windows XP detected. No mail migration available yet for your "
+#~ "Windows version."
+#~ msgstr ""
+#~ "Ostrze¿enie: wykryto Windows XP. Dla tej wersji Windows nie jest jeszcze "
+#~ "dostêpna migracja poczty"
+
+#~ msgid "No user found!"
+#~ msgstr "Nie znaleziono u¿ytkownika!"
+
+#~ msgid ""
+#~ "Can't find any user on your Windows partition. Will copy all documents "
+#~ "from Windows"
+#~ msgstr ""
+#~ "Nie mo¿na znale¼æ ¿adnego u¿ytkownika na partycji Windows. Skopiowane "
+#~ "zostan± wszystkie dokumenty z Windows"
+
+#~ msgid ""
+#~ "You have the following users in Windows. Which one do you want to use for "
+#~ "migration?"
+#~ msgstr ""
+#~ "Nastêpuj±cy u¿ytkownicy s± zdefiniowani w systemie Windows. Dla których z "
+#~ "nich ma byæ dokonana migracja?"
+
+#~ msgid ""
+#~ "Welcome to TransfugDrake! You are now able to ease\n"
+#~ " the step Windows-Linux with many migrations. Please choose what you\n"
+#~ " want to do:"
+#~ msgstr ""
+#~ "Witaj w TransfugDrake! Mo¿na uruchomiæ procedurê migracji\n"
+#~ "miêdzy systemami Windows i Linux. Wybierz czynno¶æ,\n"
+#~ "któr ma byæ wykonana:"
+
+#~ msgid "Do you want to copy other files from another folder?"
+#~ msgstr "Czy chcesz skopiowaæ wszystkie pliki do innego foldera?"
+
+#~ msgid "Transfug"
+#~ msgstr "Transfug"
+
+#~ msgid ""
+#~ "We will bring back your Outlook Mailboxes to a standard unix mbox\n"
+#~ "\n"
+#~ "NB: This feature works only with Outlook Express 4.5 and 5"
+#~ msgstr ""
+#~ "Twoje skrzynku pocztowe Outlook zostan± przeniesione dostandardowych "
+#~ "skrzynek uniksa mbox\n"
+#~ "\n"
+#~ "NB: Ta funkcja dzia³a tylko z Outlook Express 4.5 i 5"
diff --git a/po/transfugdrake.pot b/po/transfugdrake.pot
index e7159d6..606c670 100644
--- a/po/transfugdrake.pot
+++ b/po/transfugdrake.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-11-28 14:34+0100\n"
+"POT-Creation-Date: 2007-09-04 23:17+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,93 +14,133 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../transfugdrake.pm_.c:98
-msgid "No Windows Partition"
+#: ../transfugdrake:37
+#, c-format
+msgid "Migration wizard"
 msgstr ""
 
-#: ../transfugdrake.pm_.c:98
-msgid "No Windows Partition found"
+#: ../transfugdrake:40
+#, c-format
+msgid "This wizard will help you to import Windows documents and settings in your %s distribution."
 msgstr ""
 
-#: ../transfugdrake.pm_.c:100
-msgid "Select your windows partition"
+#: ../transfugdrake:40
+#, c-format
+msgid "It allows two differents migration methods: you can either import all documents and settings by copying them, or share them between operating systems."
 msgstr ""
 
-#: ../transfugdrake.pm_.c:101
-msgid "Please specify your windows partition from the following list"
+#: ../transfugdrake:49
+#, c-format
+msgid "Multiple users have been detected, please select a user in the list below."
 msgstr ""
 
-#: ../transfugdrake.pm_.c:105
-msgid "$fat_parts[0] is found as your Windows partition"
+#: ../transfugdrake:52
+#, c-format
+msgid "Windows user"
 msgstr ""
 
-#: ../transfugdrake.pm_.c:105
-msgid "Your Windows Partition"
+#: ../transfugdrake:58
+#, c-format
+msgid "Linux user"
 msgstr ""
 
-#: ../transfugdrake_.c:64 ../transfugdrake_.c:83 ../transfugdrake_.c:156
-#: ../transfugdrake_.c:194 ../transfugdrake_.c:214
-msgid "Transfugdrake"
+#: ../transfugdrake:72
+#, c-format
+msgid "You can migrate Windows documents to your home directory. Documents can be imported by copying them, or they can be shared with the other operating system"
 msgstr ""
 
-#: ../transfugdrake_.c:84
-msgid ""
-"Welcome to Transfugdrake! I will help you to ease the step windows-linux\n"
-"by migrating your documents, mails and address books"
+#: ../transfugdrake:78
+#, c-format
+msgid "Import documents (recommended)"
 msgstr ""
 
-#: ../transfugdrake_.c:107
-msgid "Can't find documents folder!"
+#: ../transfugdrake:79
+#, c-format
+msgid "Share documents"
 msgstr ""
 
-#: ../transfugdrake_.c:108
-msgid "Can't find the folder where the documents are located. Exiting..."
+#: ../transfugdrake:80 ../transfugdrake:100 ../transfugdrake:119
+#, c-format
+msgid "Skip step"
 msgstr ""
 
-#: ../transfugdrake_.c:135
-msgid "No mail migration available"
+#: ../transfugdrake:85
+#, c-format
+msgid "Migration of documents in progress"
 msgstr ""
 
-#: ../transfugdrake_.c:136
-msgid ""
-"Warning: Windows XP detected. No mail migration available yet for your "
-"Windows version."
+#: ../transfugdrake:91
+#, c-format
+msgid "You can migrate browser bookmarks."
 msgstr ""
 
-#: ../transfugdrake_.c:151
-msgid "No user found!"
+#: ../transfugdrake:97
+#, c-format
+msgid "Import bookmarks (recommended)"
 msgstr ""
 
-#: ../transfugdrake_.c:152
-msgid ""
-"Can't find any user on your Windows partition. Will copy all documents from "
-"Windows"
+#: ../transfugdrake:99
+#, c-format
+msgid "Share bookmarks"
 msgstr ""
 
-#: ../transfugdrake_.c:157
-msgid ""
-"You have the following users in Windows. Which one do you want to use for "
-"migration?"
+#: ../transfugdrake:105
+#, c-format
+msgid "Migration of bookmarks in progress"
 msgstr ""
 
-#: ../transfugdrake_.c:195
-msgid ""
-"Welcome to TransfugDrake! You are now able to ease\n"
-" the step Windows-Linux with many migrations. Please choose what you\n"
-" want to do:"
+#: ../transfugdrake:111
+#, c-format
+msgid "You can migrate mail bookmarks."
 msgstr ""
 
-#: ../transfugdrake_.c:215
-msgid "Do you want to copy other files from another folder?"
+#: ../transfugdrake:116
+#, c-format
+msgid "Import mail (recommended)"
 msgstr ""
 
-#: ../transfugdrake_.c:225
-msgid "Transfug"
+#: ../transfugdrake:118
+#, c-format
+msgid "Share mail"
 msgstr ""
 
-#: ../transfugdrake_.c:226
-msgid ""
-"We will bring back your Outlook Mailboxes to a standard unix mbox\n"
-"\n"
-"NB: This feature works only with Outlook Express 4.5 and 5"
+#: ../transfugdrake:124
+#, c-format
+msgid "Migration of mail in progress"
 msgstr ""
+
+#: ../transfugdrake:130
+#, c-format
+msgid "You can migrate your desktop background."
+msgstr ""
+
+#: ../transfugdrake:135
+#, c-format
+msgid "Use Mandriva background"
+msgstr ""
+
+#: ../transfugdrake:136
+#, c-format
+msgid "Import background"
+msgstr ""
+
+#: ../transfugdrake:141
+#, c-format
+msgid "Migration of background in progress"
+msgstr ""
+
+#: ../transfugdrake:147
+#, c-format
+msgid "Congratulations, your migration is now completed!"
+msgstr ""
+
+#: ../transfugdrake:151
+#, c-format
+msgid "No Windows installation has been detected."
+msgstr ""
+
+#: ../transfugdrake:155
+#, c-format
+msgid "No documents and settings have been detected."
+msgstr ""
+