Update translation catalog

76 files changed, 8976 insertions, 7926 deletions

diff --git a/po/af.po b/po/af.po
index ef1744e..3976f35 100644
--- a/po/af.po
+++ b/po/af.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-af\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2005-02-08 21:19+0000\n"
 "Last-Translator: Die uwe Ysbeer <ysbeer@af.org.za>\n"
 "Language-Team: Afrikaans <i18n@af.org.za>\n"
@@ -20,12 +20,12 @@ msgstr ""
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Opsoek na Gerbruikers en Groepe .... Net 'n oomblik asb"
@@ -130,7 +130,7 @@ msgstr "Pas filter toe"
 msgid "Users"
 msgstr "Gebruikers"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Groepe"
@@ -151,7 +151,7 @@ msgstr "Gebruikernaam"
 msgid "User ID"
 msgstr "Gebruiker ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Primere Groep"
@@ -211,7 +211,7 @@ msgstr "Voeg Groep By"
 msgid "Add a group to the system"
 msgstr "Voeg 'n groep by die stelsel"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Redigeer"
@@ -221,7 +221,7 @@ msgstr "Redigeer"
 msgid "Edit selected row"
 msgstr "Redigeer gekose ry"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Verwyder"
@@ -241,57 +241,57 @@ msgstr "Herlaai"
 msgid "Refresh the list"
 msgstr "Herlaai die lys"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Gesluit"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Reeds Verval"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Kliek op die ikoon om dit te verander"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Skep Nuwe Gebruiker"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Skep Tuisgids"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Tuisgids: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Skep 'n unieke groep vir die gebruiker"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Spesifiseer gebruiker se ID self"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Gebruiker bestaan alreeds, kies asb. 'n ander gebruikernaam"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Ongepaarde Wagwoord"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -300,12 +300,12 @@ msgstr ""
 "Hierdie wagwoord is te eenvoudig. \n"
 "Behoorlike wagwoorde bevat meer as 6 karakters "
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Gebruiker UID is < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -316,91 +316,103 @@ msgstr ""
 "Wil u voort gaan?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Voeg %s by die 'users' groep"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Skep nuwe groep: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Voeg gebruiker: %s by."
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Tuisgids: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Kanselleer"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Kies Groep"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Voeg by die bestaande groep"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Voeg by die 'users' groep"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "'n Groep met hierdie naam bestaan reeds. Wat wil u graag doen?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Skep Nuwe Groep"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Spesifiseer groep se ID self"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Groep bestaan alreeds, Gebruik asb. 'n ander Groepnaam"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "Groep GID is < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -411,22 +423,22 @@ msgstr ""
 "Moet ons voort gaan?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Voeg groep %s by"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Wis leêrs uit of nie?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -435,27 +447,27 @@ msgstr ""
 "Verwyder gebruiker %s\n"
 " Doen ook die volgende\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Verwyder Tuisgids: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Verwyder Posbus : /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Verwyder gebruiker: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Moet ons regtig groep %s verwyder?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -464,47 +476,47 @@ msgstr ""
 "%s is 'n primere groep vir gebruiker %s\n"
 " Verwyder eers die gebruiker"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Verwyder groep: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Volle Naam:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Inteken:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Wagwoord:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Bevestig Wagwoord"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Aanteken Dop:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Groep Naam:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Kies asseblief ten minste een groep vir gebruiker"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -513,160 +525,160 @@ msgstr ""
 "Spesifiseer asseblief Jaar Maand en Dag \n"
 "waarop Rekening Verval "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr ""
 "Voorsien asseblief al die verlangde inling rakende wagwoord veroudering\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "U kan nie gebruiker %s van hulle primere groep verwyder nie"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Tuis:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Gebruiker se Inligting"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Aktiveer verval van rekening"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Rekening verval (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Sluit Gebruiker se Rekening"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Rekening Inligting"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Gebruiker het laas sy/haar wagwoord verander op : "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Aktiveer Verval van Wagwoord"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dae voor verandering toelaat :"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Aantal dae voor verandering verlang :"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Waarsku soveel dae voor verandering :"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dae voor rekening de-aktiveer :"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Wagwoord Detail"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Kies die groepe waarvan die gebruiker 'n lid moet wees:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Groep Data"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Kies gebruikers vir hierdie groep :"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Groepeer Gebruikers"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Redigeer Groepe / Gebruikers"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "'n Fout het voorgekom"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Maak Toe"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Bestuur Gebruikers"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Dirk van der Walt <dirkvanderwalt@webmail.co.za>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Naam spasie is leeg voorsien asseblief 'n naam"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Die naam mag sleg alfabet letters, syfers, '-' en '_' bevat"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Naam is te lank"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Probleme"
@@ -680,73 +692,73 @@ msgstr "Mageia Users Management Tool"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, fuzzy, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Kon nie spoellêer skep nie.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Fout met skep van %s: %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Kon nie spoellêer skep nie: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, fuzzy, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Kon nie spoellêer skep nie.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "onbekende fout"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 #, fuzzy
 msgid "Group creation failed.\n"
 msgstr "Kon nie spoellêer skep nie.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Fout met uitvee van spoellêer: %s\n"
diff --git a/po/am.po b/po/am.po
index 2842a45..a535faf 100644
--- a/po/am.po
+++ b/po/am.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-am\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2005-02-13 02:21+0100\n"
 "Last-Translator: Alemayehu <alemayehu@gmx.at>\n"
 "Language-Team: Amharic <am-translate@geez.org>\n"
@@ -15,12 +15,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "ተጠቃሚዎችን አና ቡድኖችን በመጫን ላይ...እባክዎ ይጠብቁ"
@@ -125,7 +125,7 @@ msgstr "ማጣሪያ ተጠቀም"
 msgid "Users"
 msgstr "ተጠቃሚዎች"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "ቡድኖች"
@@ -146,7 +146,7 @@ msgstr "የተጠቃሚ ስም"
 msgid "User ID"
 msgstr "የተጠቃሚ መለያ ቁጥር"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "ቀዳሚ ብድን"
@@ -206,7 +206,7 @@ msgstr "ብድን ጨምር"
 msgid "Add a group to the system"
 msgstr "ወደ ሲስተሙ ብዱን ጨምር"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "አርም"
@@ -216,7 +216,7 @@ msgstr "አርም"
 msgid "Edit selected row"
 msgstr "የተመረጠውን ረድፍ አርም"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "አጥፋ"
@@ -236,57 +236,57 @@ msgstr "በድጋሚ አስጀምር"
 msgid "Refresh the list"
 msgstr "ዝርዝሩን በድጋሚ አስጀምር"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "ተቆልፏል"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "አልፎበታል"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "ምልክቱን ለመለወጥ ይጫኑት"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "አዲስ ተጠቃሚ ፍጠር"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "የመጀመሪያ ዶሴ ፍጠር"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "የመጀመሪያ ዶሴ: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "ለተጠቃሚው የግል ቡድን ፍጠር"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "ተጠቃሚው ቀደም ሲል ነበሩ፣ እባክዎ ሌላ የተጠቃሚ ስም ይምረጡ"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "ሚስጢራዊ ቃል አይመሳሰልም"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -295,12 +295,12 @@ msgstr ""
 "ይህ ሚስጢራዊ ቃል በጣም ቀላል ነው። \n"
 " ጥሩ ሚስጢራዊ ቃላት ከ 6 የበለጠ አሃዞች ሊሆኑ ይገባል"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr ""
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -308,91 +308,103 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "%sን ወደ 'ተጠቃሚዎች' ብድን በስገባት ላይ"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "አዲስ ብድን በመፍጠር ላይ: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "ተጠቃሚ በመጨመር ላይ ፡ %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "የመጀመሪያ ዶሴ: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "ተወው"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "እሺ"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "ብድን ይምረጡ"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "ቀደም ሲል ወደ ነበረው ብድን ጨምር"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "ወደ ብድን 'ተጠቃሚዎች' ጨምር"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "በዚህ ስም የሚጠራ ብድን ቀደም ሲል አለ። ምን ማድረግ ይፈልጋሉ?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "አዲስ ብድን ፍጠር"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "ቡድኑ ቀደም ሲል ነበር፣ እባክዎ ሌላ የብድን ስም ይምረጡ"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr ""
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -400,255 +412,255 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "ብድን በመጨመር ላይ ፡ %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "ፋይሎቹ ይጥፉ ወይስ አይጥፉ?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
 " Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "የመጀመሪያ ዶሴ አጥፋ: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "የፖስታ ሳጥን አጥፋ :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "ተጠቃሚ በማስወገድ ላይ: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "በርግጥ ይህንን ብድንን ማጥፋት ይፈልጋሉ?: %s"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "ብድን በማስወገድ ላይ: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "ሙሉ ስም:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "መግቢያ:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "ሚስጢራዊ ቃል:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "ሚስጢራዊ ቃሉን ያረጋግጡ:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "የመግቢያ ሼል:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "የብድን ስም:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "እባክዎ ለተጠቃሚው ቢያንስ አንድ ቡድን ይምረጡ"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr ""
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "መጀመሪያ:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "የተጠቃሚ መረጃ"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "የመዝገብ ጊዜ ማለፍን አስችል"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "መዝገቡ ጊዜው የሚያልፍበት ቀን (አመት-ወር-ቀን):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "የተጠቃሚን መዝገብ ቆልፍ"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "የመዝገብ መረጃ"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "ተጠቃሚው ለመጨረሻ ጊዜ ሚስጢራዊ ቃሉን የቀየረው በ :"
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "የሚስጢራዊ ቃል ጊዜ ማለፍን አስችል"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "ቀናት፣ ለውጥ ከመፈቀዱ በፊት :"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "ቀናት፣ ለውጥ ከማስፈለጉ በፊት :"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "ከለውጥ በፊት የቀናት ማስጠንቀቂያ :"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr ""
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "የሚስጢራዊ ቃል መረጃ"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "ተጠቃሚው አባል የሚሆንባቸውን ብድኖች ይምረጡ:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "የብድን መረጃ"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "ወደዚህ ብድን የሚገቡትን ተጠቃሚዎች ይምረጡ :"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "የቡድን ተጠቃሚዎች"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "ቡድኖችን/ተጠቃሚዎችን አርም"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "ስህተት ተፈጥሯል"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "ዝጋ"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "የተጠቃሚዎች ማስተዳደሪያ"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mandriva Online"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Alemayehu <alemayehu@gmx.at>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "የስሙ ቦታ ባዶ ነው፣ እባክዎ ስም ይስጡ"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "ስሙ በጣም ረጅም ነው"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "ስህተት"
@@ -662,72 +674,72 @@ msgstr "የMageia ተጠቃሚዎች ማስተዳደሪያ መሳሪያ"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr ""
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr ""
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr ""
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index ecb1d9b..93ebfef 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2011-05-19 13:15+0000\n"
 "Last-Translator: salim salim <almusalimalmusalimah@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "تحميل المستخدمين والمجموعات... الرجاء الانتظار"
@@ -128,7 +128,7 @@ msgstr "تصفية"
 msgid "Users"
 msgstr "المستخدمون"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "المجموعات"
@@ -149,7 +149,7 @@ msgstr "اسم المستخدم"
 msgid "User ID"
 msgstr "هوية المستخدم"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "المجموعة الأساسية"
@@ -209,7 +209,7 @@ msgstr "إضافة مجموعة"
 msgid "Add a group to the system"
 msgstr "إضافة مجموعة الى النظام"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "تحرير"
@@ -219,7 +219,7 @@ msgstr "تحرير"
 msgid "Edit selected row"
 msgstr "تحرير الصف المختار"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "حذف"
@@ -239,57 +239,57 @@ msgstr "تحديث"
 msgid "Refresh the list"
 msgstr "تحديث القائمة"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "تم إقفاله"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "انتهت صلاحيته"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "اضغط على الأيقونة لتغييرها"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "إنشاء مستخدم جديد"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "إنشاء دليل خاص"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "الدليل الخاص: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "إنشاء مجموعة خاصة بالمستخدم"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "تحديد هوية المستخدم يدوياً"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "المستخدم موجود مسبقاً، الرجاء اختيار اسم مستخدم آخر"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "كلمة المرور غير مطابقة"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -298,12 +298,12 @@ msgstr ""
 "كلمة المرور هذه بسيطة جداً. \n"
 " كلمات المرور الجيدة يجب أن تكون > 6 رموز"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "هوية المستخدم < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -314,27 +314,39 @@ msgstr ""
 " هل أنت متأكد من أنك تريد فعل ذلك؟\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "إضافة %s إلى مجموعة المستخدمين 'users'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "إنشاء المجموعة الجديدة: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "إضافة المستخدم: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "الدليل الخاص: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "معالج الترحيل و اﻹستيراد"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -343,64 +355,64 @@ msgstr ""
 "هل تريد تشغيل معالج الترحيل ﻷجل استيراد مستندات و إعدادات ويندوز إلى توزيعتك "
 "ماجيّا"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "إلغاء"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "موافق"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "هوية المستخدم: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "اختيار مجموعة"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "إضافة إلى المجموعة الموجودة"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "إضافة إلى مجموعة 'المستخدمين'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "توجد مجموعة بهذا الاسم مسبقاً.  ماذا تريد أن تفعل؟"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "إنشاء مجموعة جديدة"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "تحديد هوية المجموعة يدوياً"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "هذه المجموعة موجودة مسبقاً، الرجاء اختيار اسم آخر للمجموعة"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " هوية المجموعة < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -411,22 +423,22 @@ msgstr ""
 " هل أنت متأكد من أنك تريد فعل ذلك؟\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "جاري إضافة المجموعة: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "هوية المجموعة: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "حذف الصف المختار؟"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -435,27 +447,27 @@ msgstr ""
 "جاري حذف المستخدم %s\n"
 " قم كذلك بالمهام التالية\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "حذف الدليل الخاص: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "حذف صندوق البريد: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "جاري حذف المستخدم: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "هل تريد فعلاًُ حذف المجموعة %s؟"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -464,47 +476,47 @@ msgstr ""
 "%s مجموعة أساسية للمستخدم %s\n"
 " احذف المستخدم أولاً"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "جاري حذف المجموعة: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "الاسم الكامل:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "اسم الدخول:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "كلمة المرور:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "تأكيد كلمة المرور:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "صدفة الدخول:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "اسم المجموعة:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "الرجاء اختيار مجموعة واحدة على الأقل للمستخدم"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -513,159 +525,159 @@ msgstr ""
 "الرجاء تحديد السنة والشهر واليوم\n"
 " لانتهاء صلاحية الحساب "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "الرجاء ملء جميع حقول تقادم كلمة المرور\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "لا يمكنك حذف المستخدم '%s' من مجموعته الأساسية"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "الدليل الخاص:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "بيانات المستخدم"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "تمكين إنهاء صلاحية الحساب"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "تنتهي صلاحية الحساب (يوم/شهر/سنة):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "إقفال حساب المستخدم"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "معلومات الحساب"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "قام المستخدم بتغيير كلمة مروره عند: "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "تمكين إنهاء صلاحية كلمة المرور"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "عدد الأيام قبل السماح بالتغيير:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "عدد الأيام قبل المطالبة بالتغيير:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "عدد أيام التحذير قبل التغيير:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "عدد الأيام قبل إخماد الحساب:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "معلومات كلمة المرور"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "اختر المجموعات التي سيصبح المستخدم عضواً فيها: "
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "بيانات المجموعة"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "اختر المستخدمين الذين سيلتحقون بالمجموعة:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "مستخدمو المجموعة"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "تحرير المجموعات / المستخدمون"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "حدث خطأ:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "إغلاق"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "حقوق النشر (C) %s بواسطة ماندريفا"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "حقوق النشر (C) %s بواسطة ماجيّا"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "إدارة المستخدمين"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "ماجيّا"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Arabeyes <support@arabeyes.org>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "حقل الاسم فارغ فضلاً قم بتحديد اسم"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "يجب أن يحتوي الاسم فقط على حروف صغيرة، أرقام، `-' و `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "الاسم طويل جداً"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "خطأ"
@@ -679,72 +691,72 @@ msgstr "أداة إدارة مستخدمي ماجيّا لينوكس "
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "فشل إنشاء الحساب: '%s'.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "لا يمكن الحصول على هوية المستخدم"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "لا يمكن استعادة النتيجة"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "خطأ في إنشاء `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "خطأ في إنشاء لفيفة البريد: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "لا يمكن تعديل المستخدم: '%s'.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "لا يمكن محو المستخدم: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "فشل في ضبط كلمة المرور: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "خطأ مجهول"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "فشل إنشاء الفريق.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "لا يمكن تعديل المجموعة: '%s'.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "لا يمكن محو المجموعة: '%s'.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "لا يوجد دليل منزل للمستخدم.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "لا يمكن محو دليل المنزل: '%s'.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "خطأ في حذف لفيفة البريد: %s\n"
diff --git a/po/ast.po b/po/ast.po
index b0320c9..e5b995b 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2017-02-24 19:45+0100\n"
 "Last-Translator: marja <marja@mageia.org>\n"
 "Language-Team: Asturian (http://www.transifex.com/projects/p/mageia/language/"
@@ -19,12 +19,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Cargando usuarios y grupos... Por favor, espera"
@@ -129,7 +129,7 @@ msgstr "Aplicar filtru"
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Grupos"
@@ -150,7 +150,7 @@ msgstr "Nome d'usuariu"
 msgid "User ID"
 msgstr "ID d'usuariu"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Grupu primariu"
@@ -210,7 +210,7 @@ msgstr "Amestar grupu"
 msgid "Add a group to the system"
 msgstr "Amestar un grupu al sistema"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Editar"
@@ -220,7 +220,7 @@ msgstr "Editar"
 msgid "Edit selected row"
 msgstr "Editar filera esbillada"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Desaniciar"
@@ -240,57 +240,57 @@ msgstr "Refrescar"
 msgid "Refresh the list"
 msgstr "Refrescar la llista"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Bloquiáu"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Caducáu"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Primi nel iconu pa camudalu"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Crear usuariu nuevu"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Crear direutoriu personal"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Direutoriu personal: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Crear un grupu priváu pal usuariu"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Especificar ID d'usuariu a mano"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Yá esiste l'usuariu, por favor escueyi otru nome d'usuariu"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Les contraseñes nun concasen"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -299,12 +299,12 @@ msgstr ""
 "Esta contraseña ye persimplaya. \n"
 "Les contraseñes bones deberíen ser > 6 carauteres"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "L'UID d'usuariu ye < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -315,27 +315,39 @@ msgstr ""
 "¿De xuru quies facer esto?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Poniendo a %s nel grupu 'users'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Creando grupu nuevu: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Amestando usuariu: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Direutoriu personal: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Encontu pa la migración"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -344,64 +356,64 @@ msgstr ""
 "¿Quies executar l'encontu pa la migración ya importar los documentos y "
 "axustes de Windows a la to distribución Mageia?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Encaboxar"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Aceutar"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Escoyer grupu"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Amestar al grupu esistente"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Amestar al grupu 'users'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Yá esiste un grupu con esti nome.  ¿Qué te prestaría facer?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Crear grupu nuevu"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Especificar ID de grupu a mano"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Yá esiste'l grupu, por favor escueyi otru nome de grupu"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "El GID del grupu ye < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -412,22 +424,22 @@ msgstr ""
 "¿De xuru quies facer esto?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Amestando grupu: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "¿Desaniciar ficheros o non?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -436,27 +448,27 @@ msgstr ""
 "Desaniciando usuariu %s\n"
 "Faciendo tamién les aiciones siguientes\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Desaniciar direutoriu personal: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Desaniciar buzón de corréu: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Desaniciando usuariu: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "¿De xuru quies desaniciar el grupu %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -465,47 +477,47 @@ msgstr ""
 "%s ye un grupu primariu pal usuariu %s\n"
 "Desanicia primero al usuariu"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Desaniciando grupu: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Nome completu:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Aniciu sesión:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Confirmar contraseña:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell d'aniciu sesión:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Nome del grupu:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Por favor, esbilla polo menos un grupu pal usuariu"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -514,148 +526,148 @@ msgstr ""
 "Por favor, especifica l'añu, mes y día\n"
 "pa la caducidá la cuenta"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Por favor, enllena tolos campos nel avieyamientu de la contraseña\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Nun pues desaniciar l'usuariu '%s' del grupu primariu de so"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Direutoriu personal:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Datos d'usuariu"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Habilitar caducidá de cuenta"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "La cuenta caduca (AAAA-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Bloquiar cuenta d'usuariu"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Información de la cuenta"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "L'usuariu camudó la contraseña per cabera vegada'l : "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Habilitar caducidá de la contraseña"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Díes enantes d'almitir el cambéu:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Díes enantes de riquir el cambéu:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Díes d'avisu enantes del cambéu:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Díes enantes de que la cuenta se desactive:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Información de la contraseña"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Esbilla los grupos de los que l'usuariu sedrá miembru:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Datos del grupu"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Esbilla los usuarios que s'axuntarán a esti grupu:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Grupu d'usuarios"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Editar Grupos / Usuarios"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Asocedió un fallu:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Zarrar"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s por Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Copyright (C) %s por Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Alministración d'usuariu"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Softastur <alministradores@softastur.org>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "El campu del nome ta baleru, por favor apurre ún"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
@@ -663,12 +675,12 @@ msgstr ""
 "El nome tien de caltener namái lletres llatines minúscules, númberos, `-' y "
 "`_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "El nome ye perllargu"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Fallu"
@@ -681,72 +693,72 @@ msgstr "Executar l'alministrador d'usuariu Mageia"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr "Ríquese l'autenticación pa executar l'alministrador d'usuariu Mageia"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Falló la creación de la cuenta: '%s'.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Nun pue consiguise'l númberu UID"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Nun pudo recuperase'l valor"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Fallu criando `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Fallu creando la cola de corréu: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Nun pudo modificase l'usuariu: '%s'.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Nun pudo desaniciase l'usuariu: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Fallu al afitar la contraseña: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "fallu desconocíu"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Fallu na creación del grupu.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Nun pudo modificase'l grupu: '%s'.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Nun pudo desaniciase'l grupu '%s'.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Nun hai direutoriu personal pal usuariu.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Nun pudo desaniciase'l direutoriu personal: '%s'.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Fallu desaniciando la cola de corréu: %s\n"
diff --git a/po/az.po b/po/az.po
index 8502697..e5d467f 100644
--- a/po/az.po
+++ b/po/az.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2015-07-05 07:06+0000\n"
 "Last-Translator: huseynkhan <k.huseynxan@gmail.com>\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/mageia/"
@@ -19,12 +19,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "İstifadəçilər və Qruplar Yüklənir... Xahiş edirik, gözləyin"
@@ -129,7 +129,7 @@ msgstr "Filtri tətbiq et"
 msgid "Users"
 msgstr "İstifadəçilər"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Qruplar"
@@ -150,7 +150,7 @@ msgstr "İstifadəçi Adı"
 msgid "User ID"
 msgstr "İstifadəçi ID'si"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Əsas Qrup"
@@ -210,7 +210,7 @@ msgstr "Qrup Əlavə Et"
 msgid "Add a group to the system"
 msgstr "Sistemə qrup əlavə et"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Düzəlt"
@@ -220,7 +220,7 @@ msgstr "Düzəlt"
 msgid "Edit selected row"
 msgstr "Seçili sətiri düzəlt"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Sil"
@@ -240,58 +240,58 @@ msgstr "Təzələ"
 msgid "Refresh the list"
 msgstr "Siyahını təzələ"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Qıfıllı"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Vaxtı Bitib"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Dəyişdirmək üçün timsala tıqlayın"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Yeni İstifadəçi Yarat"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Ev Cərgəsi Yarat"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Ev Cərgəsi: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "İstifadəçi üçün xüsusi (private) qrup yarat"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "İstifadəçi ID'sini əllə müəyyən et"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr ""
 "Bu istifadəçi onsuz da mövcuddur, xahiş edirik başqa İstifadəçi Adı seçin"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Şifrələr Uyğun Gəlmir"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -300,12 +300,12 @@ msgstr ""
 "Şifrə həddindən artıq qısadır. \n"
 "Məsləhət görülən şifrələrin 6 hərfdən böyük olmasıdır"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "İstifadəçi Uid'i < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -316,27 +316,39 @@ msgstr ""
 " Bunu həqiqətən də etmək istəyirsiniz?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "%s 'users' qrupuna yerləşdirilir"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Yeni qrup yaradılır: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "İstifadəçi əlavə edilir: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Ev Cərgəsi: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Miqrasiya Yardımçısı"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -345,64 +357,64 @@ msgstr ""
 "Siz Windows sənəd və tənzimləmələrinin Mageia distribusiyasına yüklənməasi "
 "üçün miqrasiya yardımçısını işə salmaq istərdinizmi ? "
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Ləğv et"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Oldu"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Qrupu seç"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Mövcud qrupa əlavə et"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "'users' qrupuna əlavə et"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Bu adla onsuzda bir qrup mövcuddur. Nə etmək istəyirsiniz?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Yeni Qrup Yarat"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Qrup ID'sini əllə müəyyən et"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Bu qrup onsuz da mövcuddur, xahiş edirik başqa Qrup Adı seçin"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " Qrup Gid'i < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -413,22 +425,22 @@ msgstr ""
 " Bunu həqiqətən də etmək istəyirsiniz?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Qrup əlavə edilir: %s"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Fayllar silinsin?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -437,27 +449,27 @@ msgstr ""
 "%s istifadəçisi silinir\n"
 " Həmçinin bunları da yerinə gətir\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Ev Cərgəsini Sil: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Poçt Qutusunu Sil :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "İstifadəçi silinir: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Həqiqətən də %s qrupunu silmək istəyirsiniz?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -466,47 +478,47 @@ msgstr ""
 "%s, %s istifadəçisinin əsas qrupudur\n"
 " Əvvəlcə istifadəçini silin"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Qrup silinir: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Tam Ad:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Giriş:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Şifrə:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Şifrənin Təsdiqi:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Giriş Qabığı:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Qrup Adı:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Xahiş edirik, istifadəçi üçün ən az bir qrup seçin"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -515,161 +527,161 @@ msgstr ""
 "Xahiş edirik, hesabın vaxtının bitməsinin \n"
 " İl, Ay və Gününü tə'yin edin"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr ""
 "Xahiş edirik, şifrə vaxtının bitməsi qurğularının bütün sahələrini doldurun\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "'%s' istifadəçisini onun əsas qrupundan çıxara bilməzsiniz"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Ev:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "İstifadəçi Mə'lumatı"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Hesabın vaxtının bitməsini fəallaşdır"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Hesabın vaxtının bitmə tarixi (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "İstifadəçi Hesabını Qıfılla"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Hesab Mə'lumatı"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "İstifadəçi şifrəsini ən son bu vaxtda dəyişib : "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Şifrə Vaxtının Bitməsini Fəallaşdır"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dəyişdirmə icazəsi əvvəlindəki gün :"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Dəyişdirmə məcburiyyəti əvvəlindəki gün :"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dəyişdirmədən xəbərdarlıq əvvəlindəki gün :"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Hesabın qeyri-fəal olması əvvəlindəki gün :"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Şifrə Mə'lumatı"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "İstifadəçinin üzv olacağı qrupları seçin:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Qrup Mə'lumatı"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Bu qrupa qoşulacaq istifadəçiləri seçin :"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Qrup İstifadəçiləri"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Qrupları/İstifadəçiləri Düzəlt"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Xəta baş verdi"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Bağla"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Müəllif Hüquqları (C) %s Mandriva tərfindən qorunur"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Müəllif Hüquqları (C) %s Megia tərfindən qorunur"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "İstifadəçi İdarəsi"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Mətin Əmirov <metin@karegen.com>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Ad sahəsi boşdur, xahiş edirik bir ad tə'yin edin"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 "Ad yalnız kiçik hərfləri, ədədləri, `-' və `_' hərfləri daxil edə bilər"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Ad çox uzundur"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Xəta"
@@ -684,72 +696,72 @@ msgstr ""
 "İstifadəçilərin İdarə Vasitəsinə daxil olmaq üçün Autentifikasiyaya ehtiyac "
 "var"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Hesabın yaradılması baş tutmadı: '%s'. \n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Uid qiyməti əldə oluna bilmədi"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Qiymət əlda oluna bilmədi"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "`%s' yaradıla bilmədi: %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Mail spool yaradıla bilmədi: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "İstifadəçi üzərində dəyişiklik aparmaq mümkün deyil: '%s'.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "İstifadəçi silinə bilmədi: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Şifrənin yaradılması baş tutmadı: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "naməlum xəta"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Qrupun yaradılması baş tutmadı.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Qrup üzarində dəyişiklik aparmaq mümkün deyil: '%s'.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Qrup silinə bilmədi: '%s'.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "İstifadəçi üçün əsas direktoriya yoxdur.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Əsas direktoriya silinə bilmədi: '%s'.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Mail spool silinə bilmədi: %s\n"
diff --git a/po/be.po b/po/be.po
index 847f31a..ca01d5d 100644
--- a/po/be.po
+++ b/po/be.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Userdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2003-08-14 16:54+0300\n"
 "Last-Translator: Maxim Kuzmich <max_kuzm@tut.by>\n"
 "Language-Team: Belarusian\n"
@@ -15,12 +15,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr ""
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr ""
@@ -125,7 +125,7 @@ msgstr "Ужыць фільтар"
 msgid "Users"
 msgstr "Карыстальнікі"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Групы"
@@ -146,7 +146,7 @@ msgstr "Імя карыстальніка"
 msgid "User ID"
 msgstr "ID карыстальніка"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Асноўная група"
@@ -206,7 +206,7 @@ msgstr "Дадаць групу"
 msgid "Add a group to the system"
 msgstr "Дадаць групу ў сыстэму"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Рэдагаваць"
@@ -216,7 +216,7 @@ msgstr "Рэдагаваць"
 msgid "Edit selected row"
 msgstr "Рэдагаваць вылучаны радок"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Выдаліць"
@@ -236,57 +236,57 @@ msgstr "Аднавіць"
 msgid "Refresh the list"
 msgstr "Аднавіць сьпіс"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Блакіраваны"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Націсніце на піктаграму каб зьмяніць яе"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Стварыць новага карыстальніка"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Стварыць хатні каталёг"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Хатні каталёг: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Стварыць прыватную групу для карыстальніка"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Пазначыць карыстальніцкі ID"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Карыстальнік ўжо існуе, пазначце другое Імя"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Несупадзеньне пароляў"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -295,12 +295,12 @@ msgstr ""
 "Гэты пароль занадта просты. \n"
 " Добрыя паролі павінны быць большыя за 6 літараў"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Карыстальніцкі ID < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -311,91 +311,103 @@ msgstr ""
 " Ці вы ўпэўнены, што хочаце зрабіць гэта?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, fuzzy, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Дадаць у групу 'users'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr ""
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr ""
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Хатні каталёг: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Адмена"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Так"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, fuzzy, c-format
 msgid "Choose group"
 msgstr "Выберыце групу"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Дадаць у існуючую групу"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Дадаць у групу 'users'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Група з такім імём ўжо існуе. Што будзем рабіць?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, fuzzy, c-format
 msgid "Create New Group"
 msgstr "Стварыць новага карыстальніка"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Пазначыць ID групы"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Група ўжо існуе, пазначце другое імя для групы"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " ID групы меншы за 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -406,22 +418,22 @@ msgstr ""
 " Ці вы ўпэўненыя ў тым што робіце?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr ""
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, fuzzy, c-format
 msgid "Delete files or not?"
 msgstr "Выдаліць вылучаны радок"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -430,27 +442,27 @@ msgstr ""
 "Выдаленьне карыстальніка %s\n"
 " Таксама выканаць наступныя дзеі\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Выдаліць хатні каталёг: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Выдаліць паштовую скрыню: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr ""
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Ці жадаеце выдаліць групу %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -459,207 +471,207 @@ msgstr ""
 "%s асноўная група для карыстальніка %s\n"
 " Спачатку выдаліце гэтага карыстальніка"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr ""
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Поўнае імя:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Уваход:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Яшчэ раз пароль:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr ":"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Імя групы:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Пазначце ня менш адной групы для карыстальніка"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr ""
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Вы ня можаце выдаліць карыстальніка '%s' зь ягонай асноўнай групы"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Хата:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Карыстальніцкія дадзеныя"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Дазволіць тэрмін дзеяньня запісу"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Тэрмін дзеяньня выцякае (ГГГГ-ММ-ДД)"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Блакіраваць карыстальніцкі запіс"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Інфармацыя запісу"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Карыстальнік змяняў пароль апошні раз: "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Дазволіць тэрмін дзеяньня паролю"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr ""
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr ""
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr ""
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr ""
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Інфармацыя пра пароль"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Выберыце групы сябром якіх будзе карыстальнік:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Дадзеныя групы"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Пазначце карыстальнікаў каб аб'яднаць у гэтыю групу"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Карыстальнікі групы"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, fuzzy, c-format
 msgid "Edit Groups / Users"
 msgstr "Карыстальнікі групы"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Адбылася памылка"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Зачыніць"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, fuzzy, c-format
 msgid "Users Management"
 msgstr "Імя карыстальніка"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Поле \"Імя\" пустое. Пазначце яго"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 "Імя павінна ўтрымліваць толькі маленькія лацінскія літары, лічбы, `-' ды `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Імя занадта доўгае"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Памылка"
@@ -673,72 +685,72 @@ msgstr "Дастасаваньне для кіраваньня карыстал�
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr ""
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "невядомая памылка"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr ""
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 9425033..020704d 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2016-04-16 21:21+0000\n"
 "Last-Translator: Georgi Georgiev <georgiev_1994@abv.bg>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -20,12 +20,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Зареждане на потребителите и групите... Моля изчакайте"
@@ -130,7 +130,7 @@ msgstr "Приложи филтър"
 msgid "Users"
 msgstr "Потребители"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Групи"
@@ -151,7 +151,7 @@ msgstr "Име на потребител"
 msgid "User ID"
 msgstr "Потребителски номер"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Основна група"
@@ -211,7 +211,7 @@ msgstr "Добави група"
 msgid "Add a group to the system"
 msgstr "Добавя група към системата"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Редактирай"
@@ -221,7 +221,7 @@ msgstr "Редактирай"
 msgid "Edit selected row"
 msgstr "Редактира избраната редица"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Изтрий"
@@ -241,57 +241,57 @@ msgstr "Опресни"
 msgid "Refresh the list"
 msgstr "Опресни списъка"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Заключен"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Просрочен"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Натиснете на иконата за да я промените"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Създаване на нов потребител"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Създаване на домашна директория"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Домашна директория:"
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Създава лична група за потребителя"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Ръчно задаване на потребителски номер"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Този потребител вече съществува, моля изберете друго име"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Паролите не съвпадат"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -300,12 +300,12 @@ msgstr ""
 "Паролата е твърде проста. \n"
 "Добрите пароли са тези с поне 6 символа"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Потребителският номер е < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -316,27 +316,39 @@ msgstr ""
 "Сигурни ли сте, че искате да го направите?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Добавяне на %s в група \"потребители\""
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Създаване на нова група: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Добавяне на потребител: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Домашна директория:"
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Помощник за миграция"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -345,64 +357,64 @@ msgstr ""
 "Искате ли да бъде стартиран помощника за миграция за да внесе Windows "
 "документи и настройки във вашата Mageia дистрибуция?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Отказ"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ок"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Изберете група"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Добавяне към съществуващата група"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Добавяне към група \"потребители\""
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr " Група с това име съществува. Какво ще правите?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Създаване на нова група"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Ръчно задаване на номер на групата"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Групата вече съществува, моля, изберете друго име"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "GID-а на групата е < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -413,22 +425,22 @@ msgstr ""
 "Сигурен ли сте, че желаете да го направите?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Добавяне на група: %s"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Изтриване на файловете?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -437,27 +449,27 @@ msgstr ""
 "Изтриване на потребител %s\n"
 "Също изпълни следните действия:\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Изтриване на  домашна директория: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Изтриване на пощенска кутия: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Изтриване на потребител: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Наистина ли желаете да изтриете групата %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -466,47 +478,47 @@ msgstr ""
 "%s е основната група на потребител %s\n"
 "Премахнете първо потребителя."
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Изтриване на група: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Пълно име:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Влез:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Парола:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Потвърди паролата:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Влизане в системата:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Име на група:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Моля изберете поне една група за потребителя"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -515,161 +527,161 @@ msgstr ""
 "Моля, въведете година, месец и ден, \n"
 "до които да важи профила"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Моля попълнете всички полета за \"остаряване\" на паролата\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Не можете да премахнете потребител %s от основната му група"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Домашна:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Потребителска информация"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Включи валидност на профилите"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Профила е валиден до (ГГГГ-ММ-ДД):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Заключи потребителски профил"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Информация за профил"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Потребителят е сменил последно паролата си на : "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Включи валидност на паролите"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Дни преди да бъде разрешена смяна:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Дни преди да бъде наложена смяна:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Предупреждение (в дни) преди промяната:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Дни преди профила да стане неактивен"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Информация за паролите"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Изберете към кои групи ще бъде член потребителят:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Информация за групите"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Изберете потребители за тази група:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Потребители в групата"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Редактиране на групи / потребители"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Появи се грешка:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Затвори"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Запазени права (C) %s от Мандрива"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Запазени права (C) %s от Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Управление на потребителите"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Boyan Ivanov <boyan17@bulgaria.com>\n"
 "Georgi Georgiev <georgiev_1994@abv.bg>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Полето за име е празно, моля въведете име."
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Името трябва да съдържа малки латински букви, цифри, `-' и `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Името е твърде дълго"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Грешка"
@@ -683,72 +695,72 @@ msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 "Нужно е удостоверяване за да се изпълни Mageia мениджър на потребителите"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Създаването на профила се провали: '%s'.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Не може да се вземе Uid номер"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Не може да се извлече стойност"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Грешка при създаване на `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Грешка при създаване на mail spool: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Потребителя не може да бъде променен: '%s'.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Потребителя не може да бъде изтрит: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Неуспешно задаване на парола: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "неизвестна грешка"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Създаването на групата се провали.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Групата не може да бъде променена: '%s'.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Групата не може да бъде изтрита: '%s'.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Липсва домашна директория за потребителя.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Домашната директория не може да бъде изтрита: '%s'.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Грешка при изтриване на mail spool: %s\n"
diff --git a/po/bn.po b/po/bn.po
index af471f5..b7f3329 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2016-05-07 07:29+0000\n"
 "Last-Translator: Rafee Mostafa <rafeemostafa2@gmail.com>\n"
 "Language-Team: Bengali (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "ইউজারড্রেক"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "ইউজার এবং গ্রুপ লোড করা হচ্ছে... দয়া করে অপেক্ষা করুন"
@@ -128,7 +128,7 @@ msgstr "ফিল্টার ব্যবহার করো"
 msgid "Users"
 msgstr "ব্যবহারকারী"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "দল"
@@ -149,7 +149,7 @@ msgstr "ব্যবহারকারীর নাম"
 msgid "User ID"
 msgstr "ব্যবহারকারীর ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "প্রাথমিক দল"
@@ -209,7 +209,7 @@ msgstr "দল যোগ করো"
 msgid "Add a group to the system"
 msgstr "সিস্টেমে একটি দল যোগ করুন"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "সম্পাদন করো"
@@ -219,7 +219,7 @@ msgstr "সম্পাদন করো"
 msgid "Edit selected row"
 msgstr "নির্বাচিত সারি সম্পাদন করো"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "মুছে ফেলো"
@@ -239,57 +239,57 @@ msgstr "পুনরায় প্রদর্শন করো"
 msgid "Refresh the list"
 msgstr "তালিকা পুনরায় প্রদর্শন করো"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "লক করা হয়েছে"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "সময়সীমা পেরিয়ে গেছে"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "পরিবর্তন করতে হলে আইকনে ক্লিক করুন"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "নুতন ব্যবহারকারী যোগ করো"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "হোম ডিরেক্টরি তৈরি করো"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "হোম ডিরেক্টরি তৈরি করো: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "ব্যবহারকারীর জন্য একটি ব্যক্তিগত দল তৈরি করো"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "ব্যবহারকারীর ID ম্যানুয়েলি নির্ধারণ করো"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "এই নামের ব্যবহারকারী বর্তমানে উপস্থিত আছে, দয়া করে আরেকটি নাম নির্বাচন করুন"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "পাসওয়ার্ড মেলেনি"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -298,12 +298,12 @@ msgstr ""
 "এই পাসওয়ার্ডটি বেশ সহজ। \n"
 " যে কোনো ভালো পাসওয়ার্ড অন্তত ৬ টি অক্ষরের বেশি হওয়া উচিত"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "আপনার Uid ৫০০ নিচে"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -314,91 +314,103 @@ msgstr ""
 " আপনি কি এই কাজ করার বিষয়ে নিশ্চিত?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "%s কে 'users' দলে  ঢোকানো হচ্ছে"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "নতুন দল তৈরি করা হচ্ছে: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "ব্যবহারকারী যোগ করা হচ্ছে: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "হোম ডিরেক্টরি তৈরি করো: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "বাতিল"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "ঠিক আছে"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "দল নির্বাচন করুন"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "উপস্থিত দলে যোগ করো"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "'users' দলে যোগ করো"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "এই নামে একটি দল বর্তমানে উপস্থিত আছে। আপনি কী করতে ইচ্ছুক?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "নতুন দল তৈরি করো"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "দলের ID ম্যানুয়েলি নির্ধারণ করো"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "দল বর্তমানে উপস্থিত আছে, দয়া করে দলের জন্য আরেকটি নাম নির্বাচন করুন"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " দলের Gid ৫০০-র নিচে আছে"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -409,22 +421,22 @@ msgstr ""
 " আপনি কি এই কাজ করার বিষয়ে নিশ্চিত?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "দল যোগ করা হচ্ছে: %s"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "ফাইল মুছে ফেলা হবে কি না?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -433,27 +445,27 @@ msgstr ""
 "%s ব্যবহারকারীকে মুছে ফেলা হচ্ছে\n"
 " নিম্নোক্ত কার্যগুলিও সম্পন্ন করো\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "হোম ডিরেক্টরি মুছে ফেলো: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "মেইলবক্স মুছে ফেলো :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "ব্যবহারকারীকে মুছে ফেলা হচ্ছে: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "আপনি কি %s দলটিকে মুছে ফেলার বিষয়ে নিশ্চিত"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -462,47 +474,47 @@ msgstr ""
 "%s দলটি %s ব্যবহারকারীর প্রাথমিক দল\n"
 " ব্যবহারকারীকে প্রথমে সরিয়ে ফেলো"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "দলটি সরিয়ে ফেলা হচ্ছে: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "সম্পূর্ণ নাম:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "লগ-ইন:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "পাসওয়ার্ড:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "পাসওয়ার্ড নিশ্চিত করুন:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "লগ - ইন শেল:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "দলের নাম:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "ব্যবহারকারীর জন্য অন্তত একটি দল নির্বাচন করুন"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -511,160 +523,160 @@ msgstr ""
 "অ্যাকাউন্টের সময়সীমা পূরণের বত্‌সর, মাস এবং দিন \n"
 "দয়া করে নির্ধারণ করুন "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "পাসওয়ার্ড-এর সময়সীমা সম্বন্ধীয় সব ক্ষেত্রগুলিকে দয়া করে পূর্ণ করুন।\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "'%s' ব্যবহারকারীকে আপনি তাদের মূল দল থেকে সরিয়ে ফেলতে পারবেন না"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "হোম:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "ব্যবহারকারীর ডাটা"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "অ্যাকাউন্টের সময়সীমা কার্যকরী করো"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "অ্যাকাউন্টের সময়সীমা পার হবে এই তারিখে (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "ব্যবহারকারীর অ্যাকাউন্ট লক করো"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "অ্যাকাউন্ট সম্বন্ধিয় তথ্য"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "ব্যবহারকারী পাসওয়ার্ড সর্বশেষ পরিবর্তন করেছিলেন : "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "পাসওয়ার্ডের সময়সীমা কার্যকরী করো"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "কতদিন পর পরিবর্তন করা যাবে :"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "কত দিন পরে পরিবর্তন প্রয়োজন :"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "পরিবর্তন করার পূর্বে সতর্কবাণী দেওয়ার সময়সীমা (দিন) :"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "অ্যাকাউন্টের সময়সীমা পুর্ণ হওয়ার আগের অবশিষ্ট দিন :"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "পাসওয়ার্ড সম্বন্ধিয় তথ্য"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "এই ব্যবহারকারী যে দলগুলির সদস্য হবে তা নির্বাচন করুন:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "ডাটা দলবদ্ধ করো"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "এই দলে যে ব্যবহারকারীদের যোগ করা হবে তাদের নির্বাচন করুন :"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "ব্যবহারকারীদের দলবদ্ধ করো"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "দল / ব্যবহারকারী সম্পাদন করুন"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr ""
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "বন্ধ করো"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "ব্যবহারকারীদের নিয়ন্ত্রন করা"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "ম্যান্ড্রিব লিনাক্স (Mageia)"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Bangla team <mdk-translation@bengalinux.org>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "নামের ক্ষেত্রটি ফঁাকা রয়েছে, দয়া করে একটি নাম লিখুন"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 "নামের মধ্যে শুধুমাত্র lowercase-এর লাতিন অক্ষর, সংখ্যা, `-' এবং `_' লেখা যাবে"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "নামটি অতিরিক্ত লম্বা"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "সমস্যা"
@@ -677,72 +689,72 @@ msgstr ""
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "`%s' তৈরি করার সময় সমস্যা হয়েছে: %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "মেইল স্পুল তৈরি করার সময় সমস্যা হয়েছে।: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "অজানা সমস্যা"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr ""
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "মেইল স্পুল মুছার সময় সমস্যা হয়েছে।: %s\n"
diff --git a/po/br.po b/po/br.po
index b884094..aed9d21 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2016-08-27 17:57+0200\n"
 "Last-Translator: Ja-Mai Drapier <jan-mai.drapier@mail.dotcom.fr>\n"
 "Language-Team: Brezhoneg <ofisk.bzh@wanadoo.fr>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1;plural=0\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "O kargañ arveriaded ha strolladoù ... Gortozit mar plij"
@@ -126,7 +126,7 @@ msgstr "Arloañ ar sil"
 msgid "Users"
 msgstr "Arveriaded"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Strolladoù"
@@ -147,7 +147,7 @@ msgstr "Anv arveriad"
 msgid "User ID"
 msgstr "ID an arveriad"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Strollad kentañ"
@@ -207,7 +207,7 @@ msgstr "Ouzhpennañ ur strollad"
 msgid "Add a group to the system"
 msgstr "Ouzhpennañ ur strollad d'ar reizhiad"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Kemmañ"
@@ -217,7 +217,7 @@ msgstr "Kemmañ"
 msgid "Edit selected row"
 msgstr "Aozañ al linenn diuzet"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Lemel"
@@ -237,69 +237,69 @@ msgstr "Adtresañ"
 msgid "Refresh the list"
 msgstr "Adtresañ ar roll"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Krouilhet"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Kabac'het"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Klikit ouzh an arlun evit kemmañ anezhi"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Krouiñ un arveriad nevez"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Krouiñ ar renkell er-gêr"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Renkell ar gêr : "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Krouiñ ur strollad prevez evit an arveriad"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Lakaat ID an arveriad gant an dorn"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Endeo eo an arveriad, dibabit un anv arveriad all mar plij"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "An tremegerioù ne glot ket"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "UID an arveriad a zo < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -307,91 +307,103 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Oc'h ouzhpennañ %s d'ar strollad « users »"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "O grouiñ ar strollad nevez : %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Oc'h ouzhpennañ un arveriad : %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Renkell ar gêr : "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Nullañ"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ya"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID : "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Dibabit ur strollad"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Ouzhpennañ d'ar strollad a zo c'hoazh"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Ouzhpennañ d'ar strollad 'users'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Ur strollad gant an anv-se a zo c'hoazh. Petra e fell deoc'h d'ober ?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Krouiñ ur strollad nevez"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Lakaat ID ar strollad gant an dorn"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Endeo eo ar strollad, dibabit un anv strollad all mar plij"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " GID ar strollad a zo < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -399,257 +411,257 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Oc'h ouzhpennañ ar strollad : %s"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID :"
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Dilemel ar restroù ?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
 " Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Dilemel renkell ar gêr : %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Dilemel ar voest-lizheroù : /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "O tilemel an arveriad : %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Ha fellout a ra deoc'h da vat lemel ar strollad %s ?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "O tilemel ar strollad : %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Anv klok :"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Ereañ :"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Tremenger :"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Tremenger (adarre) :"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell ereañ :"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Anv ar strollad :"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Dibabit ur strollad evit an arveriad d'an nebeutañ mar plij"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr ""
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Ker :"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Roadoù arveriad"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Prenañ kont an arveriad"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Titouroù diwar ar gont"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr ""
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr ""
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr ""
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr ""
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr ""
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Titouroù diwar an tremenger"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Roadoù strollad"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Dibabit an arveriaded da ouzhpennañ d’ar strollad-se :"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Arveriaded ar strollad"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Aozañ strolladoù hag arveriaded"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Ur fazi zo bet :"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Serriñ"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s gant Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Copyright (C) %s gant Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Merañ an arveriaded"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Jañ-Mai Drapier <jan-mai.drapier@mail.dotcom.fr>\n"
 "Thierry Vignaud <tvignaud@mandriva.com>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Goullo eo an dachenn « anv ». Reiñ un anv mar plij"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Re vras eo an anv"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Fazi"
@@ -662,72 +674,72 @@ msgstr "Seveniñ Ostilh merañ arveriaded Mageia"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Fazi en ur c’hrouiñ ar gont: ‘%s’\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "N'hell ket bezhañ kavet an niver UID"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Fazi en ur c’hrouiñ `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Fazi en ur c’hrouiñ al lostenn postel: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "N’hell ket bet cheñchet an arveriad: ‘%s’.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "N’hell ket bet lamet an arveriad: ‘%s’\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "N’hell ket bet cheñchet an tremenger : ‘%s’.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "fazi dianav"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Fazi en ur c’hrouiñ ar strollad.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "N’hell ket bet cheñchet ar strollad: ‘%s’.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "N’hell ket bet lamet ar strollad: ‘%s’.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "N’eus renkell-gêr ebet evit an arveriad.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "N’hell ket ket lamet ar renkell-gêr: ‘%s’.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Fazi en ur lemel al lostenn postel: %s\n"
diff --git a/po/bs.po b/po/bs.po
index a8e4ffd..fc768e8 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-bs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2004-08-17 12:54+0200\n"
 "Last-Translator: Amila Akagić <bono@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -24,12 +24,12 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Učitavam korisnike i grupe... Molim sačekajte"
@@ -134,7 +134,7 @@ msgstr "Primijeni filter"
 msgid "Users"
 msgstr "Korisnici"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Grupe"
@@ -155,7 +155,7 @@ msgstr "Korisničko ime"
 msgid "User ID"
 msgstr "Korisnički ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Primarna grupa"
@@ -215,7 +215,7 @@ msgstr "Dodaj grupu"
 msgid "Add a group to the system"
 msgstr "Dodaj grupu na sistem"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Izmijeni"
@@ -225,7 +225,7 @@ msgstr "Izmijeni"
 msgid "Edit selected row"
 msgstr "Izmijeni izabrani red"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Izbriši"
@@ -245,57 +245,57 @@ msgstr "Osvježi"
 msgid "Refresh the list"
 msgstr "Osvježi listu"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Zaključano"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Isteklo"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Kliknite na ikonu da je promijenite"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Napravi novog korisnika"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Napravi početni direktorij"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Početni direktorij: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Napravi privatnu grupu za korisnika"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Ručno definiši korisnički ID"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Korisnik već postoji na sistemu. Izaberite drugo korisničko ime"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Šifre nisu jednake"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -304,12 +304,12 @@ msgstr ""
 "Ova šifra je previše jednostavna.\n"
 " Dobre šifre trebaju biti veće od 6 karaktera"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Korisnički Uid je < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -320,91 +320,103 @@ msgstr ""
 " Da li ste sigurni da želite uraditi ovo?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Dodajem %s u grupu 'users'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Pravim novu grupu: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Dodajem korisnika: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Početni direktorij: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "U redu"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Izaberite grupu"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Dodaj u postojeću grupu"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Dodaj u grupu 'users'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Grupa sa ovim nazivom već postoji. Šta želite uraditi?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Napravi novu grupu"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Ručno definiši ID grupe"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Grupa već postoji, izaberite drugi naziv grupe"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " Grupni Gid je < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -415,22 +427,22 @@ msgstr ""
 " Da li ste sigurni da želite ovo uraditi?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Dodajem grupu: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Izbriši datoteke ili ne?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -439,27 +451,27 @@ msgstr ""
 "Brišem korisnika %s\n"
 " Također slijedeće akcije će biti poduzete\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Izbriši početni direktorij: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Izbriši mailbox :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Uklonjam korisnika: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Da li zaista želite izbrisatti grupu %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -468,47 +480,47 @@ msgstr ""
 "%s je primarna grupa za korisnika %s\n"
 " Prvo uklonite korisnika"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Uklonjam grupu: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Ime i prezime:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Korisničko ime:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Šifra:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Ponovo šifra:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Naziv grupe:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Izaberite bar jednu grupu za korisnika"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -517,159 +529,159 @@ msgstr ""
 "Definišite dan, mjesec i godinu\n"
 "kada će račun isteći"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Popunite sva polja za starenje (aging) šifre\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Ne možete ukloniti korisnika '%s' iz njegove primarne grupe"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Početni direktorij:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Podaci korisnika"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Uključi istek računa"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Račun ističe (DD-MM-YYYY):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Zaključaj korisnički račun"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Podaci o računu"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Korisnik je zadnji put promijeni šifru:"
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Uključi istek šifre"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dana prije nego je dozvoljena promjena:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Dana prije nego je promjena zahtjevana:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dana upozorenja prije promjene:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dana prije nego račun bude isključen:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Podaci o šifri"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Izaberite grupe čiji će član korisnik biti"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Podaci o grupi"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Izaberite korisnike koji će se pridružiti grupi"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Korisnici grupe"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Promijeni grupe/korisnike"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Došlo je do greške"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Zatvori"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, fuzzy, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Copyright (C) %s Mandriva"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Menadžment korisnika"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Polje za ime je prazno. Unesite ime"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Ime mora sadržavati samo mala latinična slova, brojeve '-' i '_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Ime je predugačko"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Greška"
@@ -683,73 +695,73 @@ msgstr "Alat za menadžement korisnika na Mageiau"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, fuzzy, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Greška prilikom kreiranja 'mail spool'-a.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Greška prilikom kreiranja `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Greška prilikom kreiranja 'mail spool'-a: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, fuzzy, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Greška prilikom kreiranja 'mail spool'-a.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "nepoznata greška"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 #, fuzzy
 msgid "Group creation failed.\n"
 msgstr "Greška prilikom kreiranja 'mail spool'-a.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Greška prilikom brisanja 'mail spool'-a: %s\n"
diff --git a/po/ca.po b/po/ca.po
index 54dfb0d..5ed0a7e 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2017-11-25 20:36+0000\n"
 "Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -20,12 +20,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "S'estan carregant els usuaris i els grups... Espereu"
@@ -130,7 +130,7 @@ msgstr "Aplica el filtre"
 msgid "Users"
 msgstr "Usuaris"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Grups"
@@ -151,7 +151,7 @@ msgstr "Nom d'usuari"
 msgid "User ID"
 msgstr "Id. d'usuari"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Grup primari"
@@ -211,7 +211,7 @@ msgstr "Afegeix un grup"
 msgid "Add a group to the system"
 msgstr "Afegeix un grup al sistema"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Edita"
@@ -221,7 +221,7 @@ msgstr "Edita"
 msgid "Edit selected row"
 msgstr "Edita la fila seleccionada"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Suprimeix"
@@ -241,57 +241,57 @@ msgstr "Refresca"
 msgid "Refresh the list"
 msgstr "Actualitza la llista"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Bloquejat"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Expirada"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Feu clic a la icona per canviar-la"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Crea un usuari nou"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Crea el directori de l'usuari"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Directori de l'usuari: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Crea un grup privat per a l'usuari"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Especifica manualment l'id. de l'usuari"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Aquest usuari ja existeix dins el sistema, escolliu-ne un altre"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "La contrasenya no coincideix"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -300,12 +300,12 @@ msgstr ""
 "Aquesta contrasenya és massa simple. \n"
 " Les bones contrasenyes tenen més de 6 caràcters"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "UID d'usuari és < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -316,27 +316,39 @@ msgstr ""
 " Esteu segur de voler fer això?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "S'està posant %s al grup 'users'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "S'està creant el nou grup: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "S'està afegint l'usuari: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Directori de l'usuari: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Auxiliar de migració"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -345,64 +357,64 @@ msgstr ""
 "Voleu executar l'auxiliar de migració per importar els vostres documents i "
 "paràmetres de Windows a la vostra distribució de Mageia?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "D'acord"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Escull grup"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Afegeix a un grup existent"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Afegeix al grup 'users'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Ja existeix un grup amb aquest nom. Que vols fer?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Crea un nou grup"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Especifica manualment l'id. de grup"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "El grup ja existeix; si us plau, trieu un altre nom de grup."
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " El GID del grup és < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -413,22 +425,22 @@ msgstr ""
 "Esteu segur que voleu fer-ho?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "S'està afegint el grup: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Esborrar fitxers o no?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -437,27 +449,27 @@ msgstr ""
 "S'està esborrant l'usuari %s\n"
 " Fes també les següents accions\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Suprimeix el directori personal: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Suprimeix el mailbox: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "S'està eliminant l'usuari: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Esteu segur de voler suprimir el grup %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -466,47 +478,47 @@ msgstr ""
 "%s és un grup primari per l'usuari %s\n"
 " Elimineu l'usuari abans"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "S'està eliminant el grup: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Nom complet:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Usuari:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Confirmeu la contrasenya:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell d'inici de sessió:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Nom del grup:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Escolliu com a mínim un grup per l'usuari"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -515,162 +527,162 @@ msgstr ""
 "Indiqueu l'any, mes i dia\n"
 "per al venciment del compte"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Empleneu tots els camps per l'envelliment de contrasenya\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "No podeu eliminar l'usuari '%s' del seu grup primari"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Directori de l'usuari:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Dades de l'usuari"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Habilita el venciment del compte"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "El compte venç (AAAA-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Bloqueja el compte d'usuari"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Informació del compte"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "L'usuari va canviar la contrasenya el: "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Habilita el venciment de la contrasenya"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dies abans que es permeti el canvi:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Dies abans que es requereixi el canvi:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dies d'avís abans del canvi:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dies abans que s'inactivi el compte:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Informació de la contrasenya"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Escolliu els grups dels quals serà membre aquest usuari:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Dades del grup"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Escolliu els usuaris que s'uniran a aquest grup:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Usuaris del grup"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Edita Grups / Usuaris"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "S'ha produït un error:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Tanca"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s per Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Copyright (C) %s per Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Gestió d'usuaris"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Albert Astals Cid <astals11@terra.es>\n"
 "Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "El camp del nom està buit, indiqueu un nom"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 "El nom només pot contenir minúscules de lletres llatines, números, `-' i `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "El nom és massa llarg"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Error"
@@ -683,76 +695,76 @@ msgstr "Executa el gestor d'usuaris de Mageia"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr "Cal autenticar-vos per executar el gestor d'usuaris de Mageia"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Error en crear el compte: '%s'.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "No s'ha pogut obtenir el nombre Uid"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "No s'ha pogut recuperar el valor"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Error en crear `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Error en crear cua de correu: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "No s'ha pogut modificar l'usuari: '%s'.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 "No s'ha pogut eliminar l'usuari: '%s'.\n"
 "\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 "Error en configurar la contrasenya: '%s'.\n"
 "\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "error desconegut"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Error en crear grup.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "No s'ha pogut modificar el grup: '%s'.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "No s'ha pogut eliminar el grup: '%s'.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "No hi ha directori arrel per a l'usuari.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "No s'ha pogut eliminar el directori de l'usuari: '%s'.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Error en esborrar la cua de correu: %s\n"
diff --git a/po/cs.po b/po/cs.po
index 5f6c291..d9bd511 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2016-04-18 21:43+0000\n"
 "Last-Translator: fri\n"
 "Language-Team: Czech (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Načítají se uživatelé a skupiny… Počkejte, prosím"
@@ -127,7 +127,7 @@ msgstr "Použít filtr"
 msgid "Users"
 msgstr "Uživatelé"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Skupiny"
@@ -148,7 +148,7 @@ msgstr "Jméno uživatele"
 msgid "User ID"
 msgstr "ID uživatele"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Primární skupina"
@@ -208,7 +208,7 @@ msgstr "Přidat skupinu"
 msgid "Add a group to the system"
 msgstr "Přidat skupinu do systému"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Změnit"
@@ -218,7 +218,7 @@ msgstr "Změnit"
 msgid "Edit selected row"
 msgstr "Upravit vybraný řádek"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Odstranit"
@@ -238,57 +238,57 @@ msgstr "Obnovit"
 msgid "Refresh the list"
 msgstr "Obnovit seznam"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Zamčený"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Vypršel"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Klepnutím na ikonu provedete změnu"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Vytvořit nového uživatele"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Vytvořit domovský adresář"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Domovský adresář: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Vytvořit pro uživatele samostatnou skupinu"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Zadat ID uživatele ručně"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Uživatel již existuje. Vyberte, prosím, jiné uživatelské jméno"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Hesla se neshodují"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -297,12 +297,12 @@ msgstr ""
 "Toto heslo je příliš jednoduché.\n"
 " Správná hesla by měla být delší než 6 znaků"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "ID uživatele je menší než 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -313,27 +313,39 @@ msgstr ""
 "Jste si jisti, že to chcete udělat?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Přidává se %s do skupiny „users”"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Vytváří se nová skupina: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Přidává se uživatel: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Domovský adresář: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Průvodce migrací"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -342,64 +354,64 @@ msgstr ""
 "Chcete spustit průvodce migrací, který vám umožní přenést dokumenty a "
 "nastavení z Windows do Vaší distribuce Mageia?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Vybrat skupinu"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Přidat k existující skupině"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Přidat ke skupině „users”"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Skupina s tímto názvem již existuje. Co chcete udělat?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Vytvořit novou skupinu"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Zadat ID skupiny ručně"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Skupina již existuje, vyberte, prosím, jiný název skupiny"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "GID skupiny je menší než 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -410,22 +422,22 @@ msgstr ""
 "Jste si jisti, že to chcete udělat?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Přidává se skupina: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Odstranit soubory nebo ne?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -434,27 +446,27 @@ msgstr ""
 "Odstraňuji uživatele %s\n"
 " Provádějí se také následující činnosti\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Smazání domovského adresáře: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Smazání poštovní schránky: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Odebírá se uživatel: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Opravdu chcete odstranit skupinu %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -463,47 +475,47 @@ msgstr ""
 "%s je primární skupina pro uživatele %s\n"
 "Odstraňte nejprve tohoto uživatele"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Odebírá se skupina: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Celé jméno:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Přihlášení:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Potvrdit heslo:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Přihlašovací shell:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Název skupiny:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Vyberte, prosím, pro uživatele alespoň jednu skupinu"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -512,161 +524,161 @@ msgstr ""
 "Zadejte, prosím, rok, měsíc a den\n"
 "vypršení účtu"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Pro vypršení hesla vyplňte, prosím, všechna pole\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Nelze odstranit uživatele '%s' z jeho primární skupiny"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Domovský adresář:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Údaje o uživateli"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Povolit vypršení účtu"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Účet vyprší (RRRR-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Zamknout účet uživatele"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Informace o účtu"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Uživatel naposledy změnil heslo dne: "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Povolit vypršení hesla"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Počet dní před povolením změny:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Počet dní před vyžadováním změny:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Počet dní mezi upozorněním a změnou:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Počet dní před vypršením účtu:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Informace o heslu"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Vyberte skupiny, do kterých má uživatel patřit:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Údaje o skupině"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Vyberte uživatele, kteří mají být v této skupině:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Uživatelé skupiny"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Upravit skupiny/Uživatele"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Nastala chyba:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Zavřít"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Autorské právo (C) %s Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Autorské právo (C) %s Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Správa uživatelů"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Michal Bukovjan <bukm@centrum.cz>\n"
 "Pavel Fric  <pavelfric@seznam.cz>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Pole se jménem je prázdné. Zadejte, prosím, jméno"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Jméno musí obsahovat pouze malá písmena, číslice a znaky „-” a „_”"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Jméno je příliš dlouhé"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Chyba"
@@ -679,72 +691,72 @@ msgstr "Spustit správce uživatelů Mageii"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr "Ke spuštění správce Mageii pro uživatele je vyžadováno ověření"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Chyba při vytváření účtu: „%s”.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Nelze získat číslo UID"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Nelze získat hodnotu"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Chyba při vytváření „%s”: %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Chyba při vytváření poštovní fronty: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Uživatele nebylo možné upravit: „%s”.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Uživatele nebylo možné smazat: „%s”.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Selhalo nastavení hesla: „%s”.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "Neznámá chyba"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Chyba při vytváření skupiny.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Skupinu nebylo možné upravit: „%s”.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Skupinu nebylo možné smazat: „%s”.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Uživateli chybí domovský adresář.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Domovský adresář nebylo možné smazat: „%s”.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Chyba při odstraňování poštovní fronty: %s\n"
diff --git a/po/cy.po b/po/cy.po
index 2603eaa..141c338 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2016-01-08 22:18+0000\n"
 "Last-Translator: ciaran\n"
 "Language-Team: Welsh (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -19,12 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
 "11) ? 2 : 3;\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Llwytho defnyddwyr a grwpiau... Arhoswch"
@@ -129,7 +129,7 @@ msgstr "Gosod hidlydd"
 msgid "Users"
 msgstr "Defnyddwyr"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Grwpiau"
@@ -150,7 +150,7 @@ msgstr "Enw defnyddiwr"
 msgid "User ID"
 msgstr "ID defnyddiwr"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Grŵp cynradd"
@@ -210,7 +210,7 @@ msgstr "Ychwanegu grŵp"
 msgid "Add a group to the system"
 msgstr "Ychwanegu grŵp i'r system"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Golygu"
@@ -220,7 +220,7 @@ msgstr "Golygu"
 msgid "Edit selected row"
 msgstr "Golygu'r rhes"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Dileu"
@@ -240,57 +240,57 @@ msgstr "Adnewyddu"
 msgid "Refresh the list"
 msgstr "Adnewyddu'r rhestr"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Clöwyd"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Wedi dod i ben"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Cliciwch ar yr eicon i'w newid"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Creu defnyddiwr newydd"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Creu cyfeiriadur cartref"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Cyfeiriadur cartref:"
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Creu grŵp preifat ar gyfer y defnyddiwr"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Nodi enw'r defnyddiwr â llaw"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Mae'r defnyddiwr yn bodoli eisoes, dewiswch Enw Defnyddiwr arall"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Nid yw'r cyfrinair yn cyd-fynd"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -299,12 +299,12 @@ msgstr ""
 "Mae'r cyfrinair yn rhy syml.\n"
 "Mae cyfrineiriau effeithiol yn fwy na 6 nod"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "UID Defnyddiwr < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -315,27 +315,39 @@ msgstr ""
 "Ydych chi'n siŵr eich bod am wneud hyn?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Rhoi '%s' yn y grŵp 'defnyddwyr'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Creu grŵp newydd: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Ychwanegu defnyddiwr: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Cyfeiriadur cartref:"
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Dewin mudo"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -344,64 +356,64 @@ msgstr ""
 "Hoffech chi redeg y dewin mudo er mwyn mewnforio eich holl dogfennau a'ch "
 "gosodiadau Windows i'ch dosbarthiad Mageia?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Dileu"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Dewis grŵp"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Ychwanegu at y grŵp presennol"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Ychwanegu at y grŵp 'defnyddwyr'."
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Mae grŵp gyda'r enw hwn yn bodoli eisoes. Beth hoffech ei wneud?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Creu Grŵp Newydd"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Enwch enw'r grŵp gyda llaw"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Mae'r grŵp yn bodoli eisoes, dewiswch Enw Grŵp arall"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " Gid Grŵp < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -412,22 +424,22 @@ msgstr ""
 "Ydych chi wir am wneud hyn?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Ychwanegu grŵp: %s"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Dileu ffeil neu beidio?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -436,27 +448,27 @@ msgstr ""
 "Dileu defnyddiwr %s\n"
 " Hefyd cyflawni'r gweithredoedd canlynol\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Dileu Cyfeiriadur Cartref: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Dileu'r blwch e-bost: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Tynnu defnyddiwr: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Ydych chi wir eisiau dileu grŵp %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -465,47 +477,47 @@ msgstr ""
 "%s yw'r grŵp cynradd ar gyfer defnyddiwr %s\n"
 " Tynnwch y defnyddiwr yn gyntaf"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Tynnu grŵp: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Enw llawn:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Mewngofnod:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Cadarnhau cyfrinair:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Cragen mewngofnodi:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Enw grŵp:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Dewiswch o leiaf un grŵp ar gyfer y defnyddiwr"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -514,162 +526,162 @@ msgstr ""
 "Nodwch flwyddyn, mis a diwrnod\n"
 "i'r cyfrif ddod i ben"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Llanwch yr holl feysydd yn y cyfrinair eto\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Nid oes modd tynnu defnyddiwr '%s; o'u grŵp cynradd"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Cartref:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Data defnyddiwr"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Galluogi trefnu'r cyfrif"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Cyfrif yn dod i ben: (BBBB-MMM-DD)"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Cloi cyfrif defnyddiwr"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Gwybodaeth cyfrif"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Newidiodd y defnyddiwr gyfrinair ar:"
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Galluogi terfyn amser i gyfrinair"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Diwrnodau cyn caniatáu newid:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Diwrnodau cyn bod angen newid:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Diwrnodau rhybuddio cyn newid:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Diwrnodau cyn i'r cyfrif ddod i ben:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Gwybodaeth gyfrinair"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Dewis y grwpiau y bydd y defnyddiwr yn aelod ohonynt:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Data grŵp"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Dewis defnyddwyr i ymuno â'r grŵp"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Defnyddwyr grwpiau"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Golygu grwpiau / defnyddwyr"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Cododd gwall:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Cau"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Hawlfraint (C) %s  Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Hawlfraint (C) %s gan Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Rheoli defnyddwyr"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "_: Rhoslyn Prys <post@meddal.com>\n"
 "Ciaran\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Mae'r maes enw'n wag cynigwch enw"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 "Rhaid i'r enw gynnwys dim ond llythrennau Lladinaidd bach, rhifau `-' a `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Mae'r enw'n rhy hir"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Gwall"
@@ -682,72 +694,72 @@ msgstr "Rhedeg rheolydd defnyddwyr Mageia"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr "Rhaid dilysu er mwyn rhedeg rheolydd defnyddwyr Mageia"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Gwall greu `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Gwall creu sbŵl e-bost: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Methu addasu'r defnyddiwr: '%s'.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Methu dileu'r defnyddiwr: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Methu gosod y cyfrinair: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "gwall anhysbys"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Wedi methu creu grŵp.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Methu addasu'r grŵp: '%s'.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Methu dileu'r grŵp: '%s'.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Dim cyfeiriadur cartref i'r defnyddiwr.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Methu dileu'r cyfeiriadur cartref: '%s'.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Gwall dileu'r sbŵl e-bost: %s\n"
diff --git a/po/da.po b/po/da.po
index 74d44a6..95f3624 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2017-11-19 18:26+0000\n"
 "Last-Translator: scootergrisen\n"
 "Language-Team: Danish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -25,12 +25,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Indlæser brugere og grupper... Vent venligst"
@@ -135,7 +135,7 @@ msgstr "Udfør filter"
 msgid "Users"
 msgstr "Brugere"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Grupper"
@@ -156,7 +156,7 @@ msgstr "Brugernavn"
 msgid "User ID"
 msgstr "Bruger-id"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Primær gruppe"
@@ -216,7 +216,7 @@ msgstr "Tilføj gruppe"
 msgid "Add a group to the system"
 msgstr "Tilføj en gruppe til systemet"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Redigér"
@@ -226,7 +226,7 @@ msgstr "Redigér"
 msgid "Edit selected row"
 msgstr "Redigér valgte række"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Slet"
@@ -246,57 +246,57 @@ msgstr "Genopfrisk"
 msgid "Refresh the list"
 msgstr "Genopfrisk listen"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Låst"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Udløbet"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Klik på ikonen for at ændre den"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Opret ny bruger"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Opret hjemmekatalog"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Hjemmekatalog;: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Opret en privat gruppe for brugeren"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Angiv bruger-id manuelt"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Brugeren findes allerede, vælg venligst et andet brugernavn"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Adgangskode passer ikke"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -305,12 +305,12 @@ msgstr ""
 "Denne adgangskode er for simpel. \n"
 " Gode adgangskoder bør være på mere end 6 tegn"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Brugernes UID er mindre end 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -321,27 +321,39 @@ msgstr ""
 "Er du sikker på, at du vil gøre dette?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Tilføjer %s til 'users'-gruppen"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Opretter ny gruppe: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Tilføjer bruger: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Hjemmekatalog;: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Migrationshjælper"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -350,64 +362,64 @@ msgstr ""
 "Ønsker du at køre migrationshjælperen for at importere Windows-dokumenter og "
 "-opsætninger til din Mageia-distribution?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Annullér"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Vælg gruppe"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Tilføj til eksisterende gruppe"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Tilføj til 'users'-gruppen"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "En gruppe med dette navn findes allerede. Hvad vil du gøre?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Opret ny gruppe"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Angiv gruppe-id manuelt"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Gruppe findes allerede, vælg venligst et andet gruppenavn"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " Gruppe-GID er mindre end 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -418,22 +430,22 @@ msgstr ""
 " Er du sikker på, at du vil gøre dette?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Tilføjer gruppe: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Skal filer slettes eller ej?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -442,27 +454,27 @@ msgstr ""
 "Sletter bruger %s\n"
 " Udfør også de følgende de følgende handlinger\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Slet hjemmekatalog: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Slet postboks: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Fjerner bruger: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Vil du virkelig slette gruppen %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -471,47 +483,47 @@ msgstr ""
 "%s er en primær gruppe for bruger %s\n"
 " Fjern brugeren først"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Fjerner gruppe: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Fulde navn:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Bekræft adgangskode:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Login-skal:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Gruppenavn:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Vælg venligst mindst en gruppe for brugeren"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -520,159 +532,159 @@ msgstr ""
 "Angiv venligst år, måned og dag\n"
 " for udløb af konto "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Udfyld venligst alle felter for forældelse af adgangskoder\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Du kan ikke fjerne bruger '%s' fra deres primære gruppe"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Hjem:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Brugerdata"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Aktivér udløb for konti"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Kontoen udløber (ÅÅÅÅ-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Lås brugerkonto"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Konto-information"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Bruger ændrede sidst adgangskode den: "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Aktivér udløbtid for adgangskoder"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dage før ændring er tilladt:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Dage før ændring er krævet:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Advarsel gives antal dage før ændring:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dage før konto deaktiveres:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Info om adgangskode"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Vælg grupperne som brugeren vil være medlem af:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Gruppedata"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Vælg de brugere som skal tilføjes i denne gruppe:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Gruppebrugere"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Redigér grupper/brugere"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Der opstod en fejl:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Luk"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Ophavsret © %s ved Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Ophavsret (C) %s ved Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Administration af brugere"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Keld Simonsen <keld@rap.dk>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Navnefelt er tomt, opgiv venligst et navn"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Navnet må kun indeholde små bogstaver, cifre, '-' og '_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Navnet er for langt"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Fejl"
@@ -687,72 +699,72 @@ msgstr ""
 "Autentifikation er påkrævet for at køre Mageia' værktøj til "
 "brugeradministration"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Fejl ved oprettelse af konto: '%s'.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Kan ikke få fat på Uid-nummer"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Kan ikke hente værdi"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Fejl ved oprettelse af '%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Fejl ved oprettelse af mellemlager for post: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Bruger kunne ikke ændres: '%s'.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Bruger kunne ikke slettes: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Kunne ikke sætte adgangskode: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "ukendt fejl"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Fejl ved oprettelse af gruppe.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Gruppe kunne ikke ændres: '%s'.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Gruppe kunne ikke slettes: '%s'.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Intet hjemmekatalog for brugeren.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Hjemmekatalog kunne ikke slettes: '%s'.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Fejl ved sletning af mellemlager for post: %s\n"
diff --git a/po/de.po b/po/de.po
index 91b992f..b3bc74e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2016-07-17 09:02+0000\n"
 "Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
 "Language-Team: German (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -21,12 +21,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "User-Drake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Benutzer und Gruppen werden geladen... Bitte warten"
@@ -131,7 +131,7 @@ msgstr "Filter anwenden"
 msgid "Users"
 msgstr "Benutzer"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Gruppen"
@@ -152,7 +152,7 @@ msgstr "Benutzername"
 msgid "User ID"
 msgstr "Benutzer-ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Primärgruppe"
@@ -212,7 +212,7 @@ msgstr "Gruppe hinzufügen"
 msgid "Add a group to the system"
 msgstr "Gruppe zum System hinzufügen"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -222,7 +222,7 @@ msgstr "Bearbeiten"
 msgid "Edit selected row"
 msgstr "Ausgewählte Zeile bearbeiten"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Löschen"
@@ -242,57 +242,57 @@ msgstr "Aktualisieren"
 msgid "Refresh the list"
 msgstr "Liste aktualisieren"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Gesperrt"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Abgelaufen"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Klicken Sie auf das Symbol, um es zu ändern."
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Neuen Benutzer erstellen"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Persönliches Verzeichnis erstellen"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Persönliches Verzeichnis:"
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Private Gruppe für den Benutzer erstellen"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Benutzer-ID manuell angeben"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Benutzer existiert bereits. Bitte einen anderen Namen wählen."
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Passwörter stimmen nicht überein"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -301,12 +301,12 @@ msgstr ""
 "Das Passwort ist zu einfach. \n"
 "Gute Passwörter sind länger als 6 Zeichen."
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Benutzer-ID ist unter 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -317,27 +317,39 @@ msgstr ""
 "Wollen Sie das wirklich machen?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Nehme %s in die Gruppe „users“ auf."
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Erstelle neue Gruppe: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Benutzer hinzufügen: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Persönliches Verzeichnis:"
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Migrations-Assistent"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -346,64 +358,64 @@ msgstr ""
 "Wollen Sie den Migrations-Assistenten für den Import von Windows-Dokumenten "
 "und -Einstellungen starten?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Gruppe auswählen"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Zur existierenden Gruppe hinzufügen"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "In die Gruppe „users“ aufnehmen"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Eine Gruppe dieses Namens existiert bereits. Was wollen Sie tun?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Neue Gruppe erstellen"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Gruppen-ID manuell angeben"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Gruppe existiert bereits. Bitte einen anderen Namen wählen."
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "Gruppen-ID ist unter 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -414,22 +426,22 @@ msgstr ""
 "Wollen Sie das wirklich machen?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Füge Gruppe hinzu: %s"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Dateien löschen - Ja oder Nein?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -438,27 +450,27 @@ msgstr ""
 "Benutzer %s löschen\n"
 "und folgende Aktionen ausführen\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Persönliches Verzeichnis löschen: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Mailbox löschen: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Entferne Benutzer: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Wollen Sie wirklich die folgende Gruppe löschen: %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -467,47 +479,47 @@ msgstr ""
 "%s ist die Hauptgruppe des Benutzers %s\n"
 "Entfernen Sie zuerst den Benutzer"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Entferne Gruppe: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Vollständiger Name:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Benutzername:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Passwort bestätigen:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Login-Shell:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Gruppenname:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Bitte wählen Sie mindestens eine Gruppe für den Benutzer"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -516,138 +528,138 @@ msgstr ""
 "Geben Sie das Ablaufdatum des\n"
 "Zugangs an (Jahr, Monat und Tag)"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Bitte füllen Sie alle Felder zum Ablaufen des Passworts aus.\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Sie können den Benutzer „%s“ nicht aus seiner Hauptgruppe entfernen."
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Persönliches Verzeichnis:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Benutzerdaten"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Benutzerkonto soll ablaufen"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Konto läuft ab (JJJJ-MM-TT):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Benutzerkonto sperren"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Benutzerkonto-Info"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Passwort zuletzt geändert am:"
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Passwort soll ablaufen"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Tage vor nächster erlaubter Änderung:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Tage vor nächster erzwungener Änderung:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Anzahl Tage vor Änderung ab deren gewarnt wird:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Tage bevor Zugang gesperrt wird:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Passwort-Info"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Wählen Sie die Gruppen, denen der Benutzer angehören wird:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Gruppendaten"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Wählen Sie die Benutzer für diese Gruppe aus:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Gruppenbenutzer"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Benutzer / Gruppen bearbeiten"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Ein Fehler ist aufgetreten:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Schließen"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright·(C)·%s·bei·Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Copyright (C) %s bei Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Benutzerverwaltung"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
@@ -655,12 +667,12 @@ msgstr ""
 "Sebastian Deutscher <sebastian.deutscher@web.de>\n"
 "Oliver Burger <oliver.bgr@googlemail.com>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Es wurde kein Name angegeben. Bitte ändern."
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
@@ -668,12 +680,12 @@ msgstr ""
 "Der Name darf nur Kleinbuchstaben ohne Umlaute, Zahlen,  „-“ und „_“ "
 "enthalten."
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Der Name ist zu lang"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Fehler"
@@ -688,72 +700,72 @@ msgstr ""
 "Eine Authentifizierung wird benötigt, um das Mageia-Benutzerverwaltungs-"
 "Werkzeug zu starten"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Fehler beim Anlegen des Benutzerkontos: „%s“.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Die UID kann nicht gelesen werden"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Der Wert kann nicht gelesen werden"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Fehler beim Anlegen von „%s“: %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Fehler beim Anlegen des Mail-Spool: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Der Benutzer konnte nicht verändert werden: „%s“.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Der Benutzer konnte nicht gelöscht werden: „%s“.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Konnte das Passwort nicht setzen: „%s“.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "unbekannter Fehler"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Anlegen der Gruppe fehlgeschlagen.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Die Gruppe konnte nicht verändert werden: „%s“.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Die Gruppe konnte nicht gelöscht werden: „%s“.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Kein Home-Verzeichnis für den Benutzer angegeben.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Das Home-Verzeichnis konnte nicht gelöscht werden: „%s“.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Fehler beim Entfernen des Mail-Spool: %s\n"
diff --git a/po/el.po b/po/el.po
index f0f7e57..82a332d 100644
--- a/po/el.po
+++ b/po/el.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2013-11-26 05:38+0100\n"
 "Last-Translator: Dimitrios Glentadakis <dglent@gmail.com>\n"
 "Language-Team: Greek <i18n-el@ml.mageia.org>\n"
@@ -25,12 +25,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Φόρτωση των χρηστών και των ομάδων... Παρακαλώ περιμένετε"
@@ -135,7 +135,7 @@ msgstr "Εφαρμογή φίλτρου"
 msgid "Users"
 msgstr "Χρήστες"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Ομάδες"
@@ -156,7 +156,7 @@ msgstr "Όνομα χρήστη"
 msgid "User ID"
 msgstr "ID χρήστη"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Κύρια ομάδα"
@@ -216,7 +216,7 @@ msgstr "Προσθήκη ομάδας"
 msgid "Add a group to the system"
 msgstr "Προσθήκη μιας ομάδας στο σύστημα"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Επεξεργασία"
@@ -226,7 +226,7 @@ msgstr "Επεξεργασία"
 msgid "Edit selected row"
 msgstr "Επεξεργασία της επιλεγμένης γραμμής"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Διαγραφή"
@@ -246,57 +246,57 @@ msgstr "Ανανέωση"
 msgid "Refresh the list"
 msgstr "Ανανέωση της λίστας"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Κλειδωμένο"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Ληγμένο"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Κάντε κλικ πάνω στο εικονίδιο για να το αλλάξετε"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Δημιουργία ενός νέου χρήστη"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Δημιουργία του προσωπικού καταλόγου"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Προσωπικός κατάλογος: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Δημιουργία μιας ιδιωτικής ομάδας για το χρήστη"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Χειροκίνητος ορισμός ID χρήστη"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Ο χρήστης υπάρχει ήδη, παρακαλώ επιλέξτε ένα άλλο όνομα χρήστη"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Ο κωδικός πρόσβασης δεν συμφωνεί"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -306,12 +306,12 @@ msgstr ""
 " Ένας καλός κωδικός πρόσβασης θα πρέπει να περιέχει περισσότερους από 6 "
 "χαρακτήρες"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Το Uid του χρήστη είναι μικρότερο από 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -322,27 +322,39 @@ msgstr ""
 " Είστε βέβαιος/η ότι θέλετε να συνεχίσετε;\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Προσθήκη του %s στην ομάδα «users»"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Δημιουργία νέας ομάδας: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Προσθήκη του χρήστη: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Προσωπικός κατάλογος: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Οδηγός μεταφοράς"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -351,64 +363,64 @@ msgstr ""
 "Επιθυμείτε την εκτέλεση του οδηγού μεταφοράς ώστε να γίνει η εισαγωγή "
 "εγγράφων και ρυθμίσεων στην διανομή σας Mageia;"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Εντάξει"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Επιλέξτε ομάδα"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Προσθήκη στην υπάρχουσα ομάδα"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Προσθήκη στην ομάδα «users»"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Μια ομάδα με αυτό το όνομα υπάρχει ήδη. Τι θα θέλατε να κάνετε;"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Δημιουργία νέας ομάδας"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Χειροκίνητος ορισμός ID ομάδας"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Η ομάδα υπάρχει ήδη, παρακαλώ επιλέξτε ένα άλλο όνομα ομάδας"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " Το Gid της ομάδας είναι μικρότερο του 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -419,22 +431,22 @@ msgstr ""
 " Είστε βέβαιος/η ότι θέλετε να συνεχίσετε;\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Προσθήκη της ομάδας: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Διαγραφή των αρχείων ή όχι;"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -443,27 +455,27 @@ msgstr ""
 "Διαγράφεται ο χρήστης %s\n"
 " Επίσης πραγματοποιήστε και τις παρακάτω ενέργειες\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Διαγραφή προσωπικού καταλόγου: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Διαγραφή γραμματοκιβωτίου :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Αφαίρεση χρήστη: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Επιθυμείτε πραγματικά τη διαγραφή της ομάδας %s;"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -472,47 +484,47 @@ msgstr ""
 "%s είναι μια κύρια ομάδα για τον χρήστη %s\n"
 " Αφαιρέστε το χρήστη πρώτα"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Αφαίρεση ομάδας: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Πλήρες όνομα:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Χρήστης:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Κωδικός πρόσβασης:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Επιβεβαίωση του κωδικού πρόσβασης:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Κέλυφος σύνδεσης:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Όνομα ομάδας:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Παρακαλώ επιλέξτε τουλάχιστον μία ομάδα για τον χρήστη"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -521,150 +533,150 @@ msgstr ""
 "Παρακαλώ καθορίστε το έτος, το μήνα και την ημέρα\n"
 " για την λήξη του λογαριασμού"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Παρακαλώ συμπληρώστε όλα τα πεδία για την λήξη του κωδικού πρόσβασης\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Δεν μπορείτε να αφαιρέσετε τον χρήστη «%s» από την κύρια ομάδα του"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Προσωπικός φάκελος:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Δεδομένα χρήστη"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Ενεργοποίηση λήξης του λογαριασμού"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Λήξη λογαριασμού (ΕΕΕΕ-ΜΜ-ΗΗ):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Φραγή του λογαριασμού χρήστη"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Πληροφορίες λογαριασμού"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Ο χρήστης άλλαξε τον κωδικό του την τελευταία φορά στις: "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Ενεργοποίηση λήξης του κωδικού πρόσβασης"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Αριθμός ημερών πριν να επιτραπεί μια αλλαγή:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Μέρες πριν από την υποχρεωτική αλλαγή :"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Ημέρες προειδοποίησης πριν από την αλλαγή :"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Μέρες πριν ο λογαριασμός γίνει ανενεργός :"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Πληροφορίες κωδικού"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Επιλέξτε τις ομάδες στις οποίες θα ανήκει αυτός ο χρήστης:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Δεδομένα Ομάδας"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Επιλέξτε τους χρήστες που θα προστεθούν σε αυτή την ομάδα :"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Ομάδα Χρηστών"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Επεξεργασία Ομάδων / Χρηστών"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Παρουσιάστηκε ένα σφάλμα :"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Πνευματικά δικαιώματα (C)%s από Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Πνευματικά δικαιώματα (C) %s από τη Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Διαχείριση χρηστών"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Νίκος Νύκταρης <niktarin@yahoo.com>\n"
 "Δημήτριος Γλενταδάκης <dglent@gmail.com>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Το πεδίο όνομα είναι κενό παρακαλώ δώστε ένα όνομα"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
@@ -672,12 +684,12 @@ msgstr ""
 "Το όνομα πρέπει να περιέχει μόνο μικρά λατινικά γράμματα, αριθμούς, `-' και "
 "`_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Το όνομα είναι πολύ μακρύ"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Σφάλμα"
@@ -690,73 +702,73 @@ msgstr "Εκτέλεση του Διαχειριστή Χρηστών Mageia"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr "Απαιτείται πιστοποίηση για την εκτέλεση του Διαχειριστή Χρηστών Mageia"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Η δημιουργία του λογαριασμού απέτυχε: «%s».\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Αδύνατη η λήψη του αριθμού Uid"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Αδύνατη η ανάκτηση της τιμής"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Σφάλμα κατά τη δημιουργία του `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr ""
 "Σφάλμα κατά τη δημιουργία του καταλόγου αποθήκευσης ηλ.αλληλογραφίας: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Δεν είναι δυνατή η τροποποίηση του χρήστη: «%s».\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Δεν είναι δυνατή η διαγραφή του χρήστη: «%s».\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Αποτυχία αρχικοποίησης του κωδικού πρόσβασης: «%s».\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "άγνωστο σφάλμα"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Η δημιουργία της ομάδας απέτυχε.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Δεν είναι δυνατή η τροποποίηση της ομάδας: «%s».\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Δεν είναι δυνατή η διαγραφή της ομάδας: «%s».\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Κανένας προσωπικός κατάλογος για τον χρήστη.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Ο προσωπικός κατάλογος δεν μπορεί να διαγραφεί: «%s».\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr ""
diff --git a/po/eo.po b/po/eo.po
index bc8260e..b3b9a37 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2015-02-13 05:26+0000\n"
 "Last-Translator: gfs1989 <gfs1989@gmx.net>\n"
 "Language-Team: Esperanto (http://www.transifex.com/MageiaLinux/mageia/"
@@ -21,12 +21,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Ŝargante uzulojn kaj grupojn... Bv. atendi"
@@ -131,7 +131,7 @@ msgstr "Apliki filtrilon"
 msgid "Users"
 msgstr "Uzuloj"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Grupoj"
@@ -152,7 +152,7 @@ msgstr "Uzul-nomo"
 msgid "User ID"
 msgstr "Uzula identigilo"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Ĉefa Grupo"
@@ -212,7 +212,7 @@ msgstr "Aldoni Grupon"
 msgid "Add a group to the system"
 msgstr "Aldoni grupon al la sistemo"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Redakti"
@@ -222,7 +222,7 @@ msgstr "Redakti"
 msgid "Edit selected row"
 msgstr "Redakti elektitan linion"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Forigi"
@@ -242,57 +242,57 @@ msgstr "Aktualigi"
 msgid "Refresh the list"
 msgstr "Aktualigi la liston"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Ŝlosita"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Senvalidiĝinta"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Alklaku la piktogramon por ŝanĝi ĝin"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Krei Novan Uzulon"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Krei Hejman Dosierujon"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Hejma Dosierujo:"
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Krei privatan grupon por la uzulo"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Difini permane uzul-identigilon"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Ĉi tiu uzulo jam ekzistas, Bv. elekti alian uzulnomon"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Pasvorta Malkongruo"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -301,12 +301,12 @@ msgstr ""
 "Ĉi tiu pasvorto estas tro simpla. \n"
 " Bonaj pasvortoj havas pli ol 6 karaktrojn"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Uzula identigilo estas < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -318,27 +318,39 @@ msgstr ""
 " Ĉu vi certas ke vi volas fari tion?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Aldonante %s al la grupo 'uzuloj'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Kreante novan grupon: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Aldonante uzulon: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Hejma Dosierujo:"
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Migrad-helpilo"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -347,64 +359,64 @@ msgstr ""
 "Ĉu vi deziras lanĉi la migrado-helpilon por importi Vindozajn dokumentojn "
 "kaj agordojn en vian Mageja distribuaĵo?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Nuligi"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Jes"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "Uzula identigilo: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Elekti grupon"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Aldoni al la ekzistanta grupo"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Aldoni al la grupo 'uzuloj'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Grupo kun tiu nomo jam ekzistas.  Kion vi ŝatus fari?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Krei novan grupon"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Difini grupan identigilon permane"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Grupo jam ekzistas, bv. elekti alian grupnomon"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " Identigilo de la grupo estas < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -415,22 +427,22 @@ msgstr ""
 " Ĉu vi certas ke vi volas fari tion?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Aldonante grupon: %s"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "Grupa identigilo: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Ĉu vi volas forigi la dosierojn aŭ ne?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -439,27 +451,27 @@ msgstr ""
 "Forigante la uzulon %s\n"
 " Faru ankaŭ la jenajn agojn\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Forigi Hejman Dosierujon: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Forigi la Poŝtkeston: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Forigante uzulon: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Ĉu vi vere volas forigi la grupon %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -468,47 +480,47 @@ msgstr ""
 "%s estas ĉefa grupo por uzulo %s\n"
 " Unue forigu la uzulon"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Forigante grupon: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Plena nomo:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Salutnomo:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Pasvorto:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Konfirmu pasvorton:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Saluta Ŝelo:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Grupa Nomo:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Bv. elekti almenaŭ unu grupon por la uzulo"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -517,162 +529,162 @@ msgstr ""
 "Bv. specifi Jaron, Monaton kaj Tagon \n"
 " por konta eksvalidiĝo "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Bv. difini ĉiujn kampojn por pasvort-aĝiĝo\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Vi ne povas forigi la uzulon '%s' el lia ĉefa grupo"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Hejmo:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Uzul-datumoj"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Ŝalti kont-eksvalidiĝon"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Konto eksvalidiĝos (JJJJ-MM-TT):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Ŝlosu la Uzul-konton"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Konta Informo"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Uzulo lastfoje ŝanĝis pasvorton je: "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Ŝalti Pasvorto-eksvalidiĝon"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Tagoj antaŭ ol ŝanĝo estas permesita:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Tagoj antaŭ ol ŝanĝo estas postulita:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Tagoj da avertado antaŭ ŝanĝo:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Tagoj antaŭ malŝalto de la konto:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Pasvorta Informo"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Elekti la grupojn en kiuj la uzulo estu membro:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Grupo-datumoj"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Elekti la uzulojn aliĝontajn al tiu grupo:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Grupo-uzuloj"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Redakti Grupojn / Uzulojn"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Eraro okazis:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Fermi"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Kopirajto (C) %s de Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Kopirajto (C) %s ĉe Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Uzula Administrado"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Magejo"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Vilhelmo Lutermano <vlutermano@free.fr>\n"
 "Pablo Foche <pablo.foche@gmail.com>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Nomo-kampo malplenas, bv. havigi nomon"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 "La nomo devas enhavi nur minusklajn latinajn literojn, ciferojn,`-' kaj `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Nomo tro longas"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Eraro"
@@ -685,72 +697,72 @@ msgstr "Kuri Mageja Uzanta Administranto"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr "Bezonas aŭtentigo por kuri Mageja Uzanta Administranto"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Konto-kreado malsukcesis: '%s'.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Ne eblis akiri uzul-identigan nombron"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Ne eblis ricevi valoron"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Eraro dum kreado de `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Eraro dum kreo de retpoŝta mandreno: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Ne eblis modifi uzulon: '%s'.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Ne eblis forigi uzulon: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Malsukcesis la starigo de pasvorto: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "nekonata eraro"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Grupo-kreo malsukcesis.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Ne eblis modifi grupon: '%s'.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Ne eblis forigi grupon: '%s'.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Ne estas hejma dosierujo por la uzulo.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Ne eblas forigi hejman dosierujon: '%s'.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Eraro dum forigo de retpoŝta mandreno: %s\n"
diff --git a/po/es.po b/po/es.po
index 75ef07a..58baaed 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2013-11-16 17:23+0000\n"
 "Last-Translator: Miguel Ortega\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/mageia/language/"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Cargando usuarios y grupos... Por favor espere"
@@ -127,7 +127,7 @@ msgstr "Aplicar filtro"
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Grupos"
@@ -148,7 +148,7 @@ msgstr "Nombre de usuario"
 msgid "User ID"
 msgstr "ID de Usuario"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Grupo primario"
@@ -208,7 +208,7 @@ msgstr "Agregar grupo"
 msgid "Add a group to the system"
 msgstr "Agregar grupo al sistema"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Editar"
@@ -218,7 +218,7 @@ msgstr "Editar"
 msgid "Edit selected row"
 msgstr "Editar fila seleccionada"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Eliminar"
@@ -238,57 +238,57 @@ msgstr "Refrescar"
 msgid "Refresh the list"
 msgstr "Refrescar la lista"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Expirado"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Haga click en el icono para cambiarlo"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Crear usuario nuevo"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Crear directorio home"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Directorio home: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Crear un grupo privado para el usuario"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Especificar un ID de usuario manualmente"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "El usuario ya existe, por favor seleccione otro Nombre de Usuario"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Las contraseñas no coinciden"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -297,12 +297,12 @@ msgstr ""
 "Esta contraseña es demasiado simple.\n"
 "Las contraseñas de calidad deben tener más de 6 caracteres"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "El Uid es menor a 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -313,27 +313,39 @@ msgstr ""
 "¿Está seguro de que quiere hacer esto?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Insertando %s en el grupo 'users'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Creando un nuevo grupo: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Agregando usuario: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Directorio home: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Asistente de migración"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -342,64 +354,64 @@ msgstr ""
 "¿Desea ejecutar el asistente de migración para importar sus documentos y "
 "configuraciones de Windows a su distribución Mageia?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Seleccione grupo"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Agregar a grupo existente"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Agregar al grupo 'users'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Ya existe un grupo con este nombre.   ¿Qué le gustaría hacer?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Crear un grupo nuevo"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Especificar un ID de grupo manualmente"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "El grupo ya existe, por favor elija otro nombre de grupo"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "El Gid de grupo es menor a 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -410,22 +422,22 @@ msgstr ""
 "¿Está seguro de que desea hacer esto?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Agregando grupo %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID:  "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "¿Eliminar o no archivos?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -434,27 +446,27 @@ msgstr ""
 "Eliminando usuario %s\n"
 " También se realizan las siguientes acciones\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Borrar directorio Home: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Borrar Mailbox: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Eliminando usuario: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "¿Realmente quiere eliminar el grupo %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -463,47 +475,47 @@ msgstr ""
 "%s es un grupo primario para el usuario %s\n"
 "Elimine al usuario primero"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Eliminando grupo: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Nombre completo:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Nombre de usuario:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Confirmar contraseña:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Consola de login:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Nombre de grupo:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Por favor seleccione al menos un grupo para el usuario"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -512,162 +524,162 @@ msgstr ""
 "Por favor especifique año, mes y día\n"
 "para la expiración de la cuenta "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Por favor llene todos los campos de caducación de contraseña\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "No puede remover el usuario '%s' de su grupo primario"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Home:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Datos de usuario"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Habilitar expiración de cuenta"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "La cuenta expira (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Bloquear cuenta de usuario"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Información de cuenta"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "El usuario cambió su clave por última vez el: "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Habilitar expiración de contraseña"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dí­as antes de que se permita el cambio:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Días antes de que se requiera el cambio:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Días de advertencia antes del cambio:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Días antes de que la cuenta quede inactiva:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Información de contraseña"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Seleccione los grupos a los que pertenecerá el usuario:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Datos de grupo"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Seleccione los usuarios a unir a este grupo:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Usuarios de grupo"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Editar grupos / usuarios"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Ocurrió un error:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Derechos reservados (C) %s por Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Derechos reservados (C) %s por Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Administración de usuarios"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Diego Bello\n"
 "Luis Llave\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "El campo de Nombre está vacío, por favor ingrese un nombre"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 "El nombre debe contener sólo letras latinas minúsculas, números, `-' y `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "El nombre es demasiado largo"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Error"
@@ -682,72 +694,72 @@ msgstr ""
 "Se necesita autenticación para ejecutar el Administrador de Usuarios de "
 "Mageia"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Falló la creación de la cuenta: '%s'.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "No se puede obtener el número Uid"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "No se puede obtener valor"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Error creando `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Error al crear spool de correo: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "No se pudo modificar el usuario: '%s'.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "No se pudo eliminar el usuario: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Falló la configuración de la contraseña: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Falló la creación de grupo.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "No se pudo modificar el grupo: '%s'.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "No se pudo eliminar el grupo: '%s'.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "No hay directorio home para el usuario.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "No se pudo borrar el directorio home: '%s'.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Error al borrar spool de correo: %s\n"
diff --git a/po/et.po b/po/et.po
index 0552ea4..b511c17 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,28 +1,29 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
-# 
+#
 # Translators:
 # Marek Laane <bald@smail.ee>, 2011,2013
 # Riho Kurg <rx@linux.ee>, 2001
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2015-02-13 05:26+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Estonian (http://www.transifex.com/projects/p/mageia/language/et/)\n"
+"Language-Team: Estonian (http://www.transifex.com/projects/p/mageia/language/"
+"et/)\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Kasutajate ja gruppide laadimine... Palun oodake"
@@ -127,7 +128,7 @@ msgstr "Rakenda filter"
 msgid "Users"
 msgstr "Kasutajad"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Grupid"
@@ -148,7 +149,7 @@ msgstr "Kasutajanimi"
 msgid "User ID"
 msgstr "Kasutaja ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Esmane grupp"
@@ -208,7 +209,7 @@ msgstr "Lisa grupp"
 msgid "Add a group to the system"
 msgstr "Lisab süsteemi grupi"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Muuda"
@@ -218,7 +219,7 @@ msgstr "Muuda"
 msgid "Edit selected row"
 msgstr "Muudab valitud rida"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Kustuta"
@@ -238,418 +239,445 @@ msgstr "Värskenda"
 msgid "Refresh the list"
 msgstr "Värskendab nimekirja"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Lukustatud"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Aegunud"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Ikooni muutmiseks klõpsake sellel"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Uue kasutaja loomine"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Kodukataloogi loomine"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Kodukataloog: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Kasutajale luuakse privaatgrupp"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Kasutaja ID määratakse käsitsi"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Selline kasutaja on juba olemas, palun valige muu nimi"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Paroolid ei lange kokku"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 characters"
-msgstr "See parool on liiga lihtne. \n Korralik parool peaks koosnema vähemalt 6 sümbolist"
+msgstr ""
+"See parool on liiga lihtne. \n"
+" Korralik parool peaks koosnema vähemalt 6 sümbolist"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Kasutaja UID on väiksem kui 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
-msgstr "Kasutaja loomine, kelle UID on alla 1000, ei ole soovitatav.\n Kas soovite seda kindlasti teha?\n\n"
+msgstr ""
+"Kasutaja loomine, kelle UID on alla 1000, ei ole soovitatav.\n"
+" Kas soovite seda kindlasti teha?\n"
+"\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "%s lisatakse gruppi 'users'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Uue grupi loomine: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Kasutaja lisamine: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Kodukataloog: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Kolimisnõustaja"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
-"Do you want to run the migration wizard in order to import Windows documents"
-" and settings in your Mageia distribution?"
-msgstr "Kas soovite käivitada kolimisnõustaja, et importida Windowsi dokumendid ja seadistused ka oma Mageia süsteemi?"
+"Do you want to run the migration wizard in order to import Windows documents "
+"and settings in your Mageia distribution?"
+msgstr ""
+"Kas soovite käivitada kolimisnõustaja, et importida Windowsi dokumendid ja "
+"seadistused ka oma Mageia süsteemi?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Loobu"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Olgu"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Vali grupp"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Lisa olemasolevasse gruppi"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Lisa gruppi 'users'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Sellise nimega grupp on juba olemas. Mida soovite ette võtta?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Uue grupi loomine"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Grupi ID määratakse käsitsi"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Selline grupp on juba olemas, palun valige muu nimi"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " Grupi GID on väiksem kui 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
-msgstr "Grupi loomine, mille GID on alla 1000, ei ole soovitatav.\n Kas soovite seda kindlasti teha?\n\n"
+msgstr ""
+"Grupi loomine, mille GID on alla 1000, ei ole soovitatav.\n"
+" Kas soovite seda kindlasti teha?\n"
+"\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Grupi lisamine: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Kas kustutada failid?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
 " Also perform the following actions\n"
-msgstr "Kasutaja %s kustutamine\n Ühtlasi võetakse ette järgmised tegevused\n"
+msgstr ""
+"Kasutaja %s kustutamine\n"
+" Ühtlasi võetakse ette järgmised tegevused\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Kustutatakse kodukataloog: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Kustutatakse postkast: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Kasutaja eemaldamine: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Kas tõesti kustutada grupp %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
-msgstr "%s on kasutaja %s esmane grupp\n Eemaldage esmalt kasutaja"
+msgstr ""
+"%s on kasutaja %s esmane grupp\n"
+" Eemaldage esmalt kasutaja"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Grupi eemaldamine: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Täisnimi:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Kasutajatunnus:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Parool:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Parool uuesti:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Kasutatav shell:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Grupi nimi:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Palun valige kasutajale vähemalt üks grupp"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
-msgstr "Palun määrake konto aegumise \n aasta, kuu ja päev "
+msgstr ""
+"Palun määrake konto aegumise \n"
+" aasta, kuu ja päev "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Palun täitke kõik parooli aegumise väljad\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Kasutajat '%s' ei saa eemaldada tema esmasest grupist"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Kodukataloog:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Kasutaja andmed"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Konto aegumise lubamine"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Konto aegub (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Kasutaja konto lukustamine"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Konto info"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Kasutaja muutis viimati parooli: "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Parooli aegumise lubamine"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Päevi enne muutmise lubamist:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Päevi enne muutmise nõudmist:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Päevi enne muutmise hoiatuse andmist:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Päevi enne konto tühistamist:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Parooli info"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Grupid, millesse see kasutaja kuulub:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Grupi andmed"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Kasutajad, kes sellesse gruppi kuuluvad:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Grupi kasutajad"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Gruppide / kasutajate redigeerimine"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Tekkis viga:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Sulge"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Autoriõigus (C) %s: Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Autoriõigus (C) %s: Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Kasutajate haldamine"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
-#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith
-#. <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Marek Laane <bald@smail.ee>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Nimeväli on tühi. Palun määrake nimi"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Nimi tohib sisaldada ainult väiketähti, numbreid ning märke '-' ja '_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Nimi on liiga pikk"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Viga"
@@ -662,72 +690,72 @@ msgstr "Mageia kasutajate halduri käivitamine"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr "Mageia kasutajate halduri käivitamine nõuab autentimist"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Konto loomine nurjus: '%s'.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "UID numbri hankimine nurjus"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Väärtuse hankimine nurjus"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Viga '%s' loomisel: %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Viga kirjade puhvri loomisel: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Kasutaja muutmine nurjus: '%s'.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Kasutaja kustutamine nurjus: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Parooli määramine nurjus: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "tundmatu viga"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Grupi loomine nurjus.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Grupi muutmine nurjus: '%s'.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Grupi kustutamine nurjus: '%s'.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Kasutajal puudub kodukataloog.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Kodukataloogi kustutamine nurjus: '%s'.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Viga kirjade puhvri kustutamisel: %s\n"
diff --git a/po/eu.po b/po/eu.po
index 3f5df71..c2d31a4 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
-# 
+#
 # Translators:
 # Egoitz Rodriguez Obieta <egoitzro@gmail.com>, 2014
 # Iñigo Salvador Azurmendi <xalba@euskalnet.net>, 2003-2004,2008-2010
@@ -8,22 +8,23 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2014-08-04 19:51+0000\n"
 "Last-Translator: Egoitz Rodriguez Obieta <egoitzro@gmail.com>\n"
-"Language-Team: Basque (http://www.transifex.com/projects/p/mageia/language/eu/)\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/mageia/language/"
+"eu/)\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Erabiltzaile eta Taldeak zamatzen... mesedez itxoin"
@@ -128,7 +129,7 @@ msgstr "Iragazkia aplikatu"
 msgid "Users"
 msgstr "Erabiltzaileak"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Taldeak"
@@ -149,7 +150,7 @@ msgstr "Erabiltzaile Izena"
 msgid "User ID"
 msgstr "Erabiltzaile ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Talde Primarioa"
@@ -209,7 +210,7 @@ msgstr "Taldea Erantsi"
 msgid "Add a group to the system"
 msgstr "Sistemara talde bat erantsi"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Editatu"
@@ -219,7 +220,7 @@ msgstr "Editatu"
 msgid "Edit selected row"
 msgstr "Editatu aukeratutako errenkada"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Ezabatu"
@@ -239,418 +240,446 @@ msgstr "Berritu"
 msgid "Refresh the list"
 msgstr "Zerrenda berritu"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Giltzatuta"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Balio Galduta"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Klikatu ikonoan berau aldatzeko"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Erabiltzaile berria sortu"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Sortu Atariko Direktorioa"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Atariko Direktorioa: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Erabiltzailearentzako talde pribatua sortu"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Zehaztu eskuz erabiltzaile ID"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Izen hori dagoeneko badago, aukeratu bestu erabiltzaile izen bat"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Pasahitza ez dator bat"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 characters"
-msgstr "Pasahitza sinpleegia da.\nPasahitz onak > 6 karatere behar lituzke"
+msgstr ""
+"Pasahitza sinpleegia da.\n"
+"Pasahitz onak > 6 karatere behar lituzke"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Erabiltzaile UID < 1000 da"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
-msgstr "Ez da gomendagarria UID < 1000 duen erabiltzaile bat sortzea.\nZiur zaude hau egin nahi duzula?\n\n"
+msgstr ""
+"Ez da gomendagarria UID < 1000 duen erabiltzaile bat sortzea.\n"
+"Ziur zaude hau egin nahi duzula?\n"
+"\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "'users' taldeari %s jartzen"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Talde berria sortzen: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Erabiltzailea eransten: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Atariko Direktorioa: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Migrazio morroia"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
-"Do you want to run the migration wizard in order to import Windows documents"
-" and settings in your Mageia distribution?"
-msgstr "Migrazio morroia exekutatu nahi duzu Windows dokumentu eta ezarpenak (documents and settings) zure Mageia banaketara inportatzeko?"
+"Do you want to run the migration wizard in order to import Windows documents "
+"and settings in your Mageia distribution?"
+msgstr ""
+"Migrazio morroia exekutatu nahi duzu Windows dokumentu eta ezarpenak "
+"(documents and settings) zure Mageia banaketara inportatzeko?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Utzi"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ados"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Aukeratu taldea"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Erantsi dagoen taldera"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Erantsi 'users' taldeari"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Izen hori duen taldea badago dagoeneko. Zer egin nahi zenuke?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Talde berria sortu"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Zehaztu eskuz talde ID"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Taldea dagoeneko badago, mesedez aukeratu beste talde izen bat"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "Talde GID < 1000 da"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
-msgstr "Ez da gomendagarria GID < 1000 duen talde bat sortzea.\nZiur zaude hau egin nahi duzula?\n\n"
+msgstr ""
+"Ez da gomendagarria GID < 1000 duen talde bat sortzea.\n"
+"Ziur zaude hau egin nahi duzula?\n"
+"\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Taldea eransten: %s"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Fitxategiak ezabatu edo ez?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
 " Also perform the following actions\n"
-msgstr "%s erabiltzailea ezabatzen\n Burutu ondorengo ekintzak ere\n"
+msgstr ""
+"%s erabiltzailea ezabatzen\n"
+" Burutu ondorengo ekintzak ere\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Ezabatu Atariko Direktorioa: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Ezabatu Postakutxa: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Erabiltzailea ezabatzen: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Benetan ezabatu nahi duzu %s taldea?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
-msgstr "%s, %s erabiltzailearentzako talde primarioa da\nLehendabizi ezabatu erabiltzailea"
+msgstr ""
+"%s, %s erabiltzailearentzako talde primarioa da\n"
+"Lehendabizi ezabatu erabiltzailea"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Taldea ezabatzen: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Izen Osoa:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Erregistroa:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Pasahitza berretsi:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Erregistro Maskorra:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Talde Izena:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Aukeratu talde bat gutxienez erabiltzailearentzako"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
-msgstr "Zehaztu kontuak balioa galduko duen \nurtea, hilabetea eta eguna"
+msgstr ""
+"Zehaztu kontuak balioa galduko duen \n"
+"urtea, hilabetea eta eguna"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Mesedez, bete pasahitza galdu dadin eremu guztiak\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Ezin duzu '%s' erabiltzailea bere talde primariotik kendu"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Ataria:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Erabiltzailearen datuak"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Kontuaren balio-galtzea gaitu"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Kontuak balioa galtzen du (UUUU-HH-EE): "
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Blokeatu Erabiltzaile Kontua"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Kontuaren Info"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Erabiltzaileak pasahitza azkenekoz aldatu zuen: "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Pasahitzaren balio-galtzea gaitu"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Egunak aldaketa baimendu aurretik: "
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Egunak aldaketa eskatu aurretik: "
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Egunak ohartarazten aldaketa aurretik: "
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Egunak kontua ezgaitu aurretik: "
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Pasahitzaren Info"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Hautatu erabiltzailea partaide izango duten taldeak: "
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Talde datuak"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Aukeratu talde honetara batuko diren erabiltzaileak: "
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Talde erabiltzaileak"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Editatu Taldeak / Erabiltzaileak"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Akats bat gertatu da:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Itxi"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Copyright (C) %s Mageia arabera"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Erabiltzaileen Kudeaketa"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
-#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith
-#. <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Izen eremua hutsik dago, mesedez eman izen bat"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "Izenak soilik hizki latinoak txikiz, zenbakiak, `-' eta `_' izan behar ditu"
+msgstr ""
+"Izenak soilik hizki latinoak txikiz, zenbakiak, `-' eta `_' izan behar ditu"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Izena luzeegia da"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Okerra"
@@ -661,74 +690,75 @@ msgstr "Exekutatu Mageia Erabiltzaile Kudeatzailea"
 
 #: ../polkit/org.mageia.drakuser.policy.in.h:2
 msgid "Authentication is required to run Mageia User Manager"
-msgstr "Autentifikazioa beharrezkoa da Mageia Erabiltzaile Kudeatzailea exekutatzeko"
+msgstr ""
+"Autentifikazioa beharrezkoa da Mageia Erabiltzaile Kudeatzailea exekutatzeko"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Kontuaren sorrerak huts egin du: '%s'.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Ezin UID zenbakia eskuratu"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Ezin balioa eskuratu"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Akatsa '%s' sortzerakoan: %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Akatsa posta txirrita sortzerakoan: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Ezin izan da erabiltzailea aldatu: '%s'.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Ezin izan da erabiltzailea ezabatu: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Pasahitza ezartzeak huts egin du: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "akats ezezakuna"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Taldea sortzeak huts egin du.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Ezin izan da taldea aldatu: '%s'.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Ezin izan da taldea ezabatu: '%s'.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Erabiltzailearentzako etxeko karpetarik ez.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Ezin izan da etxeko karpeta ezabatu: '%s'.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Akatsa posta txirrita ezabatzerakoan: %s\n"
diff --git a/po/fa.po b/po/fa.po
index 7492173..b2f6a3b 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-fa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2004-09-26 14:46+0330\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
 "Language-Team: Persian\n"
@@ -19,12 +19,12 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "در حال بارگذاری کاربران و گروه‌ها... لطفاً صبر کنید"
@@ -129,7 +129,7 @@ msgstr "گذاردن فیلتر"
 msgid "Users"
 msgstr "کاربران"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "گروه‌ها"
@@ -150,7 +150,7 @@ msgstr "نام کاربر"
 msgid "User ID"
 msgstr "شناسه‌ی کاربر"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "گروه اولیه"
@@ -210,7 +210,7 @@ msgstr "افزودن گروه"
 msgid "Add a group to the system"
 msgstr "افزودن یک گروه به سیستم"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "ویرایش"
@@ -220,7 +220,7 @@ msgstr "ویرایش"
 msgid "Edit selected row"
 msgstr "ویرایش ردیف انتخاب شده"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "حذف"
@@ -240,57 +240,57 @@ msgstr "نوسازی"
 msgid "Refresh the list"
 msgstr "نوسازی لیست"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "قفل شده است"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "منقضی شده است"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "برای تغییر آن بر روی شمایل کلیک کنید"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "ایجاد کاربر جدید"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "ایجاد شاخه‌ی خانه"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "شاخه‌ی آغازه: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "ایجاد یک گروه خصوصی برای کاربر"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "مشخص کردن دستی شناسه‌ی کاربر"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "کاربر از قبل وجود دارد، لطفاً نام کاربری دیگری را انتخاب کنید"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "عدم تطابق گذرواژه"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -299,12 +299,12 @@ msgstr ""
 "این گذرواژه خیلی ساده است. \n"
 "گذرواژه‌ی خوب باید بیشتر از ۶ نویسه داشته باشد"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "شناسه کاربر کوچکتر از ۵۰۰ است"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -315,91 +315,103 @@ msgstr ""
 "آیا مطمئن هستید که می‌خواهید این کار را انجام دهید؟\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "گذاشتن %s به گروه کاربران"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "ایجاد گروه جدید: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "افزودن کاربر: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "شاخه‌ی آغازه: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "لغو"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "تایید"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "انتخاب کردن گروه"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "افزودن به گروه موجود"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "افزودن به گروه 'کاربران'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "یک گروه با این نام از قبل وجود دارد. چکار دوست دارید بکنید؟"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "ایجاد گروه جدید"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "مشخص کردن دستی شناسه‌ی گروه"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "گروه از قبل وجود دارد، لطفاً نام دیگری برای گروه انتخاب کنید"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "شناسه گروه کوچکتر از ۵۰۰ است"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -410,22 +422,22 @@ msgstr ""
 "آیا مطمئن هستید که می‌خواهید این کار را انجام دهید؟\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "افزودن گروه: %s"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "حذف پرونده‌ها یا نه؟"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -434,27 +446,27 @@ msgstr ""
 "حذف کردن کاربر %s\n"
 " کنش‌های بدنبال آمده را نیز انجام دهید\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "حذف شاخه‌ی آغازه: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "حذف جعبه‌ی پست : /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "برداشتن کاربر: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "آیا واقعاً می‌خواهید گروه %s را حذف کنید؟"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -463,47 +475,47 @@ msgstr ""
 "%s یک گروه مقدم برای کاربر %s می‌باشد\n"
 " نخست کاربر را بردارید"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "برداشتن گروه: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "نام کامل:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "ثبت‌ورود:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "گذرواژه:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "تصدیق گذرواژه:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "پوسته‌ی ثبت‌ورود:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "نام گروه:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "لطفاً حداقل یک گروه را برای کاربر انتخاب کنید"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -512,159 +524,159 @@ msgstr ""
 "لطفاً سال، ماه و روز را برای انقضای \n"
 "حساب مشخص کنید "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "لطفاً تمام محوطه‌های در عمر گذرواژه را پُر کنید\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "شما نمی‌توانید کاربرهای '%s' را از گروه اولیه‌اشان بردارید"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "آغازه:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "اطلاعات کاربر"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "بکار انداختن انقضای حساب"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "پایان یافتن حساب (سال-ماه-روز):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "قفل کردن حساب کاربر"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "اطلاعات حساب"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "تغییر گذرواژه‌ی کاربر آخرین بار در :"
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "بکار انداختن انقضای گذرواژه"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "تعداد روزها قبل از آنکه تغییر اجازه داده شود:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "تعداد روزها قبل از آنکه تغییر لازم بشود:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "روزهای هشدار قبل از تغییر: "
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "تعداد روزها قبل از آنکه حساب غیر فعال شود:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "اطلاعات گذرواژه"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "انتخاب گروهی که کاربر عضو آن خواهد شد:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "داده‌های گروه"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "انتخاب کاربران برای پیوستن به این گروه:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "کاربران گروه"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "ویرایش کاربرها / گروه‌ها"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "خطائی رخ داد"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "بستن"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "مدیریت کاربران"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "ماندریبا لینوکس"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Abbas Izad <abbasizad@hotmail.com>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "محوطه‌ی نام خالی است لطفاً یک نام را عرضه کنید"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "نام باید فقط دارای حروف کوچک لاتین، اعداد، `-' و `_' باشد"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "نام خیلی طولانی است"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "خطا"
@@ -678,73 +690,73 @@ msgstr "ابزار مدیریت اربران لینوکس ماندریبا"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, fuzzy, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "خطا در ایجاد کردن چرخه‌ی پست.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "خطا در ایجاد کردن `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "خطا در ایجاد کردن چرخه‌ی پست: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, fuzzy, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "خطا در ایجاد کردن چرخه‌ی پست.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "خطای ناشناخته"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 #, fuzzy
 msgid "Group creation failed.\n"
 msgstr "خطا در ایجاد کردن چرخه‌ی پست.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "خطا در حذف کردن چرخه‌ی پست: %s\n"
diff --git a/po/fi.po b/po/fi.po
index 9668678..e7be66a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2016-03-16 10:50+0000\n"
 "Last-Translator: Jari Saarela <nokoa@live.fi>\n"
 "Language-Team: Finnish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -24,12 +24,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Ladataan käyttäjät ja ryhmät... Odota hetki"
@@ -134,7 +134,7 @@ msgstr "Suodata"
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Ryhmät"
@@ -155,7 +155,7 @@ msgstr "Käyttäjätunnus"
 msgid "User ID"
 msgstr "UID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Ensisijainen ryhmä"
@@ -215,7 +215,7 @@ msgstr "Lisää ryhmä"
 msgid "Add a group to the system"
 msgstr "Lisää ryhmä järjestelmään"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Muokkaa"
@@ -225,7 +225,7 @@ msgstr "Muokkaa"
 msgid "Edit selected row"
 msgstr "Muokkaa valittua riviä"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Poista"
@@ -245,57 +245,57 @@ msgstr "Päivitä"
 msgid "Refresh the list"
 msgstr "Päivitä lista"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Lukittu"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Vanhentunut"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Vaihda kuvaketta napsauttamalla"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Luo uusi käyttäjä"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Luo kotihakemisto"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Kotihakemisto: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Luo käyttäjälle yksityinen ryhmä"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Määritä UID käsin"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Käyttäjätunnus on jo olemassa, valitse toinen käyttäjätunnus"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Salasana ei täsmää"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -304,12 +304,12 @@ msgstr ""
 "Salasana on liian yksinkertainen.\n"
 " Hyvä salasana on vähintään kuusi merkkiä pitkä."
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Käyttäjän UID on pienempi kuin 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -320,91 +320,103 @@ msgstr ""
 " Haluatko varmasti luoda käyttäjän?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Lisätään käyttäjä %s ryhmään \"users\"."
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Luodaan uusi ryhmä: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Lisätään käyttäjä: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Kotihakemisto: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Tietojen tuonti Windowsista"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr "Haluatko tuoda Windowsin dokumentit ja asetukset Mageiaiin?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Valitse ryhmä"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Lisää olemassa olevaan ryhmään"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Lisää ryhmään \"users\""
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Tällä nimellä oleva ryhmä on jo olemassa. Mitä haluat tehdä?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Luo uusi ryhmä"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Määritä GID käsin"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Ryhmä on jo olemassa, valitse toinen nimi ryhmälle"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " Ryhmän GID on pienempi kuin 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -415,22 +427,22 @@ msgstr ""
 " Haluatko varmasti luoda ryhmän?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Lisätään ryhmä: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Poistetaanko tiedostot?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -439,27 +451,27 @@ msgstr ""
 "Poistetaan käyttäjä %s.\n"
 " Suorita myös seuraavat tehtävät:\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Poista kotihakemisto: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Poista sähköpostilaatikko: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Poistetaan käyttäjä: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Haluatko varmasti poistaa ryhmän %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -468,47 +480,47 @@ msgstr ""
 "%s on käyttäjän %s ensisijainen ryhmä\n"
 " Poista ensin käyttäjä"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Poistetaan ryhmä: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Koko nimi:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Käyttäjätunnus:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Varmista salasana:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Kirjautumistulkki:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Ryhmän nimi:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Valitse käyttäjälle vähintään yksi ryhmä"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -517,150 +529,150 @@ msgstr ""
 "Määrittele vuosi, kuukausi ja päivä\n"
 " jolloin käyttäjätili vanhenee "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Täytä kaikki kentät salasanan vanhenemiselle\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Käyttäjää %s ei voida poistaa hänen ensisijaisesta ryhmästään"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Kotihakemisto:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Käyttäjän tiedot"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Ota käyttöön käyttäjätilin vanheneminen"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Käyttäjätili vanhenee (VVVV-KK-PP):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Lukitse käyttäjätili"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Käyttäjätili"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Käyttäjä vaihtoi salasanaa viimeksi:"
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Ota käyttöön salasanan vanheneminen"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Salasanan vaihtaminen sallitaan X päivän jälkeen:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Salasanan vaihtaminen vaaditaan X päivän jälkeen:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Varoita X päivää ennen vaihtamista:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Käyttäjätunnus merkitään käyttämättömäksi X päivän jälkeen:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Salasana"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Valitse ryhmät, joihin käyttäjä kuuluu:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Ryhmän tiedot"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Valitse ryhmään kuuluvat käyttäjät:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Ryhmän käyttäjät"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Muokkaa ryhmiä / käyttäjiä"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Virhe:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Sulje"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s, Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Copyright (C) %s, Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Käyttäjienhallinta"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Thomas Backlund <tmb@mandrake.org>\n"
 "Jani Välimaa <wally@mandriva.org>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Käyttäjätunnus on pakollinen tieto"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
@@ -668,12 +680,12 @@ msgstr ""
 "Käyttäjätunnus voi muodostua vain pienistä kirjaimista, numeroista ja "
 "merkeistä \"-\" ja \"_\""
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Nimi on liian pitkä"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Virhe"
@@ -687,72 +699,72 @@ msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 "Tunnistautuminen on vaadittu Mageian käyttäjienhallintatyökalun käyttöön."
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Tilin luonti epäonnistui: %s.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "UID:ta ei voitu noutaa"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Arvoa ei voitu noutaa"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Virhe luotaessa %s: %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Virhe luotaessa postilaatikkoa: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Käyttäjätunnuksen muokkaaminen epäonnistui: %s.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Käyttäjää ei voitu poistaa: %s.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Salasanan asettaminen epäonnistui: %s.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "tuntematon virhe"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Ryhmän luonti epäonnistui.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Ryhmän muokkaaminen epäonnistui: %s.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Ryhmää ei voitu poistaa: %s.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Käyttäjällä ei ole kotihakemistoa.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Käyttäjän kotihakemistoa ei voitu poistaa: %s.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Virhe poistettaessa postilaatikkoa: %s\n"
diff --git a/po/fr.po b/po/fr.po
index 6a05698..033ba3b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,28 +1,29 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
-# 
+#
 # Translators:
 # Eric Barbero <dune06@free.fr>, 2013
 # Eric Barbero <dune06@free.fr>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2014-07-28 18:11+0000\n"
 "Last-Translator: Eric Barbero <dune06@free.fr>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/mageia/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/projects/p/mageia/language/"
+"fr/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Chargement des utilisateurs et des groupes... Veuillez patienter"
@@ -127,7 +128,7 @@ msgstr "Appliquer le filtre"
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Groupes"
@@ -148,7 +149,7 @@ msgstr "Nom d'utilisateur"
 msgid "User ID"
 msgstr "ID de l'utilisateur"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Groupe primaire"
@@ -208,7 +209,7 @@ msgstr "Ajouter un groupe"
 msgid "Add a group to the system"
 msgstr "Ajouter un groupe au système"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Éditer"
@@ -218,7 +219,7 @@ msgstr "Éditer"
 msgid "Edit selected row"
 msgstr "Éditer la ligne sélectionnée"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Supprimer"
@@ -238,418 +239,463 @@ msgstr "Rafraîchir"
 msgid "Refresh the list"
 msgstr "Rafraîchir la liste"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Verrouillé"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Expiré"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Cliquez sur l'icône pour la modifier"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Créer un nouvel utilisateur"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Créer le dossier personnel"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Dossier personnel : "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Créer un groupe privé pour l'utilisateur"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Indiquer manuellement l'ID de l'utilisateur"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "L'utilisateur existe déjà, veuillez choisir un autre nom d'utilisateur"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Les mots de passe ne correspond pas"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 characters"
-msgstr "Ce mot de passe est trop simple. \n Les bons mots de passe devraient comporter plus 6 caractères"
+msgstr ""
+"Ce mot de passe est trop simple. \n"
+" Les bons mots de passe devraient comporter plus 6 caractères"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "L'identifiant utilisateur est < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
-msgstr "Créer un utilisateur avec un identifiant inférieur à 1000 n'est pas recommandé.\nEtes-vous sûr de vouloir faire cela ?\n\n"
+msgstr ""
+"Créer un utilisateur avec un identifiant inférieur à 1000 n'est pas "
+"recommandé.\n"
+"Etes-vous sûr de vouloir faire cela ?\n"
+"\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Ajouter %s au groupe « users »"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Création du nouveau groupe : %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Ajout de l'utilisateur : %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Dossier personnel : "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Assistant de migration"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
-"Do you want to run the migration wizard in order to import Windows documents"
-" and settings in your Mageia distribution?"
-msgstr "Voulez-vous lancer l'assistant de migration afin d'importer les documents et réglages de Windows dans votre distribution Mageia ?"
+"Do you want to run the migration wizard in order to import Windows documents "
+"and settings in your Mageia distribution?"
+msgstr ""
+"Voulez-vous lancer l'assistant de migration afin d'importer les documents et "
+"réglages de Windows dans votre distribution Mageia ?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID : "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Choisir un groupe"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Ajouter au groupe existant"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Ajouter au groupe « users »"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Un groupe portant ce nom existe déjà. Que voulez-vous faire ?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Créer un nouveau groupe"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Indiquer un ID de groupe manuellement"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Le groupe existe déjà, veuillez choisir un autre nom de groupe"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "L'identifiant de Groupe est < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
-msgstr "Créer un groupe avec un identifiant inférieur à 1000 n'est pas recommandé.\nEtes-vous sûr de vouloir faire cela ?\n\n"
+msgstr ""
+"Créer un groupe avec un identifiant inférieur à 1000 n'est pas recommandé.\n"
+"Etes-vous sûr de vouloir faire cela ?\n"
+"\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Ajout du groupe : %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID : "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Supprimer les fichiers ou non ?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
 " Also perform the following actions\n"
-msgstr "Suppression de l'utilisateur %s\n Effectuer aussi les actions suivantes\n"
+msgstr ""
+"Suppression de l'utilisateur %s\n"
+" Effectuer aussi les actions suivantes\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Supprimer le dossier personnel : %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Supprimer la boîte de messages : /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Retrait de l'utilisateur : %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Voulez-vous réellement supprimer le groupe %s ?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
-msgstr "%s est un groupe primaire pour l'utilisateur %s\n Enlever d'abord l'utilisateur"
+msgstr ""
+"%s est un groupe primaire pour l'utilisateur %s\n"
+" Enlever d'abord l'utilisateur"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Retrait du groupe : %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Nom complet :"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Utilisateur :"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Confirmation du mot de passe :"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell de démarrage :"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Nom du groupe :"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Veuillez choisir au moins un groupe pour l'utilisateur"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
-msgstr "Veuillez indiquer l'année, le mois et le jour \n pour l'expiration du compte "
+msgstr ""
+"Veuillez indiquer l'année, le mois et le jour \n"
+" pour l'expiration du compte "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Veuillez remplir tous les champs pour l'expiration du mot de passe\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Vous ne pouvez pas retirer l'utilisateur « %s » de son groupe primaire"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Dossier personnel :"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Données de l'utilisateur"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Activer l'expiration du compte"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Date d'expiration du compte (AAAA-MM-JJ) :"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Bloquer le compte de l'utilisateur"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Informations sur le compte"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "L'utilisateur a changé son mot de passe pour la dernière fois le : "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Activer l'expiration du mot de passe"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Nombre de jours avant qu'une modification ne soit permise :"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Nombre de jours avant que le changement ne soit requis :"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Nombre de jours entre l'avertissement et le changement :"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Nombre de jours avant que le compte soit désactivé :"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Informations sur le mot de passe"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Choisir les groupes dont l'utilisateur sera membre :"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Données du groupe"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Choisir les utilisateurs de ce groupe :"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Utilisateurs du groupe"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Éditer les groupes / les utilisateurs"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Une erreur est survenue :"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Fermer"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s par Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Copyright (C) %s par Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Gestion des utilisateurs"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
-#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith
-#. <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
-msgstr "David Baudens\nDavid Odin\nPablo Saratxaga <pablo@mandriva.com>\nKAtiOS <katios@nolabel.net>\nGuillaume Cottenceau\nThierry Vignaud <tvignaud@mandriva.com>\nChristophe Combelles <ccomb@free.fr>\nAdrien Rezer <monsieurdidi@free.fr>\nNicolas Richard <richardnicolas22@yahoo.fr>\nTeletchéa <steletch@free.fr>\nChristophe Berthelé\nDidier Hérisson <didier.herisson@angstrom.uu.se>\nNicolas Lécureuil <neoclust@mandriva.org>\nYann Ciret <mageia@zamiz.net>\nRémi Verschelde <rverschelde@gmail.com>\n"
-
-#: ../userdrake:1325
+msgstr ""
+"David Baudens\n"
+"David Odin\n"
+"Pablo Saratxaga <pablo@mandriva.com>\n"
+"KAtiOS <katios@nolabel.net>\n"
+"Guillaume Cottenceau\n"
+"Thierry Vignaud <tvignaud@mandriva.com>\n"
+"Christophe Combelles <ccomb@free.fr>\n"
+"Adrien Rezer <monsieurdidi@free.fr>\n"
+"Nicolas Richard <richardnicolas22@yahoo.fr>\n"
+"Teletchéa <steletch@free.fr>\n"
+"Christophe Berthelé\n"
+"Didier Hérisson <didier.herisson@angstrom.uu.se>\n"
+"Nicolas Lécureuil <neoclust@mandriva.org>\n"
+"Yann Ciret <mageia@zamiz.net>\n"
+"Rémi Verschelde <rverschelde@gmail.com>\n"
+
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Le champ « nom » est vide, veuillez fournir un nom"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "Le nom ne peut contenir que des lettres minuscules latines, des chiffres, « - » et « _ »"
+msgstr ""
+"Le nom ne peut contenir que des lettres minuscules latines, des chiffres, « -"
+" » et « _ »"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Le nom est trop long"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Erreur"
@@ -660,74 +706,80 @@ msgstr "Lancer le gestionnaire des utilisateurs de Mageia"
 
 #: ../polkit/org.mageia.drakuser.policy.in.h:2
 msgid "Authentication is required to run Mageia User Manager"
-msgstr "Une authentification est nécessaire pour lancer le gestionnaire des utilisateurs de Mageia"
+msgstr ""
+"Une authentification est nécessaire pour lancer le gestionnaire des "
+"utilisateurs de Mageia"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Échec de la création du compte : « %s ».\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Impossible d'obtenir le numéro d'Uid"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Impossible de récupérer la valeur"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Erreur lors de la création de « %s » : %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
-msgstr "Erreur lors de la création du répertoire de stockage du courrier électronique: %s\n"
+msgstr ""
+"Erreur lors de la création du répertoire de stockage du courrier "
+"électronique: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "L'utilisateur ne peut être modifié : « %s ».\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "L'utilisateur ne peut être effacé : « %s ».\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Échec d'initialisation du mot de passe : « %s ».\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "erreur inconnue"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Échec de la création du groupe.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Le groupe ne peut être modifié : « %s ».\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Le groupe ne peut être effacé : « %s ».\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Pas de répertoire home pour l'utilisateur.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Le répertoire utilisateur ne peut être supprimé : « %s ».\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
-msgstr "Erreur lors de la suppression du répertoire de stockage du courrier électronique: %s\n"
+msgstr ""
+"Erreur lors de la suppression du répertoire de stockage du courrier "
+"électronique: %s\n"
diff --git a/po/fur.po b/po/fur.po
index 8b51dd8..8873a3e 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-fur\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2004-05-17 23:58+0200\n"
 "Last-Translator: Andrea Gracco <graccoandrea@tin.it>\n"
 "Language-Team: furlan <gft@freelists.org>\n"
@@ -18,12 +18,12 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Cjariant Utents e Grops... Par plasè, spiete"
@@ -128,7 +128,7 @@ msgstr "Apliche filtri"
 msgid "Users"
 msgstr "Utents"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Grops"
@@ -149,7 +149,7 @@ msgstr "Non utent"
 msgid "User ID"
 msgstr "ID Utent"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Grop Primari"
@@ -209,7 +209,7 @@ msgstr "Zonte Grop"
 msgid "Add a group to the system"
 msgstr "Zonte un grop al sisteme"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Mude"
@@ -219,7 +219,7 @@ msgstr "Mude"
 msgid "Edit selected row"
 msgstr "Mude rie selezionade"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Scancele"
@@ -239,57 +239,57 @@ msgstr "Atualize"
 msgid "Refresh the list"
 msgstr "Atualize le liste"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Blocât"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Scjadût"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Frache su le icone par cambiâle"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Cree un gnûf utent"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Cree le cartele Home"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Cartele Home: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Cree un grop privât par l'utent"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Specifiche manualmentri il ID dal utent"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "L'utent al esist dizà, par plasè scielç un altri Non Utent"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Le password no corispuint"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -298,12 +298,12 @@ msgstr ""
 "Cheste password e je masse semplice. \n"
 " Buinis password e an di sedi > 6 letaris"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "UID dal utent inferiôr a 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -314,91 +314,103 @@ msgstr ""
 "Sêstu sigûr di volè fâlu?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Insedament di %s tal grop 'utents'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Creazion di un gnûf grop: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Zonte utent: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Cartele Home: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Scancele"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Va ben"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Sielç grop"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Zonte al grop esistint"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Zonte al grop 'utents'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Un grop cun chest non al esist dizà.  Ce âstu voie di fâ?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Cree un gnûf grop"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Specificâ manualmentri un ID di grop"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Il grop al esist dizà, par plasè sielç un altri non di grop"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " GID dal grop inferiôr di 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -409,22 +421,22 @@ msgstr ""
 " Setu sigûr di ve voe di falu? \n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Zonte dal grop: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Scancele i file o no?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -433,27 +445,27 @@ msgstr ""
 "Scancelant utent %s\n"
 " E vignaran fatis ancje les azions seguentis\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Scancele le cartele Home: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Scancele le Mailbox :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Rimozion dal utent: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Âstu veramentri voie di scancelâ il grop %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -462,47 +474,47 @@ msgstr ""
 "%s al è il grop primari dal utent %s\n"
 " Tu âs prin di rimovi l'utent"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Rimozion dal grop: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Non complet:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Password:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Confirme Password:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell di login:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Non Grop:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Par plasè sielç almancul un grop par l'utent"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -511,159 +523,159 @@ msgstr ""
 "Par plasè specifiche An, Mês e Dî \n"
 "di scjadince dal account"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Par plasè jemple ducj i cjamps di scjadince de password\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "No tu puedis rimovi l'utent '%s' dal so grop primari"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Home:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Dâts Utent"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Abilite le scjadince dal account"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "L'Account al scjât il (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Bloche l'account dal utent"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Informazions account"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "L'utent al à mudât le password il : "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Abilite le scjadince de password"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dìs prin che sedi permitude le modifiche :"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Dìs prin che sedi domandade le modifiche :"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dìs di avertence prin de modifiche :"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dìs prin che l'account al sedi inatîf :"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Informazions password"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Sielç i grops dai cuai l'utent al sarâ membri:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Dâts Grop"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Sielç i utents di zontâ a chest grop :"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Utents dal grop"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Mude Grops / Utents"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Al è intravignût un fal"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Siere"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Gjestion Utents"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Andrea Gracco <graccoandrea@tin.it>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Il cjamp dal non al è vueit, tu âs di insedâ un non"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Il non al à di vê dome letaris minusculis, numars, `-' e `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Il non al è masse lunc"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Fal"
@@ -677,72 +689,72 @@ msgstr "Imprest par le gjestion dai utents di Mageia"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr ""
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr ""
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr ""
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr ""
diff --git a/po/ga.po b/po/ga.po
index 6f7bb6f..70478a7 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2001-08-10 21:00+0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <ga@li.org>\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr ""
@@ -128,7 +128,7 @@ msgstr ""
 msgid "Users"
 msgstr "Úsáideoirí"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Grupaí"
@@ -149,7 +149,7 @@ msgstr "Ainm Úsáideora"
 msgid "User ID"
 msgstr "ID Úsáideoir"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr ""
@@ -209,7 +209,7 @@ msgstr "Grúpa Nua"
 msgid "Add a group to the system"
 msgstr ""
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Eagar"
@@ -219,7 +219,7 @@ msgstr "Eagar"
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Scríos"
@@ -239,69 +239,69 @@ msgstr "Nuashonraigh"
 msgid "Refresh the list"
 msgstr ""
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Faoi Ghlas"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "As Dáta"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr ""
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr ""
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr ""
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr ""
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, fuzzy, c-format
 msgid "Password Mismatch"
 msgstr "Pasfhocal"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr ""
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -309,91 +309,103 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr ""
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr ""
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr ""
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Comhadlann bhaile"
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Cealaigh"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ceart go Leor"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr ""
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Cruthaigh Grúpa Nua"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr ""
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -401,255 +413,255 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr ""
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr ""
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
 " Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr ""
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr ""
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr ""
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr ""
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Ainm Iomlán:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Logann:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Pasfhocal:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Dearbhaigh an Focal Faire:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, fuzzy, c-format
 msgid "Login Shell:"
 msgstr "Logann:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, fuzzy, c-format
 msgid "Group Name:"
 msgstr "ID Grupa:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr ""
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Baile:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, fuzzy, c-format
 msgid "User Data"
 msgstr "ID Úsáideoir"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr ""
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr ""
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr ""
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr ""
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr ""
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, fuzzy, c-format
 msgid "Password Info"
 msgstr "Pasfhocal"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, fuzzy, c-format
 msgid "Group Data"
 msgstr "ID Grupa"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr ""
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, fuzzy, c-format
 msgid "Group Users"
 msgstr "Grupaí"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, fuzzy, c-format
 msgid "Edit Groups / Users"
 msgstr "Eagar úsáideoir(í)"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Tharla earráid"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Dún"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, fuzzy, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Coípcheart © 2003 Mandriva."
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, fuzzy, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Coípcheart © 2003 Mandriva."
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, fuzzy, c-format
 msgid "Users Management"
 msgstr "Ainm Úsáideora"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Earráid"
@@ -662,73 +674,73 @@ msgstr ""
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, fuzzy, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Teíp ag lódáil comhad pixmap: %s"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, fuzzy, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Teíp ag lódáil comhad pixmap: %s"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, fuzzy, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Teíp ag lódáil comhad pixmap: %s"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "earráid anaithnid"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 #, fuzzy
 msgid "Group creation failed.\n"
 msgstr "Teíp ag lódáil comhad pixmap: %s"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, fuzzy, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Teíp ag lódáil comhad pixmap: %s"
diff --git a/po/gl.po b/po/gl.po
index 6cf35c2..6522349 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake.gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2008-03-30 18:08+0100\n"
 "Last-Translator: Leandro Regueiro <leandro DOT regueiro AT gmail DOT com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -22,12 +22,12 @@ msgstr ""
 "X-Generator: KBabel 1.0.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Cargando Usuarios e Grupos... Por favor agarde"
@@ -132,7 +132,7 @@ msgstr "Aplica-lo filtro"
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Grupos"
@@ -153,7 +153,7 @@ msgstr "Nome de Usuario"
 msgid "User ID"
 msgstr "ID de Usuario"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Grupo Principal"
@@ -213,7 +213,7 @@ msgstr "Engadir Grupo"
 msgid "Add a group to the system"
 msgstr "Engadir un grupo ó sistema"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Editar"
@@ -223,7 +223,7 @@ msgstr "Editar"
 msgid "Edit selected row"
 msgstr "Edita-la fila seleccionada"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Borrar"
@@ -243,57 +243,57 @@ msgstr "Recargar"
 msgid "Refresh the list"
 msgstr "Recarga-la lista"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Caducado"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Clique na icona para cambialo"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Crear Novo Usuario"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Crear Directorio Persoal"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Directorio Persoal: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Crear un grupo privado para o usuario"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Especificar manualmente a ID do usuario"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Este usuario xa existe, por favor escolla outro Nome de Usuario"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Os Contrasinais Non Coinciden"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -302,12 +302,12 @@ msgstr ""
 "Este contrasinal é demasiado sinxelo. \n"
 " Os bos contrasinais deben ter máis de 6 caracteres"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "A Uid do usuario é menor de 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -318,27 +318,39 @@ msgstr ""
 " ¿Está seguro de querer facer isto?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Engadindo %s ó grupo 'usuarios'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Creando novo grupo: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Engadindo usuario: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Directorio Persoal: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Asistente de migración"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -347,64 +359,64 @@ msgstr ""
 "Desexa executar o asistente de migración para poder importar o documents and "
 "settings de Windows á súa distribución Mageia?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Aceptar"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Escolla un grupo"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Engadir ó grupo existente"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Engadir ó grupo 'usuarios'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Xa existe un grupo con este nome.  ¿Quere seguir?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Crear Novo Grupo"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Especificar manualmente a ID do grupo"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Este grupo xa existe, por favor escolle outro nome para o grupo"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " O Gid do grupo é menor de 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -415,22 +427,22 @@ msgstr ""
 " ¿Está seguro de querer facer isto?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Engadindo grupo: %s"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "¿Desexa elimina-los ficheiros?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -439,27 +451,27 @@ msgstr ""
 "Eliminando o usuario %s\n"
 " Realizar tamen esta accións\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Elimina-lo Directorio Persoal: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Elimina-la caixa do correo: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Eliminando o usuario: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Desexa elimina-lo grupo %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -468,47 +480,47 @@ msgstr ""
 "%s é o grupo primario do usuario %s\n"
 " Borre o usuario primeiro"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Eliminando o grupo: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Nome Completo:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Contrasinal:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Confirme o Contrasinal:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell deLogin:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Nome do Grupo:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Por favor, seleccione como minimo un grupo para inclui-lo usuario nel"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -517,161 +529,161 @@ msgstr ""
 "Por favor, especifique o Dia, o Mes e o Ano \n"
 " para a Caducación da Conta "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Por favor complete tódolos campos da caducidade do contrasinal\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Non pode elimina-lo usuario '%s' do seu grupo principal"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Dir. Persoal:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Datos do Usuarios"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Habilita-la caducidade da conta"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "A conta caduca o (DD-MM-YYYY):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Bloquear Conta de Usuario"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Información da Conta"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Último troco de contrasinal do usuario:"
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Habilita-la Caducidade do Contrasinal"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dias que deben pasar antes de que se permita facer cambios: "
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Dias que deben pasar antes de que se requira facer cambios: "
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dias de aviso antes do cambio: "
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Días antes de que a conta se desactive:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Información do Contrasinal"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Seleccione os grupos ós que vai pertencer o usuario:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Datos de Grupo"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Seleccione usuarios para unilos a este grupo: "
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Usuarios do Grupo"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Editar Grupos / Usuarios"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Ocorreu un erro:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Pechar"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s de Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, fuzzy, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Copyright (C) %s de Mandriva"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Xestión de Usuarios"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Leandro Regueiro <leandro.regueiro@gmail.com>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "O campo do nome está baleiro, por favor escriba un nome"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "O nome só pode conter letras minúsculas, números, '-' e '_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "O nome é moi longo"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Erro"
@@ -685,73 +697,73 @@ msgstr "Ferramenta de Xestión de Usuarios de Mageia"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, fuzzy, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Erro ó crear a cola de correo.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Erro ó crear `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Erro ó crear a cola de correo: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, fuzzy, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Erro ó crear a cola de correo.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "erro descoñecido"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 #, fuzzy
 msgid "Group creation failed.\n"
 msgstr "Erro ó crear a cola de correo.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Erro ó eliminar a cola de correo: %s\n"
diff --git a/po/he.po b/po/he.po
index 3717a58..77b66fc 100644
--- a/po/he.po
+++ b/po/he.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2007-09-24 20:54+0200\n"
 "Last-Translator: dovix <dovix2003@yahoo.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -24,12 +24,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "טוען משתמשים וקבוצות... נא להמתין"
@@ -134,7 +134,7 @@ msgstr "החל מסנן"
 msgid "Users"
 msgstr "משתמשים"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "קבוצות"
@@ -155,7 +155,7 @@ msgstr "שם משתמש"
 msgid "User ID"
 msgstr "קוד זיהוי משתמש"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "קבוצה ראשונית"
@@ -215,7 +215,7 @@ msgstr "הוספת קבוצה"
 msgid "Add a group to the system"
 msgstr "הוספת קבוצה למערכת"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "עריכה"
@@ -225,7 +225,7 @@ msgstr "עריכה"
 msgid "Edit selected row"
 msgstr "עריכת עמודה מסומנת"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "מחיקה"
@@ -245,57 +245,57 @@ msgstr "רענן"
 msgid "Refresh the list"
 msgstr "רענן רשימת משתמשים"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "נעול"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "פג"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "לחץ על הצלמית בכדי לערוך את זה"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "יצירת משתמש חדש"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "יצירת ספריית הבית של המשתמש"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "ספריית הבית של המשתמש: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "יצירת קבוצה פרטית עבור המשתמש"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "קבע את קוד זיהוי המשתמש באופן ידני"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "משתמש זה כבר קיים במערכת, נא לבחור שם משתמש אחר"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "סיסמאות לא תואמות"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -304,12 +304,12 @@ msgstr ""
 "סיסמה זו פשוטה מדי\n"
 "סיסמה טובה צריכה להכיל יותר מ-6 תווים."
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "קוד זיהוי המשתמש קטן מ-1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -320,27 +320,39 @@ msgstr ""
 "האם ברצונך לבצע פעולה זו?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "הוספת %s אל קבוצת 'משתמשים'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "יצירת קבוצה חדשה: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "הוספת משתמש: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "ספריית הבית של המשתמש: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "אשף הגירה"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -349,64 +361,64 @@ msgstr ""
 "האם להריץ את אשף ההגירה כדי לייבא מסמכי והגדרות וינדוז אל מערכת המנדריבה-"
 "לינוקס שלך?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "ביטול"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "אישור"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "קוד זיהוי המשתמש (UID): "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "יש לבחור קבוצה"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "הוסף לקבוצה קיימת"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "הוסף לקבוצת ה'משתמשים'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "קבוצה עם השם הזה כבר קיימת. מה רצונך לעשות?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "יצירת קבוצה חדשה"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "קבע את קוד זיהוי הקבוצה באופן ידני"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "הקבוצה כבר קיימת, נא לבחור שם אחר לקבוצה"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "קוד זיהוי הקבוצה קטן מ-1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -417,22 +429,22 @@ msgstr ""
 "האם ברצונך לבצע פעולה זו?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "הוספת קבוצה: %s"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "קוד זיהוי הקבוצה (GID):"
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "האם למחוק את הקבצים או לא?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -441,27 +453,27 @@ msgstr ""
 "מחיקת משתמש %s\n"
 " תגרום גם לפעולות הבאות:\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "מחיקת ספריית הבית של משתמש: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "מחיקת חשבון הדואר /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "הסרת משתמש: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "האם באמת למחוק את קבוצה %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -470,47 +482,47 @@ msgstr ""
 "%s היא קבוצה ראשונית עבור משתמש %s\n"
 " נא למחוק את המשתמש קודם לכן"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "הסרת קבוצה: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "שם מלא:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "שם משתמש:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "יש לאשר את הסיסמה:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "מעטפת כניסה לחשבון:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "שם הקבוצה:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "נא לבחור לפחות קבוצה אחת לפחות עבור המשתמש"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -519,159 +531,159 @@ msgstr ""
 "נא לקבוע שנה, חודש ויום\n"
 " עבור תפוגת החשבון "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "נא לספק את הסיסמה הישנה בכל השדות\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "אין אפשרות למחוק את המשתמש '%s' מהקבוצה הראשית שלו"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "ספריית הבית:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "נתוני משתמש"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "איפשור תפוגת חשבון"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "החשבון פג בתאריך (שנה-חודש-יום):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "נעל חשבון משתמש"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "מידע על החשבון"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "סיסמת החשבון שונתה לאחרונה בתאריך :"
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "איפשור תפוגת סיסמה"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "מספר ימים לפני שניתן לשנות את הסיסמה:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "מספר ימים שלאחריהם יש לשנות סיסמה :"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "מספר ימים לפני אזהרה על תפוגת הסיסמה :"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "ימים לפני נעילת חשבון לא פעיל :"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "מידע על הסיסמה"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "יש לבחור את הקבוצות שהחשבון יהיה חבר בהן :"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "מידע על קבוצות"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "נא לבחור את המשתמשים שיצטרפו לקבוצה הזאת :"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "משתמשים בקבוצה"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "עריכת קבוצות / משתמשים"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "חלה שגיאה"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "סגור"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "זכויות היוצרים (C) %s שייכות למנדריבה"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, fuzzy, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "זכויות היוצרים (C) %s שייכות למנדריבה"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "ניהול משתמשים"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "מנדריבה לינוקס"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Dotan Kamber <kamberd@yahoo.com>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "שדה השם ריק, נא לספק שם"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "השם חייב להכיל רק אותיות לטיניות קטנות, מספרים, מקף וקו תחתי"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "השם ארוך מדי"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "שגיאה"
@@ -685,73 +697,73 @@ msgstr "כלי ניהול משתמשים של Mageia"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, fuzzy, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "חלה תקלה בעת יצירת ספריית דואר.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "חלה תקלה ביצירת `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "חלה תקלה בעת יצירת ספריית דואר: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, fuzzy, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "חלה תקלה בעת יצירת ספריית דואר.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "שגיאה לא ידועה"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 #, fuzzy
 msgid "Group creation failed.\n"
 msgstr "חלה תקלה בעת יצירת ספריית דואר.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "חלה תקלה בעת מחיקת ספריית הדואר: %s\n"
diff --git a/po/hi.po b/po/hi.po
index f0bb5b5..9bd7d65 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2015-02-13 05:26+0000\n"
 "Last-Translator: azeem_k <azeem_k@hotmail.com>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/mageia/language/"
@@ -19,12 +19,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "यूज़र-ड्रैक"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "उपयोगकर्ताओं और समूहों को लाया जा रहा है... कृपया प्रतीक्षा करें"
@@ -129,7 +129,7 @@ msgstr "फ़िल्टर लगायें"
 msgid "Users"
 msgstr "उपयोग-कर्ता"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "समूह"
@@ -150,7 +150,7 @@ msgstr "उपयोगकर्ता का नाम"
 msgid "User ID"
 msgstr "उपयोग-कर्ता पहचान संख्या"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "प्रधान समूह"
@@ -210,7 +210,7 @@ msgstr "समूह जोड़े"
 msgid "Add a group to the system"
 msgstr "एक समूह को प्रणाली में जोड़ना"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "सम्पादन"
@@ -220,7 +220,7 @@ msgstr "सम्पादन"
 msgid "Edit selected row"
 msgstr "चयन की हुई पंक्ति का संपादन"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "मिटाना"
@@ -240,57 +240,57 @@ msgstr "पुनः ताजा करना"
 msgid "Refresh the list"
 msgstr "उपयोग-कर्ता सूची को पुनः ताजा करना"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "ताला-बन्द"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "समाप्त हो चुका है"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "आइकॉन को परिवर्तित करने के लिए, इस पर क्लिक करें"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "नये उपयोगकर्ता का निर्माण"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "गृह स्थल निर्देशिका का निर्माण करें"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "गृह स्थल निर्देशिका: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "उपयोगकर्ता के लिए एक व्यक्तिगत समूह का निर्माण"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "उपयोगकर्ता पहचान संख्या को स्वमं निर्दिष्ट करना"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "उपयोगकर्ता पहिले से विद्यमान है, कृपया अन्य उपयोगकर्ता नाम चुनें।"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "कूट-शब्द बेमेल"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -299,12 +299,12 @@ msgstr ""
 "यह कूट-शब्द अति सरल है।\n"
 "अच्छे कूट-शब्द ६ अक्षरों से अधिक के होते है"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "उपयोगकर्ता की उपयोगकर्ता-पहचान-संख्या ५०० से कम है"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -316,27 +316,39 @@ msgstr ""
 "क्या आप वास्तव में ऐसा करना चाहते है?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "'users' समूह में %s डाला जा रहा है"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "%s : नये समूह का निर्माण हो रहा है"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "%s : उपयोगकर्ता को जोड़ा जा रहा है"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "गृह स्थल निर्देशिका: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "स्थानांतरगमन का मंत्र"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -345,64 +357,64 @@ msgstr ""
 " क्या आप स्थानांतरगमन का मंत्र शुरू करना चाहते हैं ताकि विंडोज के अस्त और दस्तावेज़ मेजीआ में आ "
 "जाएँ ?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "निरस्त"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "ओ०के०"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "उपयोगकर्ता पहचान संख्या: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "समूह का चयन करें"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "विद्यमान समूह में जोड़ना"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "'users' समूह में जोड़ना"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "इस नाम का एक समूह पहिले से विद्यमान है। आप क्या करना चाहेगें? "
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "नये समूह का निर्माण करें"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "समूह पहचान संख्या स्वमं निर्दिष्ट करें"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "समूह पहिले से विद्यमान है, कृपया अन्य समूह नाम का चयन करें"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " समूह की समूह पहचान संख्या ५०० से कम है"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -413,22 +425,22 @@ msgstr ""
 "क्या आप वास्तव में ऐसा करना चाहते है?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "%s  : समूह को जोड़ा जा रहा है"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "समूह पहचान संख्या: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "संचिकाओं को मिटाया जायें कि नहीं?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -437,27 +449,27 @@ msgstr ""
 "%s उपयोगकर्ता को हटाया जा रहा है\n"
 "साथ ही, निम्नलिखित क्रियायें भी की जा रही है\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "गृह स्थल निर्देशिका को हटायें : %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "विपत्र-पेटी को हटायें :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "%s : उपयोगकर्ता को हटाया जा रहा है"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "क्या आप वास्तव में %s समूह को हटाना चाहते है"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -466,47 +478,47 @@ msgstr ""
 "%s , उपयोगकर्ता %s के लिए, एक प्रधान समूह है\n"
 " उपयोगकर्ता को पहिले हटायें"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "%s : समूह को हटाया जा रहा है"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "पूरा नाम:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "सत्र-आरंभ:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "कूट-शब्द:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "कूट-शब्द की पुष्टि:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "सत्र-आरंभ कोश:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "समूह का नाम:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "कृपया इस उपयोगकर्ता के लिए कम-से-कम एक समूह का चयन करें"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -515,159 +527,159 @@ msgstr ""
 "कृपया खाता समाप्ति के लिए \n"
 "वर्ष, माह और दिवस बतायें"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "कृपया कूट-शब्द जीवनकाल में सभी प्रविष्टियों को भरें\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "आप, '%s' उपयोगकर्ता को उसके प्रधान समूह से नहीं हटा सकते है"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "गॄह-स्थल:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "उपयोग-कर्ता जानकारी"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "खाता समाप्ति प्रक्रिया को सक्रिय करें"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "खाता समाप्ति की तिथि (वर्ष-ंमाह-दिवस) (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "उपयोगकर्ता खाते को लॉक करें"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "खाते के बारे में जानकारी"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "उपयोगकर्ता ने कूट शब्द को अंतिम बार इस तिथि को परिवर्तित किया था: "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "कूट शब्द समाप्ति प्रक्रिया को सक्रिय करें"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "दिन संख्या, जिसके पहिले परिवर्तन की अनुमति है :"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "दिन संख्या, जिसके पहिले परिवर्तन आवश्यक है :"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "दिन संख्या, जिसके पहिले परिवर्तन की चेतावनी मिलेगी :"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "दिन संख्या जिसके पहिले खाता निष्क्रिय होगा :"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "कूट-शब्द सूचना"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "उन समूहों का चयन करें जिनका यह उपयोगकर्ता एक सदस्य होगा:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "समूह जानकारी"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "एस समूह में शामिल होने के लिए उपयोगकर्ताओं का चयन करें"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "समूह उपयोगकर्ता"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "समूहों/उपयोगकर्ताओं का संपादन"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "एक त्रुटि हो गयी है"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "समाप्त"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "सर्वाधिकार (C) %s मैनड्रिव"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "सर्वाधिकार (C) %s मेगीआ "
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "उपयोगकर्ता प्रबंधन"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "मैनड्रैकलिनक्स"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "धनञ्जय शर्मा (Dhananjaya Sharma)\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "नाम क्षेत्र खाली है, कृपया एक नाम प्रदान करें"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "नाम में सिर्फ़ लैटिन छोटे अक्षर, संख्याऐं, `-' और `_' शामिल होना चाहिए"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "नाम अत्याधिक लंबा है"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "त्रुटि"
@@ -680,74 +692,74 @@ msgstr "मेजीआ के खाते प्रबंधक को शु�
 msgid "Authentication is required to run Mageia User Manager"
 msgstr "मेजीआ के खाते प्रबंधक को शुरू करने के लिए उच्चतम अधिकार की ज़रुरत है"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "खाते का निर्माण असफल: '%s' |\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "यूआयीडी का मूल्य प्राप्त नहीं कर पाया"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "मूल्य प्राप्त नहीं कर पाया "
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "`%s' का निर्माण करने में त्रुटि: %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "मेल स्पूल का निर्माण करने में त्रुटि।: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "खाते को नहीं बदल पाया: '%s' |\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "खाते को नहीं मिटा पाया: '%s' |\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "पासवर्ड स्थापित नहीं हो पाया: '%s' |\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "अज्ञात त्रुटि"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "समूह निर्माण असफल |\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 "समूह को नहीं बदल पाया: '%s' |\n"
 "\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "समूह को नहीं मिटा पाया: '%s' |\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr " खाते की निजी डायरेक्टरी उपस्थित नहीं |\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "निजी डायरेक्टरी को नहीं मिटा पाया: '%s' |\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "मेल स्पूल का मिटाने में त्रुटि: %s\n"
diff --git a/po/hr.po b/po/hr.po
index 93b55bb..dff534d 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2015-11-22 06:51+0000\n"
 "Last-Translator: Ivica  Kolić <ikoli@yahoo.com>\n"
 "Language-Team: Croatian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -20,12 +20,12 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Učitavam korisnike i grupe... Molimo pričekajte"
@@ -130,7 +130,7 @@ msgstr "Primjeni filter"
 msgid "Users"
 msgstr "Korisnici"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Grupe"
@@ -151,7 +151,7 @@ msgstr "Korisničko ime"
 msgid "User ID"
 msgstr "Korisnički ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Primarna grupa"
@@ -211,7 +211,7 @@ msgstr "Dodaj grupu"
 msgid "Add a group to the system"
 msgstr "Dodaj grupu u sistem"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Podesi"
@@ -221,7 +221,7 @@ msgstr "Podesi"
 msgid "Edit selected row"
 msgstr "Promjeni odabrani red"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Ukloni"
@@ -241,57 +241,57 @@ msgstr "Osvježi"
 msgid "Refresh the list"
 msgstr "Osvježi listu korisnika"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Zaključano"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Isteklo"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Kliknite na ikonu da ju promjenite"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Napravi novog korisnika"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Napravi početni direktorij"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Početni direktorij:"
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Napravi privatnu grupu za korisnika"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Odredi korisnički ID ručno"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Ovaj korisnik već postoji, molimo odaberite drugo korisničko ime"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Lozinka se ne slaže"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -300,12 +300,12 @@ msgstr ""
 "Lozinka je previše jednostavna. \n"
 " Dobra lozinka mora imati > 6 znakova"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Korisnički Uid je < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -316,27 +316,39 @@ msgstr ""
 " Da li stvarno želite to učiniti?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Stavljam %s u 'korinsičku' grupu"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Stvaram novu grupu: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Dodajem korisnika: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Početni direktorij:"
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Čarobnjak migracije"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -345,64 +357,64 @@ msgstr ""
 "Želite li pokrenuti čarobnjaka migracije da uvezete Windows dokumente i "
 "postavke u vašu Mageia distribuciju."
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "U redu"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Odaberi grupu"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Dodaj postojećoj grupi"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Dodaj 'korisničkoj' grupi"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Grupa sa tim imenom već postoji. Što želite učiniti?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Napravni novu grupu"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Odredi ID grupe ručno"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Grupa već postoji, molimo odaberite drugo ime grupe"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "Gid grupe je < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -413,22 +425,22 @@ msgstr ""
 " Da li stvarno to želite učiniti?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Dodajem grupu: %s"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Da obrišem datoteke?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -437,27 +449,27 @@ msgstr ""
 "Brišem korisnika %s\n"
 " Također izvodim slijedeće akcije\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Brišem početni direktorij: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Obriši Mailbox :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Uklanjam korisnika: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Da li stvarno želite izbrisate grupu %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -466,47 +478,47 @@ msgstr ""
 "%s je primarna grupa za korisnika %s\n"
 " Prvo uklonite korisnika"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Uklonjam grupu: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Puno ime:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Korisnička oznaka:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Potvrda lozinke:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Login školjka:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Ime grupe:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Molimo odaberite najmanje jednu grupu za ovog korisnika"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -515,159 +527,159 @@ msgstr ""
 "Molimo odaberite godinu, mjesec i dan \n"
 " za prestanak valjanosti računa "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Molimo popunite sva polja u lozinki ponovo\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Ne možete izbrisati korisnika '%s' iz njegove primarne grupe"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Početni direktorij:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Podaci o korisniku"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Uključi prestanak valjanosti računa"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Račun prestaje valjati (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Zaključaj korisnikov račun"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Informacije o računu"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Korisnik zadnji put promjenio lozinku:"
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Uključi prestanak valjanosti lozinke"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dani prije kada su promjene dozvoljene:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Dani prije potrebe promjena: "
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dani upozorenja prije promjena:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dani prije neaktivnosti računa:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Informacije o lozinki"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Odaberiter gurpe u kojima će korisnik biti član:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Podaci o grupama"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Odaberite korisnike koji se pridružuju ovoj grupi:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Članovi grupe"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Mijenjaj grupe / korisnike"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Došlo je do greške:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Zatvori"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Upravljanje korisnicima"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Croatian <lokalizacija@linux.hr>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Polje imena je prazno, molimo upišite ime"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Ime mora sadržavati samo mala latinska slova, brojeve, `-' i `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Ime je predugačko"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Greška"
@@ -680,72 +692,72 @@ msgstr "Pokreni Mageia upravitelja korisnicima"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr "Potrebna je ovjera za pokretanje Mageia upravitelja korisnicima"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Neuspjela izrada računa: '%s'.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Ne mogu dobiti Uid broj"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Ne mogu dohvatiti vrijednost"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Ne mogu napraviti `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Ne mogu učitati mail spool: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Korisnik se ne može izmjeniti: '%s'.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Korisnik se ne može izbrisati: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Neuspjelo postavljanje lozinke: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "Nepoznata greška"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Neuspjelo stvaranje grupe.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Grupa se ne može izmjeniti: '%s'.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Grupa se ne može izbrisati: '%s'.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Nema osobnog direktorija za korisnika.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Osobni direktorij se ne može izbrisati: '%s'.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Greška kod brisanja sandučića za poštu: %s\n"
diff --git a/po/hu.po b/po/hu.po
index d1ea620..f314d83 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2017-10-04 10:45+0000\n"
 "Last-Translator: Kardos László <kardiweb@protonmail.ch>\n"
 "Language-Team: Hungarian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -22,12 +22,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "UserDrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Felhasználók és csoportok betöltése..."
@@ -132,7 +132,7 @@ msgstr "Szűrő alkalmazása"
 msgid "Users"
 msgstr "Felhasználók"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Csoportok"
@@ -153,7 +153,7 @@ msgstr "Felhasználónév"
 msgid "User ID"
 msgstr "Felhasználó azonosító"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Elsődleges csoport"
@@ -213,7 +213,7 @@ msgstr "Új csoport"
 msgid "Add a group to the system"
 msgstr "Új csoport létrehozása"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Módosítás"
@@ -223,7 +223,7 @@ msgstr "Módosítás"
 msgid "Edit selected row"
 msgstr "A kijelölt sor szerkesztése"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Törlés"
@@ -243,57 +243,57 @@ msgstr "Frissítés"
 msgid "Refresh the list"
 msgstr "Lista frissítése"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Zárolt"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Lejárt"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Kattintson az ikonra a megváltoztatásához"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Új felhasználó létrehozása"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Saját könyvtár létrehozása"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "A saját könyvtár: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Privát csoport létrehozása a felhasználóhoz"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "A felhasználóazonosító megadása"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Már létezik ilyen nevű felhasználó, válasszon más nevet."
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "A jelszavak nem egyeznek meg"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -302,12 +302,12 @@ msgstr ""
 "A megadott jelszó túlságosan egyszerű. \n"
 " Legalább 7 karakter hosszú jelszót érdemes választani."
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "A felhasználó azonosítója kisebb mint 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -318,27 +318,39 @@ msgstr ""
 "Biztosan ezt szeretné?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "%s hozzáadása a 'users' nevű csoporthoz"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Új csoport létrehozása: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "%s felhasználó felvétele"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "A saját könyvtár: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Importálási varázsló"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -347,64 +359,64 @@ msgstr ""
 "Szeretné elindítani az importálási varázslót, amellyel áthozhatja windowsos "
 "dokumentumait és beállításait a Mageia rendszerbe?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "Felhasználóazonosító: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Válasszon csoportot"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Hozzáadás a már létező csoporthoz"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Hozzáadás a 'users' nevű csoporthoz"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Már létezik ilyen nevű csoport. Mit szeretne tenni?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Új csoport létrehozása"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "A csoportazonosító megadása"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Ilyen nevű csoport már létezik, válasszon más nevet."
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " A csoportazonosító kisebb mint 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -414,22 +426,22 @@ msgstr ""
 "1000-nél kisebb azonosítójú csoportot nem ajánlott létrehozni.\n"
 "Biztosan ezt szeretné?\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "%s csoport felvétele"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "Csoportazonosító: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Törlésre kerüljenek a fájlok?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -438,27 +450,27 @@ msgstr ""
 "\"%s\" felhasználó törlése\n"
 "A következők is végre lesznek hajtva:\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Saját könyvtár törlése: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Postaláda törlése: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "%s felhasználó eltávolítása"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Valóban törölni szeretné a következő csoportot: %s ?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -467,47 +479,47 @@ msgstr ""
 "%s csoport a %s felhasználó elsődleges csoportja.\n"
 "Először a felhasználót kell törölni"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "%s csoport eltávolítása"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Teljes név:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Bejelentkezési név:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Jelszó (még egyszer):"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Parancsértelmező:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Csoportnév:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Legalább egy csoportot ki kell választani"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -516,150 +528,150 @@ msgstr ""
 "Adja meg a felhasználónév lejárásának dátumát\n"
 " (év, hónap, nap) "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "A lejárattal kapcsolatos összes mezőt ki kell tölteni\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "A(z) '%s' felhasználónév nem távolítható el az elsődleges csoportjából"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Saját könyvtár:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Felhasználói adatok"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "A felhasználónevek lejárásának bekapcsolása"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "A lejárás dátuma (ÉÉÉÉ-HH-NN):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "A felhasználónév zárolása"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "A felhasználó jellemzői"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "A legutóbbi jelszóváltoztatás dátuma: "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "A jelszó lejárásának bekapcsolása"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Jelszómódosítás legkorábban ennyi nap múlva:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Jelszómódosítás legkésőbb ennyi nap múlva:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Figyelmeztetés a jelszómódosításra ennyi nappal korábban:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "A felhasználónév letiltása ennyi nap elteltével:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "A jelszó jellemzői"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Válassza ki, hogy a felhasználó mely csoportokhoz tartozzon:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "A csoport adatai"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Válassza ki, mely felhasználókat szeretné a csoporthoz adni:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "A csoport felhasználói"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Csoportok / felhasználók szerkesztése"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Hiba lépett fel:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Bezárás"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s, Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Copyright (C) %s, Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Felhasználókezelés"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "_: ()Mageia() Hungarian Translator(s)\n"
 "i18n-hu@ml.mageia.org\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "A 'név' mező nem lehet üres"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
@@ -667,12 +679,12 @@ msgstr ""
 "A névben csak angol kisbetűk, számjegyek, a '-' és az '_' karakterek "
 "szerepelhetnek"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "A megadott név túl hosszú"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Hiba történt"
@@ -685,72 +697,72 @@ msgstr "A Mageia felhasználókezelő indítása"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr "Azonosítás szükséges a Mageia Felhasználókezelő futtatásához"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Hiba a hozzáférés létrehozásakor: '%s'.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Az UID szám beszerzése sikertelen"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Az értéket nem lehet lekérdezni"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Hiba `%s' létrehozásakor: %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Hiba a levéltároló létrehozásakor: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "A felhasználót nem lehetett módosítani: '%s'.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Nem sikerült törölni a felhasználót: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Nem sikerült beállítani a jelszót: '%s'\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "ismeretlen hiba"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Hiba a csoport létrehozásakor.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Nem sikerült módosítani a csoportot: '%s'.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Nem sikerült törölni a csoportot: '%s'.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "A felhasználónak nincs saját könyvtára.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "A felhasználó könyvtára nem lett törölve: '%s'.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Hiba a levéltároló törlésekor: %s\n"
diff --git a/po/hy.po b/po/hy.po
index 8e8d894..f154aef 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2004-03-16 02:28+0300\n"
 "Last-Translator: Artyom Abgaryan <tyoma@freenet.am>\n"
 "Language-Team: Arm <tyoma@freenet.am>\n"
@@ -15,12 +15,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Բեռնավորում եմ Գործածողների և Խմբերի ցանկը... Սպասեք"
@@ -128,7 +128,7 @@ msgstr "Կիրառել զտիչ"
 msgid "Users"
 msgstr "Օգտագործողներ"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "խմբեր"
@@ -149,7 +149,7 @@ msgstr "Օգտագործողի անուն"
 msgid "User ID"
 msgstr "Օգտագործողի ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Գլխավոր խումբ"
@@ -209,7 +209,7 @@ msgstr "Ավելացնել խումբ"
 msgid "Add a group to the system"
 msgstr "Ավելացնել խումբը համակարգին"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Խմբագրել"
@@ -219,7 +219,7 @@ msgstr "Խմբագրել"
 msgid "Edit selected row"
 msgstr "Խմբագրել ընտրված տողը"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Ջնջել"
@@ -239,57 +239,57 @@ msgstr "Թարմացնել"
 msgid "Refresh the list"
 msgstr "Թարմացնել ցուցակը"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Փակված է"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Ժամկերը լրացել է"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Սեղմեք նկարի վրա այն փոփոխելու համար"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Ստեղծել նոր օգտագոծող"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Ստեղծել տնային թղթապանակ"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Տնային թղթապանակ:"
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Ստեղծել առանձին խումբ օգտագործողի համար"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Նշել օգտագործողի ID-ն ձեռքով"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Օգտագործողը գոյություն ունի, ընտրեք մեկ այլ օգտագործողի անուն"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Գաղտնագրի անհամապատասխանություն"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -299,13 +299,13 @@ msgstr ""
 " Լավ գաղտնագիրը պետք է պարունակի ավելի քան վեց նիշ"
 
 # ԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾ
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Օգտագործողի Uid-ը < 1000"
 
 # ԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾ
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -316,93 +316,105 @@ msgstr ""
 "Դուք համոզվա՞ծ եք, որ ուզում եք անել այդ\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Տեղադրում եմ %s - ին 'օգտագործողներ' խմբում"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Ստեղծում եմ նոր խումբ: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Ավելագնում եմ %s օգտագործողին"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Տնային թղթապանակ:"
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Հրաժարվել"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Լավ"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Ընտրեք խումբը"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Ավելագնել գոյություն ունեցող խմբին"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Ավելագնել  'օգտագործողներ' խմբին"
 
 # ԾԾԾԾԾԾԾԾԾԾ
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Խումբ այդպիսի անունով գոյություն ունի: Ին՞չ եք ուզում անել"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Ստեղծել նոր խումբ"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Նշել խմբի ID ձեռքով"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Խումբը գոյություն ունի, ընտրեք խմբի մեկ այլ անուն"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "Խմբի GID-ը < 1000"
 
 # Նոր ջան մի հատ  նայի ես ինչ եմ արե :)
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -413,22 +425,22 @@ msgstr ""
 "Դուք համոզվա՞ծ եք, որ ուզում եք անել այդ\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Ավելացնում եմ %s խումբը"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Ջնջել ֆայլերը թե ոչ"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -437,27 +449,27 @@ msgstr ""
 "Ջնջում եմ %s օգտագործողին\n"
 " Նաև կատարվում եմ հետևյալ գործողությունները\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Ջնջել Տնային %s թղթապանակը"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Ջնջել փոստարկղը :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Հեռացնում եմ %s օգտագործողին"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Դուք իսկապես ուզում եք ջնջել %s խումբը"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -466,49 +478,49 @@ msgstr ""
 "%s-ը գլխավոր խումբ է %s օտագորողի համար\n"
 " Սկզբից հեռացրեք օգտագործողին"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Հեռացնում եմ %s խումբը"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Անունը ամբողջությամբ:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Մուտքանուն:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Գաղտնագիր:"
 
 # ԾԾԾԾԾԾԾԾԾԾԾԾԾԾ
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Գրեք կրկին գաղտնագիրը"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Մուտքի միջավայր:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Խմբի անուն:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Ընտրեք գոնե մեկ խումբ օգտագործողի համար"
 
 # ԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾ
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -517,68 +529,68 @@ msgstr ""
 "Նշեք հաշիվը փակելու \n"
 "Տարին,Ամիսը և Օրը"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Լրացրեք բոլոր դաշտերը գաղտնագրի ժամկետի համար\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Դուք չեք կարող հեռացնել '%s' օգտագործողին նրա գլխավոր խմբից"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Տուն:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Օգտագործողի տվյալներ"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Միացնել հաշվի ժամկետի լրացումը"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Հաշվի ժանմկետը լրանում է (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Փակել օգտագործողի հաշիվը"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Հաշվի տվյալներ"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Օգտագործողը վերջին անգամ գաղտնաբառը փոխել է:"
 
 # ԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾ
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Միացնել գաղտնագրի ժամկետի լրացումը"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Քանի օր հետո թույլատրել փոփոխությունները:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Քանի օր հետո պահանջել փոփոխություն:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr ""
@@ -586,83 +598,83 @@ msgstr ""
 " փոփոխությունների համար :"
 
 # ԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾ
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Օրերի քանակը մինչ հաշվի անջատումը:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Գաղտնաբառի Տվյալներ"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Ընտրեք խումբը, որի անդամ պետք է լինի օգտագործողը:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Խմբի Տվյալներ"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Ընտրեք օգտագործողներին, որոնք վայելելու են այս խումբը"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Խմբի օգտագործողներ"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Խմբագրել Խմերը/Օգտագործողներին"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr ""
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Փակել"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Օգտագործողների կառավարում"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr ""
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Անվան դաշտը դատարկ է, գրեք որևէ անուն"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
@@ -670,12 +682,12 @@ msgstr ""
 "Անունը կարող է պարունակի միայն փոքրատառ լատիներեն տառեր, թվեր, `-' և `_' "
 "նշաններ"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Անունը շատ երկար է"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Սխալ"
@@ -689,72 +701,72 @@ msgstr "Mageia Գործածողների Կառավարման Գործիք"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr ""
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr ""
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr ""
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 9581bdf..915564d 100644
--- a/po/id.po
+++ b/po/id.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2013-11-12 04:52+0000\n"
 "Last-Translator: kiki.syahadat <kiki.syahadat@yahoo.co.id>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/mageia/"
@@ -23,12 +23,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Memuat Pengguna dan Grup... Silakan tunggu"
@@ -133,7 +133,7 @@ msgstr "Terapkan penyaringan"
 msgid "Users"
 msgstr "Pengguna"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Grup"
@@ -154,7 +154,7 @@ msgstr "Nama Pengguna"
 msgid "User ID"
 msgstr "ID Pengguna"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Grup Primer"
@@ -214,7 +214,7 @@ msgstr "Tambah Grup"
 msgid "Add a group to the system"
 msgstr "Tambah grup pada sistem"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Edit"
@@ -224,7 +224,7 @@ msgstr "Edit"
 msgid "Edit selected row"
 msgstr "Edit baris terpilih"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Hapus"
@@ -244,57 +244,57 @@ msgstr "Refresh"
 msgid "Refresh the list"
 msgstr "Refresh daftar"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Terkunci"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Kadaluarsa"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Klik pada ikon untuk mengubah"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Buat Pengguna Baru"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Buat Direktori Home"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Direktori Home: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Buat grup privat untuk pengguna"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Tentukan ID pengguna secara manual"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Pengguna sudah ada, silakan pilih Nama Pengguna yang lain"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Sandi Tidak Cocok"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -303,12 +303,12 @@ msgstr ""
 "Sandi ini terlalu sederhana. \n"
 " Sandi yang baik harus > 6 karakter"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Uid pengguna < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -319,27 +319,39 @@ msgstr ""
 " Apakah Anda yakin ingin melakukan ini?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Meletakkan %s ke grup 'pengguna'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Membuat grup baru: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Menambah pengguna: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Direktori Home: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Wizard migrasi"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -348,64 +360,64 @@ msgstr ""
 "Apakah Anda ingin menjalankan wizard migrasi untuk mengimpor documents and "
 "settings Windows ke distribusi Mageia Anda?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Pilih grup"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Tambahkan ke grup yang sudah ada"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Tambahkan ke grup 'pengguna'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Grup dengan nama ini sudah ada. Apa yang ingin Anda lakukan?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Buat Grup Baru"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Tentukan ID grup secara manual"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Grup sudah ada, silakan pilih Nama Grup yang lain"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " Gid Grup < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -416,22 +428,22 @@ msgstr ""
 " Apakah Anda yakin ingin melakukan ini?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Menambahkan grup: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Hapus file atau tidak?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -440,27 +452,27 @@ msgstr ""
 "Menghapus pengguna %s\n"
 " Juga melakukan aksi berikut\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Hapus Direktori Home: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Hapus Kotak surat: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Menghapus pengguna: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Apakah Anda yakin ingin menghapus grup %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -469,47 +481,47 @@ msgstr ""
 "%s adalah grup primer untuk pengguna %s\n"
 " Hapus pengguna terlebih dahulu"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Menghapus grup: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Nama Lengkap:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Sandi:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Konfirmasi Sandi:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell Login:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Nama Grup:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Silakan pilih setidaknya satu grup untuk pengguna"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -518,138 +530,138 @@ msgstr ""
 "Silakan tetapkan Tahun, Bulan dan Hari \n"
 " untuk Kadaluarsa Akun "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Silakan isi semua kolom di usia sandi\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Anda tidak bisa menghapus pengguna '%s' dari grup primernya"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Home:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Data Pengguna"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Hidupkan kadaluarsa pengguna"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Kadaluarsa pengguna (TTTT-BB-HH):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Kunci Akun Pengguna"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Info Akun"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Perubahan sandi pengguna terakhir pada: "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Hidupkan Kadaluarsa Sandi"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Hari sebelum perubahan diizinkan:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Hari sebelum perubahan diperlukan:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Hari peringatan sebelum perubahan:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Hari sebelum akun nonaktif:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Info sandi"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Pilih grup di mana pengguna akan menjadi anggota:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Data Grup"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Pilih pengguna untuk bergabung di grup ini:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Pengguna Grup"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Edit Grup / Pengguna"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Terjadi error:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Tutup"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Hak Cipta (C) %s oleh Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Hak Cipta (C) %s oleh Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Manajemen Pengguna"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
@@ -662,23 +674,23 @@ msgstr ""
 "Sofian <sofianhanafi@yahoo.com>\n"
 "Kiki Syahadat <kiki.syahadat@yahoo.co.id>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Kolom nama kosong silakan berikan sebuah nama"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Nama harus berisi hanya huruf kecil latin, nomor, `-' dan `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Nama terlalu panjang"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Error"
@@ -691,72 +703,72 @@ msgstr "Jalankan Pengelola Pengguna Mageia"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr "Otentikasi diperlukan untuk menjalankan Pengelola Pengguna Mageia"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Pembuatan akun gagal: '%s'.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Tidak bisa mendapatkan nomor Uid"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Tidak bisa mengambil nilai"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Error membuat `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Error membuat spool surat: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Pengguna tidak bisa dimodifikasi: '%s'.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Pengguna Tidak Bisa dihapus: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Gagal mengatur sandi: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "error yang tidak diketahui"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Pembuatan grup gagal.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Grup tidak bisa dimodifikasi: '%s'.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Grup tidak bisa dihapus: '%s'.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Tidak ada direktori home untuk pengguna.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Direktori Home Tidak Bisa dihapus: '%s'.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Error menghapus spool surat: %s\n"
diff --git a/po/is.po b/po/is.po
index 948507f..6ff829a 100644
--- a/po/is.po
+++ b/po/is.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2009-04-08 23:53+0000\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -19,12 +19,12 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Hleð inn notendum og hópum... Augnablik... "
@@ -129,7 +129,7 @@ msgstr "Beita síu"
 msgid "Users"
 msgstr "Notendur"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Hópar"
@@ -150,7 +150,7 @@ msgstr "Notandanafn"
 msgid "User ID"
 msgstr "Notanda-númer (UID)"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Aðalhópur"
@@ -210,7 +210,7 @@ msgstr "Bæta við hópi"
 msgid "Add a group to the system"
 msgstr "Bæta við hópi í kerfið"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Sýsl"
@@ -220,7 +220,7 @@ msgstr "Sýsl"
 msgid "Edit selected row"
 msgstr "Sýsla með valda línu"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Eyða"
@@ -240,57 +240,57 @@ msgstr "Endurnýja"
 msgid "Refresh the list"
 msgstr "Uppfæra lista"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Læst"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Útrunninn"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Smelltu á táknmyndina til að breyta"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Búa til nýja notanda"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Búa til heimasvæði"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Heimamappa: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Búa til einkahóp fyrir notandann"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Ákvarða sjálfur númer notanda"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Notandi þegar til, veldu annað notandanafn"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Lykilorð eru ekki eins"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -299,12 +299,12 @@ msgstr ""
 "Þetta lykilorð er of einfalt. \n"
 " Góð lykilorð ættu að vera > 6 bókstafir"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Notandanúmer < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -315,27 +315,39 @@ msgstr ""
 "Ert þú viss um að þú viljir gera þetta?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Setja %s í 'notanda' hóp"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Búa til nýjan hóp: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Bæta við notanda: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Heimamappa: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Flutnings-ráðgjafi"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -344,64 +356,64 @@ msgstr ""
 "Vilt þú keyra flutnings-ráðgjafann til að flytja inn Windows skrár og "
 "uppsetningar yfir í Mageia dreifinguna þína?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Hætta við"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Í lagi"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Veldu hóp"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Bæta við hóp sem er til"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Bæta í 'notanda' hópinn"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Hópur með þessu nafni er þegar til.  Hvað vilt þú gera?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Búa til nýjan hóp"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Ákvarða sjálfur númer hóps"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Hópur er þegar til, veldu annað hópnafn"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " Hópnúmer er < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -412,22 +424,22 @@ msgstr ""
 " Ert þú viss um að þú viljir gera þetta?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Bæta við hóp: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Eyða skrám eða ekki?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -436,27 +448,27 @@ msgstr ""
 "Eyði notanda %s\n"
 " Framkvæma einnig eftirfarandi aðgerðir\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Eyða heimasvæði: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Eyða Pósthólfi: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Fjarlægi notanda: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Viltu í alvöru eyða hópi %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -465,47 +477,47 @@ msgstr ""
 "%s er aðalhópur fyrir notanda %s\n"
 " Fjarlægðu notanda fyrst"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Fjarlægi hóp: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Fullt nafn:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Notandi:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Lykilorð:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Staðfestu lykilorð:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Skel:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Nafn hóps:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Veldu a.m.k. einn hóp fyrir notandann"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -514,159 +526,159 @@ msgstr ""
 "Tilgreindu Ár, mánuð og dag \n"
 " fyrir úreldingu aðkennis "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Fylltu í öll svæðin fyrir úreldingu lykilorðs\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Þú getur ekki fjarlægt notanda '%s' úr sínum aðalhóp"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Heima:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Gögn notanda"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Virkja auðkennis-úreldingu"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Auðkenni úreldist (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Læsa auðkenni notanda"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Auðkennis-upplýsingar"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Notandi breytti lykilorði þann: "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Virkja lykilorðs-úreldingu"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dagar þar til breyting leyfð:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Dagar þar til breytingar krafist:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Aðvara um breytingu dögum áður:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dagar áður en auðkenni óvirkt:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Lykilorðs-upplýsingar"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Veldu hópa sem notandinn verður meðlimur í:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Hópupplýsingar"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Veljið notendur í þennan hóp:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Notendur í hóp"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Sýsla með Hópa / Notendur"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Villa kom upp:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Loka"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Höfundaréttur (C) %s Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, fuzzy, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Höfundaréttur (C) %s Mandriva"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Notandastjórnun"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Nafnsvæði er autt, gefðu upp nafn"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Nafnið má aðeins innihalda litla bókstafi, tölur `-' og `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Nafn er of langt"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Villa"
@@ -680,73 +692,73 @@ msgstr "Mageia Notandastjórnun"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, fuzzy, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Villa við að búa til pósthólf.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Villa við að búa til `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Villa við að búa til pósthólf: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, fuzzy, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Villa við að búa til pósthólf.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "óþekkt villa"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 #, fuzzy
 msgid "Group creation failed.\n"
 msgstr "Villa við að búa til pósthólf.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Villa við að eyða pósthólfi: %s\n"
diff --git a/po/it.po b/po/it.po
index 1b7764a..b8e42f3 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2014-01-06 12:04+0000\n"
 "Last-Translator: killer1987 <marcello.anni@alice.it>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/mageia/language/"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Attendere, prego... si stanno caricando gli utenti e i gruppi"
@@ -127,7 +127,7 @@ msgstr "Applica filtro"
 msgid "Users"
 msgstr "Utenti"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Gruppi"
@@ -148,7 +148,7 @@ msgstr "Nome utente"
 msgid "User ID"
 msgstr "ID utente"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Gruppo primario"
@@ -208,7 +208,7 @@ msgstr "Aggiungi gruppo"
 msgid "Add a group to the system"
 msgstr "Aggiungi un gruppo al sistema"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Modifica"
@@ -218,7 +218,7 @@ msgstr "Modifica"
 msgid "Edit selected row"
 msgstr "Modifica la riga selezionata"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Elimina"
@@ -238,57 +238,57 @@ msgstr "Aggiorna"
 msgid "Refresh the list"
 msgstr "Aggiorna la lista"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Bloccato"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Scaduto"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Clicca sull'icona per cambiarla"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Crea nuovo utente"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Crea la directory home"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Directory home: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Crea un gruppo privato per l'utente"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Specifica manualmente l'ID utente"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Questo utente è già presente, scegli un altro nome"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "La password non corrisponde"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -297,12 +297,12 @@ msgstr ""
 "Questa password è troppo semplice.\n"
 "Una buona password dovrebbe essere lunga più di 6 caratteri."
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "UID dell'utente inferiore a 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -313,27 +313,39 @@ msgstr ""
 "Sei sicuro di volerlo fare?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Inserimento di %s nel gruppo \"users\""
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Creazione di un nuovo gruppo: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Aggiunta utente: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Directory home: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Procedura per le migrazioni"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -342,64 +354,64 @@ msgstr ""
 "Vuoi eseguire la procedura guidata di migrazione per importare i documenti e "
 "le impostazioni di Windows nella distribuzione Mageia?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Scegli gruppo"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Aggiungi al gruppo esistente"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Aggiungi al gruppo \"users\""
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Esiste già un gruppo con questo nome. Cosa vuoi fare?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Crea nuovo gruppo"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Specifica manualmente group ID"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Questo gruppo è già presente, scegli un altro nome"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "GID del gruppo inferiore a 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -410,22 +422,22 @@ msgstr ""
 "Sei sicuro di volerlo fare?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Aggiunta del gruppo: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Cancellare i file o no?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -434,27 +446,27 @@ msgstr ""
 "Cancellazione dell'utente %s.\n"
 "Saranno eseguite anche le seguenti azioni:\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Cancella la directory home: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Cancella la mailbox: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Rimozione dell'utente: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Vuoi davvero cancellare il gruppo %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -463,47 +475,47 @@ msgstr ""
 "%s è il gruppo primario dell'utente %s.\n"
 "Devi prima rimuovere l'utente."
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Rimozione del gruppo: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Nome completo:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Password:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Conferma password:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell di login:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Nome gruppo:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Devi selezionare almeno un gruppo per l'utente"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -512,160 +524,160 @@ msgstr ""
 "Devi indicare l'anno, il mese e il giorno\n"
 "di scadenza dell'account."
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Devi riempire tutti i campi relativi alla scadenza della password\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Non puoi rimuovere l'utente \"%s\" dal suo gruppo primario"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Home:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Dati utente"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Abilita la scadenza dell'account"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "L'account scade il (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Blocca l'account dell'utente"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Informazioni account"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "L'utente ha cambiato la password in data: "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Abilita la scadenza della password"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Giorni prima che sia permesso il cambio:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Giorni prima che sia richiesto il cambio:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Giorni di avvertimento prima del cambio:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Giorni prima che l'account diventi inattivo:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Informazioni password"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Seleziona i gruppi di cui sarà membro l'utente:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Dati gruppo"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Seleziona gli utenti da inserire in questo gruppo:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Utenti del gruppo"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Modifica gruppi / utenti"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Si è verificato un errore:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Chiudi"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s di Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Copyright (C) %s by Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Gestione utenti"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Andrea Celli <a.celli@caltanet.it>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Il campo del login è vuoto, devi inserire un nome."
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 "Il nome può contenere soltanto lettere minuscole, numeri, \"-\" e \"_\""
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Il nome è troppo lungo"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Errore"
@@ -678,72 +690,72 @@ msgstr "Configura gli utenti Mageia"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr "È richiesta l'autenticazione per configurare gli utenti Mageia"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Errore nella creazione dell'account: '%s'.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Impossibile ottenere il valore dello Uid"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Impossibile recuperare il valore"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Errore nel creare \"%s\": %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Errore nella creazione della coda (spool) della posta: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "L'utente non può essere modificato: '%s'.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "L'utente non può essere eliminato: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Errore durante l'impostazione della password: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "errore sconosciuto"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Errore durante la creazione del gruppo.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Il gruppo non può essere modificato: '%s'.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Il gruppo non può essere modificato: '%s'.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Manca la cartella home per l'utente.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "La cartella home non può essere eliminata: '%s'.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Errore nel cancellare la coda (spool) della posta: %s\n"
diff --git a/po/ja.po b/po/ja.po
index 44f1a04..cafda8f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2018-01-06 07:09+0000\n"
 "Last-Translator: Masanori Kakura <kakurasan@gmail.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/MageiaLinux/mageia/"
@@ -22,12 +22,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "ユーザとグループを読み込んでいます。お待ちください..."
@@ -132,7 +132,7 @@ msgstr "フィルタを適用"
 msgid "Users"
 msgstr "ユーザ"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "グループ"
@@ -153,7 +153,7 @@ msgstr "ユーザ名"
 msgid "User ID"
 msgstr "ユーザ ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "プライマリ グループ"
@@ -213,7 +213,7 @@ msgstr "グループを追加"
 msgid "Add a group to the system"
 msgstr "システムにグループを追加"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "編集"
@@ -223,7 +223,7 @@ msgstr "編集"
 msgid "Edit selected row"
 msgstr "選択したユーザ/グループを編集"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "削除"
@@ -243,57 +243,57 @@ msgstr "更新"
 msgid "Refresh the list"
 msgstr "一覧を更新"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "ロック中"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "期限切れ"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "変更するにはアイコンをクリック"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "新規ユーザを作成"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "ホーム ディレクトリを作成"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "ホーム ディレクトリ: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "このユーザ専用のグループを作成"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "ユーザ ID を手動で指定"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "この名前は既に使われています。別のユーザ名を選んでください。"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "パスワードが合っていません"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -302,12 +302,12 @@ msgstr ""
 "パスワードが短すぎます。 \n"
 "パスワードは 7 文字以上にしてください。"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "ユーザの UID が 1000 未満です"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -318,27 +318,39 @@ msgstr ""
 "本当に作成しますか?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "%s を 'users' グループに追加しています"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "新しいグループを作成しています: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "ユーザを追加しています: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "ホーム ディレクトリ: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "移行ウィザード"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -347,64 +359,64 @@ msgstr ""
 "移行ウィザードを使って Windows のドキュメントと設定を Mageia にインポートしま"
 "すか?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "グループを選択"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "既存のグループに追加"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "'users' グループに追加"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "このグループ名は既に存在します。どうしますか?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "新規グループを作成"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "グループ ID を手動で指定"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "このグループは既に存在します。別のグループ名を選んでください。"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " グループの GID が 1000 未満です"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -415,22 +427,22 @@ msgstr ""
 " 本当に作成しますか?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "グループを追加しています: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "ファイルを削除しますか?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -439,27 +451,27 @@ msgstr ""
 "ユーザ %s を削除しています\n"
 "以下の操作も行います\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "ホーム ディレクトリを削除: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "メール ボックスを削除: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "ユーザを削除しています: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "グループ %s を削除しますか?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -468,47 +480,47 @@ msgstr ""
 "%s はユーザ %s のプライマリ グループです。\n"
 "まずユーザを削除してください。"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "グループを削除しています: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "フル ネーム:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "ログイン:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "パスワード:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "パスワードを確認:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "ログイン シェル:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "グループ名:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "ユーザ 1 人につき少なくとも 1 つのグループを選んでください"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -517,138 +529,138 @@ msgstr ""
 "アカウントの期限に \n"
 "年・月・日を指定してください"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "パスワード期限のすべての欄を埋めてください\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "ユーザ '%s' をプライマリ グループから削除することはできません"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "ホーム:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "ユーザのデータ"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "アカウントの有効期限を設定する"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "アカウントの期限 (年-月-日):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "ユーザ アカウントをロック"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "アカウントの情報"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "ユーザ パスワードの最終変更日: "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "パスワードの有効期限を設定する"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "変更を許可するまでの日数:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "変更を要求するまでの日数:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "変更を要求する何日前に警告するか:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "アカウントを無効にするまでの日数:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "パスワードの情報"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "ユーザが所属するグループを選んでください:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "グループのデータ"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "このグループに加えるユーザを選んでください:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "グループのユーザ"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "グループ/ユーザを編集"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "エラーが発生しました:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "閉じる"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Copyright (C) %s by Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "ユーザの管理"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
@@ -657,12 +669,12 @@ msgstr ""
 "BALLOON a.k.a. Fu-sen. (Keiichi SHIGA) <balloonakafusen@gmail.com>\n"
 "Masanori Kakura <kakurasan@gmail.com>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "名前が入力されていません。入力してください。"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
@@ -670,12 +682,12 @@ msgstr ""
 "名前にはアルファベットの小文字、数字、ハイフン (-)、アンダースコア (_) 以外は"
 "使えません"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "名前が長すぎます"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "エラー"
@@ -688,72 +700,72 @@ msgstr "Mageia ユーザ管理ツールを実行"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr "Mageia ユーザ管理ツールの実行には認証が必要です"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "アカウントを作成できません: '%s'\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "UID 番号を取得できません"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "値を取得できません"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "`%s' の作成時にエラーが発生しました: %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "メール スプールの作成時にエラーが発生しました: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "ユーザを変更できませんでした: '%s'\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "ユーザを削除できませんでした: '%s'\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "パスワードの設定に失敗しました: '%s'\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "不明なエラーです"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "グループの作成に失敗しました。\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "グループを変更できませんでした: '%s'\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "グループを削除できませんでした: '%s'\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "ユーザにホーム ディレクトリがありません。\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "ホーム ディレクトリを削除できませんでした: '%s'\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "メール スプールの削除時にエラーが発生しました: %s\n"
diff --git a/po/ka.po b/po/ka.po
index 411fe93..2178854 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2015-02-13 05:26+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Georgian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "ვიძახებ მომხმარებლებს და ჯგუფებს... გთხოვთ მოითმინოთ"
@@ -127,7 +127,7 @@ msgstr "ფილტრის გააქტიურება"
 msgid "Users"
 msgstr "მომხმარებლები"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "ჯგუფ(ებ)ი"
@@ -148,7 +148,7 @@ msgstr "მომხმარებლის სახელი"
 msgid "User ID"
 msgstr "მომხმარებლის ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "ძირითადი ჯგუფი"
@@ -208,7 +208,7 @@ msgstr "ჯგუფის დამატება"
 msgid "Add a group to the system"
 msgstr "ჯგუფის სისტემაში დამატება"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "დამუშავება"
@@ -218,7 +218,7 @@ msgstr "დამუშავება"
 msgid "Edit selected row"
 msgstr "ამორჩეული რიგის შეცვლა"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "წაშლა"
@@ -238,57 +238,57 @@ msgstr "განახლება"
 msgid "Refresh the list"
 msgstr "სიის განახლება"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "ჩაკეტილია"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "ვადაგასულია"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "დააწკაპუნეტ სიმბოლოზე შესაცვლელად"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "ახალი მომხმარებლის შექმნა"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Home დირექტორიის შექმნა"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "პირადი (home) დირექტორია:"
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "შექმენი საკუთარი ჯგუფი მომხმარებელს"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "მომხმარებლის ID-ს ხელით მითითება"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "მომხმარებელი უკვე არსებობს, გთხოვთ ამოირჩიოთ სხვა მომხმარებლის სახელი"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "პაროლები არ ემთხვევა"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -297,12 +297,12 @@ msgstr ""
 "პაროლი მეტად მარტივია. \n"
 " კარგი პაროლები სულ ცოტა 6 სიმბოლოსგან უნდა შედგებოდეს"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "მომხმარებლის Uid ნაკლებია 1000-ზე"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -313,91 +313,103 @@ msgstr ""
 " დარწმუნებული ხართ, რომ გნებავთ ეს?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "ვსვამ %s-ს „მომხმარებლების“ ჯგუფში"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "ახალი ჯგუფის შექმნა: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "ვამატებ მომხმარებელს: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "პირადი (home) დირექტორია:"
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "სტოპ!"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "ო-ქეი"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "ჯგუფის ამორჩევა"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "არსებულ ჯგუფში დამატება"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "«მომხმარებლების» ჯგუფში დამატება"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "ჯგუფი ამ სახელით უკვე არსებობს. რისი გაკეთება გსურთ?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "ახალი ჯგუფის შექმნა"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "ჯგუფის ID-ს ხელით მითითება"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "ჯგუფის სახელი უკვე არსებობს, გთხოვთ ამოირჩიოთ სხვა ჯგუფის სახელი"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " ჯგუფის Gid ნაკლებია 1000-ზე"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -408,22 +420,22 @@ msgstr ""
 " დარწმუნებული ხართ, რომ გნებავთ ეს?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "ვამატებ ჯგუფს: %s"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "წავშალო ფაილები თუ არა?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -432,27 +444,27 @@ msgstr ""
 "ვშლი მომხმარებელს %s\n"
 " ასევე შეასრულე შემდეგი მოქმედებები\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Home დირექტორიის წაშლა: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "საფოსტო ყუთის წაშლა :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "მომხმარებლის წაშლა: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "მართლა გნებავთ ჯგუფ „%s“-ის წაშლა?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -461,47 +473,47 @@ msgstr ""
 "%s გახლავთ ძირითადი ჯგუფი %s მომხმარებლისათვის\n"
 " ჯერ მომხმარებელი უნდა მოაშოროთ"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "ვაგდებ ჯგუფს: „%s“"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "სრული სახელი:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "მომხმარებელი:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "პაროლი:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "გაიმეორეთ პაროლი:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "შესასვლელი გარსი:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "ჯგუფის სახელი:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "გთხოვთ მომხმარებლისათვის სულ ცოტა ერთი ჯგუფი მაინც ამოირჩიოთ"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -510,148 +522,148 @@ msgstr ""
 "გთხოვთ მიუთითოთ წელი, თვე და რიცხვი \n"
 " ანგარიშის ვადის გასვლისათვის"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "გთხოვთ პაროლის ხანგრძლივობასთან დაკავშირებული ყველა ველი შეავსოთ\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "«%s» მომხმარებელს მათი ძირითადი ჯგუფიდან ვერ მოაშორებთ"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "პირადი უჯრა:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "მომხმარებლის მონაცემები"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "ანგარიშის იმპორტირება ა&ნგარიშზე"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "ანგარიშს ვადა გაუვა (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "მომხმარებლის ანგარიშის ჩაკეტვა"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "ანგარიშის მონაცემები"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "მომხმარებელმა ბოლოს პაროლი შეცვალა:"
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "დააწესე პაროლის მოქმედების ვადა"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "ნებადართულ ცვლილებამდე დარჩენილი დღეები :"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "აუცილებელ ცვლილებამდე დარჩენილი დღეები :"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "ცვლილებამდე გაფრთხილების დღეები :"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "დღეები, სანამ ანგარიში აქტიურობას დაკარგავს :"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "პაროლის მონაცემები"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "ამოირჩიეთ ჯგუფები, რომლის წევრიც მომხმარებელი იქნება:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "ჯგუფის მონაცემები"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "ამოირჩიეთ მომხმარებლები, რომლებიც ამ ჯგუფში გაწევრიანდებიან :"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "ჯგუფის მომხმარებლები"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "ჯგუფების / მომხმარებლების შეცვლა"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr ""
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "დახურვა"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "მომხმარებელთა მენეჯმენტი"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "სახელი ველი თავისუფალია. გთხოვთ მიუთითოთ სახელი"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
@@ -659,12 +671,12 @@ msgstr ""
 "სახელი შეიძლება შეიცავდეს მხოლოდ პარატა ლათინურ ასოებს, ციფრებს და, „-“-ს და "
 "„_“-ს"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "სახელი ძალიან გრძელია"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "შეცდომა"
@@ -677,72 +689,72 @@ msgstr ""
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "შეცდომა `%s'-ის შექმნისას: %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "შეცდომა mail spool-ის შექმნისას: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "უცნობი შეცდომა"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr ""
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "შეცდომა mail spool-ის შექმნისას: %s\n"
diff --git a/po/ko.po b/po/ko.po
index a39fe3e..868a8aa 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2015-02-13 05:26+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/mageia/language/"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "사용자 드레이크"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr ""
@@ -127,7 +127,7 @@ msgstr "거르게 적용"
 msgid "Users"
 msgstr "사용자"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "그룹"
@@ -148,7 +148,7 @@ msgstr "사용자 이름"
 msgid "User ID"
 msgstr "사용자 ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr ""
@@ -208,7 +208,7 @@ msgstr "그룹 추가"
 msgid "Add a group to the system"
 msgstr ""
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "편집"
@@ -218,7 +218,7 @@ msgstr "편집"
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "삭제"
@@ -238,69 +238,69 @@ msgstr "새로 고침"
 msgid "Refresh the list"
 msgstr ""
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "막힘"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr ""
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "새 사용자 생성"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "홈 디렉토리 생성"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "홈 디렉토리:"
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr ""
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "암호가 일치하지 않습니다"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr ""
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -308,91 +308,103 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr ""
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr ""
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr ""
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "홈 디렉토리:"
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "취소"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "확인"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr ""
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "새 그룹 생성"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr ""
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -400,255 +412,255 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr ""
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr ""
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
 " Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr ""
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr ""
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr ""
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr ""
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "전체 이름:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "로그인명:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "암호:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "열쇠글 확인:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "로그인 쉘:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "그룹 이름:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr ""
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "홈 디렉토리:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr ""
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr ""
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr ""
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr ""
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr ""
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr ""
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr ""
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr ""
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr ""
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr ""
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr ""
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr ""
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "닫기"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr ""
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "마제야"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "오류"
@@ -661,72 +673,72 @@ msgstr ""
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr ""
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "알 수 없는 오류"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr ""
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr ""
diff --git a/po/ku.po b/po/ku.po
index 02ca0cd..462d48f 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-ku\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2005-10-09 01:23+0200\n"
 "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
 "Language-Team: Kurdish <gnu-ku-wergerandin@lists.sourceforge.net>\n"
@@ -22,12 +22,12 @@ msgstr ""
 "X-Generator: KBabel 1.10\n"
 "Plural-Forms: nplurals=2; plural= n != 1\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Dakişandina Bikarhener û Grup... Kerema xwe bisekinin"
@@ -132,7 +132,7 @@ msgstr "Fîltre Bixwaze"
 msgid "Users"
 msgstr "Bikarhêner"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Kom"
@@ -153,7 +153,7 @@ msgstr "Nave bikarhêner"
 msgid "User ID"
 msgstr "ID ya bikarhêner"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Koma Yekemîn"
@@ -213,7 +213,7 @@ msgstr "Kome qeyd bike"
 msgid "Add a group to the system"
 msgstr "Li sistema Kom biserve bike"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Biguhere"
@@ -223,7 +223,7 @@ msgstr "Biguhere"
 msgid "Edit selected row"
 msgstr "Yên nîşandayî biguhere"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Pakij bike"
@@ -243,58 +243,58 @@ msgstr "Rojanê bike"
 msgid "Refresh the list"
 msgstr "Lîste rojanê bike"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Girtî"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Demborî bû"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Li îkonên bitikînin ji bo guhartina vî"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Bikarhênerêkî nû qeyd bike"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Cîhe Malê çebike"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Cîhe Malê"
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Ji bo bikarhenerên komek taybetî bafirinin"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Nasnameya bikarhener bi desti bikarbînin"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr ""
 "Bikarhener bi rastî heye, kerema xwe re Nave Bikarhenera din hilbijerin"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Şîfre Nelihev e"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -303,12 +303,12 @@ msgstr ""
 "Ev şîfre pir hêsani ye\n"
 "Şîfreya rast dive ku bibe mezintire 6 karekter "
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Bikarhenera Uid < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -319,91 +319,103 @@ msgstr ""
 "Hûn bi rastî dixwazin ev bikin?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Cihkırına %s re koma 'bikarhener'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Afirandina koma nû: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Biserkirina bikarhener: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Cîhe Malê"
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Betal"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Dibe"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Kîjan kom?"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Li koma jêbûyî biserve bike"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Li koma 'bikarhener' biservebike"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Komek bi vî nav rastî jêbûyî ye. Hûn çi dixwazin çêbikin ?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Komeka nû çebike"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "ID ya kome bi xwe binivsînim"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Kom bi rastî jêbûyî ye, kerema xwe re Nave Kome din hilbijerin"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "Kom Gid < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -414,22 +426,22 @@ msgstr ""
 "Hûn bi rastî dixwazin ev bikin?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Biservekirina kom %s"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Dosyan jî pakij bikin û nekin?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -438,27 +450,27 @@ msgstr ""
 "Paqijkirina bikarhener %s\n"
 "Jê cihê xebata tevgeran paşê hene\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Pakijkirina Mala: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Pakijkirina posteya e-maila :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Pakijkirina bikarhênere: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Hûn bi rastî dixwazin vê kome pakij bikin? : %s"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -467,206 +479,206 @@ msgstr ""
 "%s ev komek yekemîn e ji bo bikarhenera  %s\n"
 "Bikarhenera pêşîn paqij bike"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Pakijkirina koma: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Nav û paşnav:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Nave bikarhêner:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "şîfre:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "şîfre dîsa binivsînê"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Têketina Shell :"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Nave kome:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr "Bikarhênerên kome"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr ""
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Hûn nikarin bikarhêner '%s' pakij bikin ji koma yekemîn"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Mal:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Daneya Bikarhener"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Demboriya hesabe mumkin"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Demborî hesab (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Hesabê bikarhêner kîlît bike"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Agahderiya hesab"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Guherandina şîfreya bikarhênera dawî"
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Dîroka xelasbûna şîfre"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Guherandin rojan berê bi ser ve bûn "
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Dixwazina guherandina rojan berê:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr ""
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr ""
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Agahiya Şîfre"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Daneya Kom"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Ji bo teva kirina bikarheneren re kom hilbijerin :"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Bikarheneren Kom"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Kom / Bikarhêner biguhêre"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr ""
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Bigre"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Bikarhêner manajer"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr ""
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Nav dive ku tene hewandina jer harfen latini, numare, `-' û `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Nav pir dirêj e"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "çewt"
@@ -680,73 +692,73 @@ msgstr "Mageia Amurata Rêvebiriya Bikarhenerên"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, fuzzy, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Çewta afirandina spool mail \n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Çewte Afirandine `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Çewta afirandina spool mail : %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, fuzzy, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Çewta afirandina spool mail \n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "çewtek nezan"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 #, fuzzy
 msgid "Group creation failed.\n"
 msgstr "Çewta afirandina spool mail \n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Çewta rêşkirina spool mail: %s\n"
diff --git a/po/ky.po b/po/ky.po
index ac367c1..6e2b715 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-ky\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2009-12-25 23:18+0600\n"
 "Last-Translator: Ilyas Bakirov <just_ilyas@yahoo.com>\n"
 "Language-Team: Kyrgyz\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Колдонуучулар жана группалар жүктөлүүдө... Күтө туруңуз"
@@ -127,7 +127,7 @@ msgstr "Иргөөнү колдонуу"
 msgid "Users"
 msgstr "Колдонуучулар"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Группалар"
@@ -148,7 +148,7 @@ msgstr "Колдонуучунун аты"
 msgid "User ID"
 msgstr "Колдонуучунун IDси"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Негизги группа"
@@ -208,7 +208,7 @@ msgstr "Группаны кошуу"
 msgid "Add a group to the system"
 msgstr "Системага группаны кошуу"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Оңдоо"
@@ -218,7 +218,7 @@ msgstr "Оңдоо"
 msgid "Edit selected row"
 msgstr "Тандалган сапты оңдоо"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Өчүрүү"
@@ -238,57 +238,57 @@ msgstr "Жаңылоо"
 msgid "Refresh the list"
 msgstr "Тизмени жаңылоо"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Бекитилген"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Иштөө мөөнөтүнүн аягы"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Муну өзгөртүү үчүн иконканы басыңыз"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Жаңы колдонуучуну жаратуу"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Өздүк каталогду түзүү"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Өздүк каталог:"
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Колдонуучу үчүн өздүк группа түзүү"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Колдонуучунун IDсин өзүңүз көрсөтүңүз"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Колдонуучу агдагачан бар, башка колдонуучу атын тандаңыз"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Пароль туура эмес"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -297,12 +297,12 @@ msgstr ""
 "Бул пароль өтө эле жөнөкөй. \n"
 " Жакшы пароль 6 символдон көп болот"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Колдонуучунун Uidи 1000 дөн кичине"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -313,27 +313,39 @@ msgstr ""
 " Ушундай кылууга макулсузбу?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "%s 'users' группасына кошулууда"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Жаңы группа жаратылууда: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Колдонуучу кошулууда: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Өздүк каталог:"
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Которуу устасы"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -342,64 +354,64 @@ msgstr ""
 "Сиз которуу устасы менен Windows ырастоолоруңузду жана документтериңизди "
 "Mageia системасына которуу каалайсызбы?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Калтыруу"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Группа тандаңыз"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Бар группага кошуу"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "'users' группасына кошуу"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Мындай аттуу группа алдагачан бар.  Сиз эмне кылгыңыз келет?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Жаңы группа жаратуу"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Группанын IDсин өзүңүз көрсөтүңүз"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Группа алдгачан бар, башка группа атын тандаңыз"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " Группанын Gidи < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -410,22 +422,22 @@ msgstr ""
 " Ушундай кылууга макулсузбу?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Группа кошулууда: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Файлдарды өчүрөйүнбү же жокпу?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -434,27 +446,27 @@ msgstr ""
 "%s колдонуучусу өчүрүлүүдө\n"
 " Жана да төмөнкүдөй аракеттер жасалууда\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Өздүк каталогду өчүрүү: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Почта ящигин өчүрүү :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Колдонуучу алып салынууда: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Чынында эле %s группасын өчүргүңүз келеби?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -463,47 +475,47 @@ msgstr ""
 "%s, %s колдонуучусу үчүн негизги группа\n"
 " Адегенде колдонуучуну алып салыңыз"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Группа алынып салынууда: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Толук аты:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Логин:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Паролду тактоо:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Кирүү чөйрөсү:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Группанын аты:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Колдонуучу үчүн жок дегенде бир группа тандаңыз"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -512,160 +524,160 @@ msgstr ""
 "Эсеп жазмасынын аяктоо мөөнөтүнүн\n"
 " Жылын, Айын жана Күнүн көрсөтүңүз "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Паролдун жашы үчүн бардык талааларды толтуруңуз\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "'%s' колдонуучусу негизги группасынан алып салынбайт"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Өздүк каталог:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Колдонуучунун даректери"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Эсеп жазылмасынын аяктоочулук мөөнөтүн иштетүү"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Эсеп жазылмасынын аякталышы (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Колдонуучунун эсеп жазылмасын жабуу"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Эсеп жазылмасы жөнүндө информация"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Колдонуучу акыркы жолу паролун алмаштырганы : "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Паролдун мөөнөтү аяктоочулугун киргизүү"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Канча күндөн соң өзгөртүүгө уруксат : "
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Канча күндөн соң өзгөртүүнү талап кылуу : "
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Канча күн мурда өзгөртүүнү эскертүү :"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Эсеп жазмасын жабууга чейинки күн :"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Пароль жөнүндөгү информация"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Колдонуучу мүчө болуучу группаны тандаңыз:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Группанын даректери"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Бул группага бириктирүү үчүн колдонуучуну тандаңыз :"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Колдонуучулар группасы"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Гурппаларды / Колдонуучуларды оңдоо"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Жаңылыштык орун алды:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Жабуу"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, fuzzy, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Copyright (C) %s Mandriva"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Колдонуучуларды башкаруу"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Нурлан Бөрүбаев <nurlan@tamga.info>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Аты талаасы толтурулган эмес, ат бериңиз"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 "Ат, жалаң гана кичине латын тамгалары, сандар, '-' жана '_' турушу керек"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Ат өтө эле узун"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Ката"
@@ -679,73 +691,73 @@ msgstr "Mageia Колдонуучуларды башкаруу аспабы"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, fuzzy, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Почта түзүүдөгү ката.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Түзүү учурундагы ката `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Почта түзүүдөгү ката: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, fuzzy, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Почта түзүүдөгү ката.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "белгисиз ката"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 #, fuzzy
 msgid "Group creation failed.\n"
 msgstr "Почта түзүүдөгү ката.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Почтаны жоготуудагы ката: %s\n"
diff --git a/po/lo.po b/po/lo.po
index 2864ba8..16fac3a 100644
--- a/po/lo.po
+++ b/po/lo.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2015-07-24 14:46+0000\n"
 "Last-Translator: Rockers <sumorock@hotmail.com>\n"
 "Language-Team: Lao (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "ກຳລັງອ່ານຄ່າ ຜູ້ໃຊ້ ແລະ ກຸ່ມ... ກະລຸນາຖ້າ"
@@ -128,7 +128,7 @@ msgstr "ໃຊ້ລະບົບຕອງ"
 msgid "Users"
 msgstr "ຜູ້ໃຊ້"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "ກຸ່ມ"
@@ -149,7 +149,7 @@ msgstr "ຊື່ຜູ້ໃຊ້"
 msgid "User ID"
 msgstr "ລະຫັດຜູ້ໃຊ້"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "ກຸ່ມທຳອິດ"
@@ -209,7 +209,7 @@ msgstr "ຕື່ມກຸ່ມ"
 msgid "Add a group to the system"
 msgstr "ຕື່ມກຸ່ມເຂົ້າລະບບົ"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "ແກ້ໄຂ"
@@ -219,7 +219,7 @@ msgstr "ແກ້ໄຂ"
 msgid "Edit selected row"
 msgstr "ແກ້ໄຂແຖວທີ່ເລືອກ"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "ລຶບ"
@@ -239,57 +239,57 @@ msgstr "ອ່ານຄ່າໃຫມ່"
 msgid "Refresh the list"
 msgstr "ອ່ານຄ່າລາຍການໃຫມ່"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "ລ໋ອກ"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "ຫມົດອາຍຸ"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "ກົດທີ່ຮູບເພື່ອປ່ຽນແປງ"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "ສ້າງຜູ້ໃຊ້ໃຫມ່"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "ສ້າງ Home Directory"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Home Directory: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "ສ້າງກຸ່ມສ່ວນໂຕສຳລັບຜູ້ໃຊ້"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "ໃສ່ລະຫັດຜຸ້ໃຊ້ເອົາເອງ"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "ຊື່ນີ້ມີແລ້ວ, ກະລຸນາໃຊ້ຊື່ອື່ນ"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "ລະຫັດຜ່ານບໍ່ຖືກຕ້ອງ"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -298,12 +298,12 @@ msgstr ""
 "ລະຫັດຜ່ານນີ້ງ່າຍເກີນໄປ. \n"
 " ລະຫັດຜ່ານທີ່ດີຕ້ອງມີຫລາຍກວ່າ 6 ໂຕອັກສອນ"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "ລະຫັດຜູ້ໃຊ້ຫນ້ອຍກວ່າ 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -314,27 +314,39 @@ msgstr ""
 "ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການສ້າງ?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "ຕື່ມ %s ໃສ່ກຸ່ມ 'users' "
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "ສ້າງກຸ່ມໃຫມ່: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "ຕື່ມຜູ້ໃຊ້: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Home Directory: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "ຕົວຊ່ວຍການເຄື່ອນຍ້າຍ"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -343,64 +355,64 @@ msgstr ""
 "ທ່ານຕ້ອງການເອີ້ນໃຊ້ ໂຕຊ່ວຍການເຄື່ອນຍ້າຍ ເພື່ອເອົາເອກະສານແລະການຕັ້ງຄ່າໃນ Windows ໄປໄວ້ທີ່ "
 "Mageia distribution ບໍ່?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "ຍົກເລີກ"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "ຕົກລົງ"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "ລະຫັດ: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "ເລືອກກຸ່ມ"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "ຕື່ມເຂົ້າກຸ່ມທີ່ມີຢູ່ແລ້ວ"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "ຕື່ມໃສ່ກຸ່ມ 'users'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "ຊື່ກຸ່ມນີ້ມີຢູ່ແລ້ວ. ເຈົ້າຈະເຮັດຈັ່ງໃດຕໍ່ໄປ?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "ສ້າງກຸ່ມໃຫມ່"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "ໃສ່ລະຫັດກຸ່ມເອົາເອງ"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "ຊື່ກຸ່ມນີ້ມີຢູ່ແລ້ວ, ກະລຸນາເລືອກຊື່ອື່ນ"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "ລະຫັດກຸ່ມຫນ້ອຍກວ່າ 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -411,22 +423,22 @@ msgstr ""
 "ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການເຮັດແບບນັ້ນ?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "ຕື່ມກຸ່ມ: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "ລະຫັດກຸ່ມ: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "ລຶບໄຟລ໌ຫລືບໍ່?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -435,27 +447,27 @@ msgstr ""
 "ກຳລັງລຶບຜູ້ໃຊ້ %s\n"
 " ແລະກຳລັງເຮັດສິ່ງຕໍ່ໄປນີ້\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "ລຶບ Home Directory: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "ລຶບ ຕູ້ຈົດຫມາຍ :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "ລຶບຜູ້ໃຊ້: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "ເຈົ້າຫມັ້ນໃຈບໍ່ວ່າຈະລຶບກຸ່ມ %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -464,47 +476,47 @@ msgstr ""
 "%s ແມ່ນກຸ່ມທຳອິດຂອງ %s\n"
 " ລຶບຜູ້ໃຊ້ນີ້ກ່ອນ"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "ລຶບກຸ່ມ: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "ຊື່ແທ້:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "ລ໋ອກອິນ:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "ລະຫັດຜ່ານ:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "ຢືນຢັນລະຫັດຜ່ານ:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "ລ໋ອກອິນແຊວ:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "ຊື່ກຸ່ມ:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "ກະລຸນາເລືອກຢ່າງຫນ້ອຍຫນຶ່ງກຸ່ມສຳລັບຜູ້ໃຊ້"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -513,159 +525,159 @@ msgstr ""
 "ກະລຸນາກຳນົດປີ, ເດືອນ ແລະ ມື້ \n"
 "ທີ່ບັນຊີຈະຫມົດອາຍຸ"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "ກະລຸນາຕື່ມໃສ່ທຸກຫ້ອງໃນອາຍຸຂອງລະຫັດລັບ\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "ເຈົ້າບໍ່ສາມາດລຶບຜຸ້ໃຊ້ '%s' ຈາກກຸ່ມທຳອິດຂອງເຂົາ"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "ເຮືອນ:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "ຂໍ້ມູນຜູ້ໃຊ້"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "ໃຊ້ການຈັບເວລາການຫມົດອາຍຸຂອງບັນຊີ"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "ບັນຊີຫມົດອາຍຸ (ປປປປ-ດດ-ທທ):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "ລ໋ອກບັນຊີຜູ້ໃຊ້"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "ຂໍ້ມູນບັນຊີ"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "ຜູ້ໃຊ້ປ່ຽນລະຫັດຜ່ານຄັ້ງຫລ້າສຸດຕອນ: "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "ໃຊ້ກຳນົດມື້ຫມົດອາຍຸຂອງລະຫັດຜ່ານ"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "ຈຳນວນມື້ກ່ອນທີ່ຈະປ່ຽນໄດ້:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "ຈຳນວນມື້ກ່ອນປ່ຽນທີ່ຕ້ອງການ:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "ຈຳນວນມື້ທີ່ຈະເຕືອນກ່ອນປ່ຽນ:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "ຈຳນວນມື້ກ່ອນທີ່ບັນຊີຈະບໍ່ເຮັດວຽກ"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "ຂໍ້ມູນລະຫັດຜ່ານ"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "ເລືອກກຸ່ມທີ່ຜູ້ໃຊ້ຈະເປັນສະມາຊິກ"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "ຂໍ້ມູນກຸ່ມ"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "ເລືອກຜູ້ໃຊ້ສຳລັບກຸ່ມນີ້:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "ກຸ່ມຜູ້ໃຊ້"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "ແກ້ໄຂກຸ່ມ / ຜູ້ໃຊ້"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "ມີຂໍ້ຜິດພາດເກີດຂຶ້ນ:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "ອອກ"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "ລິຂະສິດ (C) %s ໂດຍ Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "ສະຫງວນລິຂະສິດ (C) %s ໂດຍ Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "ການບໍລິຫານຜູ້ໃຊ້"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "ບໍ່ມີຊື່ ກະລຸນາໃສ່ຊື່ແນ່"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "ຊື່ຕ້ອງເປັນໂຕຫນັງສືລາຕິນແບບໂຕນ້ອຍ, ໂຕເລກ,  `-' ແລະ `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "ຊື່ຍາວໂພດ"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "ເກີດການຜິດພາດ"
@@ -678,72 +690,72 @@ msgstr ""
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "ສ້າງບັນຊີບໍ່ໄດ້: '%s'.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "ເກີດການຜິດພາດເວລາສ້າງ `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "ເກີດການຜິດພາດເວລາສ້າງ mail spool: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "ບໍ່ສາມາດດັດແກ້ຜູ້ໃຊ້: '%s'.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "ເກີດການຜິດພາດແບບບໍ່ຮູ້ສາເຫດ"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr ""
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "ເກີດການຜິດພາດເວລາລຶບ mail spool: %s\n"
diff --git a/po/lt.po b/po/lt.po
index ff50712..c0a9105 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2016-09-14 13:17+0000\n"
 "Last-Translator: Moo\n"
 "Language-Team: Lithuanian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -19,12 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Įkeliami naudotojai ir grupės... Prašome palaukti"
@@ -129,7 +129,7 @@ msgstr "Pritaikyti filtrą"
 msgid "Users"
 msgstr "Naudotojai"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Grupės"
@@ -150,7 +150,7 @@ msgstr "Vartotojo vardas"
 msgid "User ID"
 msgstr "Naudotojo ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Pirminė grupė"
@@ -210,7 +210,7 @@ msgstr "Pridėti grupę"
 msgid "Add a group to the system"
 msgstr "Į sistemą įtraukti grupę"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Taisyti"
@@ -220,7 +220,7 @@ msgstr "Taisyti"
 msgid "Edit selected row"
 msgstr "Keisti išrinktą eilutę"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Ištrinti"
@@ -240,57 +240,57 @@ msgstr "Atnaujinti"
 msgid "Refresh the list"
 msgstr "Atnaujinti sąrašą"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Užrakinta"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Pasibaigęs"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Pakeitimui spragtelėkite ant kriptogramos"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Sukurti naują vartotoją"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Sukurti pradinį katalogą"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Pradinis katalogas: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Vartotojui sukurti privačią grupę"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Vartotojo ID nurodyti rankiniu būdu"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Toks vartotojas jau yra, parinkite kitą vartotojo vardą"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Slaptažodžiai neatitinka"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -299,12 +299,12 @@ msgstr ""
 "Slaptažodis per daug paprastas. \n"
 " Tinkamas slaptažodis turėtų būti ne trumpesnis kaip 6 simbolių"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Vartotojo Uid yra < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -315,91 +315,103 @@ msgstr ""
 " Ar tikrai norite tai padaryti?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "%s įkeliamas į grupę 'vartotojai'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Sukuriama nauja grupė: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Įtraukiamas vartotojas: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Pradinis katalogas: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Migravimo vediklis"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Atšaukti"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Gerai"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Pasirinkite grupę"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Įtraukti į esančią grupę"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Įtraukti į grupę 'vartotojai'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Grupė tokiu vardu jau yra.  Ką norėtumėte daryti?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Sukurti naują grupę"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Grupės ID nurodyti rankiniu būdu"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Tokia grupė jau yra, pasirinkite kitą grupės vardą"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " Grupės Gid yra < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -410,22 +422,22 @@ msgstr ""
 " Ar tikrai norite tai padaryti?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Įtraukiama grupė: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Ištrinti failus ar ne?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -434,27 +446,27 @@ msgstr ""
 "Ištrinams vartotojas %s\n"
 " Taip pat įvykdyti sekančius veiksmus\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Ištrinti pradinį katalogą: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Ištrinti pašto dėžutę: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Pašalinamas vartotojas: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Ar tikrai norite ištrinti grupę %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -463,47 +475,47 @@ msgstr ""
 "%s yra pirminė %s vartotojo grupė\n"
 " Pirmiausia pašalinkite vartotoją"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Pašalinama grupė: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Vardas, pavardė:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Pasijungimas:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Slaptažodis:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Patvirtinkite slaptažodį:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Prisijungimo apvalkalas:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Grupės pavadinimas:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Vartotojui parinkite nors vieną grupę"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -512,162 +524,162 @@ msgstr ""
 "Nurodykite metus, mėnesį ir dieną, \n"
 " kada baigsis abonento galiojimas"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Užpildykite visus slaptažodžio laiko laukelius\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Jūs negalite pašalinti vartotojo '%s' iš jo pirminės grupės"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Pradinis:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Vartotojo duomenys"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Įgalinti ribotą abonento galiojimo laiką"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Abonentas galioja iki (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Užrakinti vartotojo abonentą"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Abonento informacija"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Paskutinis vartotojo pakeistas slaptažodis čia: "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Įgalinti ribotą slaptažodžio galiojimo laiką"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Po kiek dienų leidžiami pakeitimai:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Po kiek dienų reikalaujama pakeitimų:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Prieš kiek dienų įspėjama iki pakeitimo:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Po keik dienų abonentas nebegalios:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Slaptažodžio informacija"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Parinkite grupę, kurios nariu bus vartotojas:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Grupės duomenys"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Išrinkite vartotojus šiai grupei:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Grupės vartoptojai"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Tvarkyti grupes / vartotojus"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Įvyko klaida:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Užverti"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Autorių Teisės (C) %s pagal Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Vartotojų valdymas"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "_: Translator(s) name(s) & email(s)\n"
 "Moo\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Vardo laukelis yra tuščias, įrašykite vardą"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 "Vardas turi būti sudarytas iš mažųjų lotyniškų raidžių, skaičių, `-' ir `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Vardas per ilgas"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Klaida"
@@ -680,72 +692,72 @@ msgstr ""
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Klaida sukuriant `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Pašto sankaupos sukūrimo klaida: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "nežinoma klaida"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr ""
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Pašto sankaupos ištrynimo klaida: %s\n"
diff --git a/po/ltg.po b/po/ltg.po
index 750f1ee..e05c49c 100644
--- a/po/ltg.po
+++ b/po/ltg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2007-09-27 21:52+0200\n"
 "Last-Translator: Māris Laureckis <marisl@e-no.lv>\n"
 "Language-Team: Latgalian <marisl@e-no.lv>\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Īsaluodej lītuotuoji i grupys... Lyudzu pagaidit"
@@ -127,7 +127,7 @@ msgstr "Pīlītuot filtru"
 msgid "Users"
 msgstr "Lītuotuoji"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Grupys"
@@ -148,7 +148,7 @@ msgstr "Lītuotuojvuords"
 msgid "User ID"
 msgstr "Lītuotuoja ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Primaruo grupa"
@@ -208,7 +208,7 @@ msgstr "Davīnuot grupu"
 msgid "Add a group to the system"
 msgstr "Davīnuot grupu sistemai"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Redigēt"
@@ -218,7 +218,7 @@ msgstr "Redigēt"
 msgid "Edit selected row"
 msgstr "Redigēt izvālātū ryndu"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Dzēst"
@@ -238,57 +238,57 @@ msgstr "Atjaunuot"
 msgid "Refresh the list"
 msgstr "Atjaunuot sarokstu"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Blokeits"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Nūvacuojs"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Uzklikškinojit iz ikonys, lai tū nūmaineitu"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Izveiduot jaunu lītuotuoju"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Izveiduot sātys katalogu"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Sātys katalogs:"
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Izveiduot lītuotuojam privātu grupu"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Manuali nūruodeit lītuotuoja ID"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Itaids lītuotuojs jau eksistej, izavielejit cytu lītuotuojvuordu"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Parolis nasakreit"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -297,12 +297,12 @@ msgstr ""
 "Itei parole ir puoruok vīnkuorša. \n"
 "Lobom parolem juobyun vairuok kai 6 simbolim"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Lītuotuoja Uid ir < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -313,27 +313,39 @@ msgstr ""
 "Voi teišom jius gribit tū dareit?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Pīvīnoj %s grupai 'users'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Teik radeita jauna grupa: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Teik davīnuots lītuotuojs: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Sātys katalogs:"
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Migrācejis paleigs"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -342,64 +354,64 @@ msgstr ""
 "Voi jius gribit palaist migrācejis paleigu, lai importēt Windows dokumentus "
 "i īstatiejumus jiusu Maņdryva Linuks disribucejā?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Atceļt"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Labi"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID:"
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Izavielejit grupu"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Davīnuot asūšai grupai"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Davīnuot grupai 'users'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Grupa ar itaidu nūsaukumu jau eksistej. Kū jius gribit dareit?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Izveiduot jaunu grupu"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Manuali nūruodeit grupys ID"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Itaida grupa jau eksistej, izavielejit cytu grupys nūsaukumu"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "Grupys Gid ir < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -410,22 +422,22 @@ msgstr ""
 "Voi tīšom gribit tū dareit?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Teik davīnuota grupa: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID:"
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Dzēst failus voi nā?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -434,27 +446,27 @@ msgstr ""
 "Dziešūt lītuotuoju %s\n"
 " tiks veiktys ari šaidys darbeibys\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Dzēst sātys katalogu: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Izdzēst postkasti: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Teik dzāsts lītuotuojs: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Voi teišom gribit dzēst grupu %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -463,47 +475,47 @@ msgstr ""
 "%s ir lītuotuoja %s primaruo grupa\n"
 " Vyspyrms izdziesit lītuotuoju"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Teik nūdzāsta grupa: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Pylns vuords:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Slāgvuords:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Parole:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Apstyprynuot paroli:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Dasasliegšonuos čaula:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Grupys nūsaukums:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Izavielejit vysmoz vīnu grupu lītuotuojam"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -512,159 +524,159 @@ msgstr ""
 "Nūruodit godu, mienesi i dīnu \n"
 " konta nūvacuošonai"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Lyudzu aizpiļdit vysus laukumus deļ parolis vacuma\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Jius navarit izdzēst lītuotuoju '%s' nu juo primaruos grupys"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Sāta:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Lītuotuoja dati"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Īslēgt konta nūvacuošonu"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Konts nūvacoj (GGGG-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Blokēt lītuotuoja kontu"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Konta informaceja"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Lītuotuojs pādejū reizi mainēja paroli:"
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Īslēgt parolis nūvacuošonu"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Pyrms cik dīnom teik atļauta nūmaiņa:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Pyrms cik dīnom teik pīpraseita nūmaiņa:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Pyrms cik dīnom teik breidynuots par nūmaini:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dīnu skaits da konta atsliegšonai:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Parolis informaceja"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Izavielejit grupys, kurom pīderēs lītuotuojs:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Grupys dati"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Izavielejit lītuotuojus, kū davīnuot itai grupai:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Grupys lītuotuoji"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Redigēt Grupys / Lītuotuoji"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Atkluota kliuda"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Aizvērt"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Autortīseibys (C) %s Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, fuzzy, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Autortīseibys (C) %s Mandriva"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Lītuotuoju Puorvaļdeiba"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Maņdryva Linuks"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Māris Laureckis <marisl@e-no.lv>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Vuorda lauks ir tukšs, lyudzu īvodit vuordu"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Vuordā var byut tikai mozī latiņu alfabeta burti, cipari, '-' i '_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Vuords ir puoruok garš"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Kliuda"
@@ -678,73 +690,73 @@ msgstr "Maņdryva Linuks Lītuotuoju Puorvaļdeibys reiks"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, fuzzy, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Kliuda izveidojūt posta spūli (buferi).\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Kliuda izveidojūt `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Kliuda izveidojūt posta spūli (buferi): %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, fuzzy, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Kliuda izveidojūt posta spūli (buferi).\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "nazynoma kliuda"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 #, fuzzy
 msgid "Group creation failed.\n"
 msgstr "Kliuda izveidojūt posta spūli (buferi).\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Kliuda dziešūt posta spūli (buferi): %s\n"
diff --git a/po/lv.po b/po/lv.po
index e59bef6..8a66722 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2005-11-09 16:59+0200\n"
 "Last-Translator: Viesturs Lacis <viescha@gmail.com>\n"
 "Language-Team: Latvian <ll10nt@listes.murds.lv>\n"
@@ -21,12 +21,12 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Ielādēju lietotājus un grupas... Lūdzu, uzgaidiet"
@@ -131,7 +131,7 @@ msgstr "Noteikt filtru"
 msgid "Users"
 msgstr "Lietotāji"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Grupas"
@@ -152,7 +152,7 @@ msgstr "Lietotājvārds"
 msgid "User ID"
 msgstr "Lietotāja ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Primārā grupa"
@@ -212,7 +212,7 @@ msgstr "Pievienot grupu"
 msgid "Add a group to the system"
 msgstr "Pievienot sistēmai grupu"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Rediģēt"
@@ -222,7 +222,7 @@ msgstr "Rediģēt"
 msgid "Edit selected row"
 msgstr "Rediģēt izvēlēto rindu"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Dzēst"
@@ -242,57 +242,57 @@ msgstr "Atjaunot"
 msgid "Refresh the list"
 msgstr "Atjaunot sarakstu"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Bloķēts"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Novecojis"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Uzklikšķiniet uz ikonas, lai to nomainītu"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Izveidot jaunu lietotāju"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Izveidot sākumkatalogu"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Sākumkatalogs:"
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Izveidot lietotājam privātu grupu"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Manuāli norādīt lietotāja ID"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Šāds lietotājs jau eksistē, izvēlieties citu lietotājvārdu"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Paroles nesakrīt"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -301,12 +301,12 @@ msgstr ""
 "Šī parole ir pārāk vienkārša. \n"
 "Labā parolē jābūt vairāk nekā 6 simboliem"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Lietotāja Uid < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -317,91 +317,103 @@ msgstr ""
 "Vai tiešām jūs vēlaties to darīt?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Pievienoju %s grupai 'users'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Izveidoju jaunu grupu: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Pievienoju lietotāju: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Sākumkatalogs:"
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Atsaukt"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Labi"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID:"
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Izvēlieties grupu"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Pievienot eksistējošai grupai"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Pievienot grupai 'users'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Grupa ar šādu nosaukumu jau eksistē. Ko jūs vēlaties darīt?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Izveidot Jaunu Grupu"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Manuāli norādīt grupas ID"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Šāda grupa jau eksistē, izvēlieties citu grupas nosaukumu"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "Grupas Gid ir < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -412,22 +424,22 @@ msgstr ""
 "Vai tiešām vēlaties to darīt?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Pievienoju grupu: %s"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID:"
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Dzēst failus vai nē?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -436,27 +448,27 @@ msgstr ""
 "Dzēšot lietotāju %s\n"
 "tiks veiktas arī šādas darbības\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Dzēst sākumkatalogu: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Dzēst pastkasti: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Novācu lietotāju: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Vai tiešām vēlaties dzēst grupu %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -465,47 +477,47 @@ msgstr ""
 "%s ir lietotāja %s primārā grupa\n"
 "Vispirms izdzēsiet lietotāju"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Novācu grupu: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Pilns vārds:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Vārds:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Parole:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Apstiprināt paroli:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Čaula:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Grupas nosaukums:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Lūdzu, izvēlieties vismaz vienu grupu lietotājam"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -514,159 +526,159 @@ msgstr ""
 "Lūdzu norādiet gadu, mēnesi un dienu\n"
 "konta novecošanai"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Lūdzu, norādiet visus laukus paroles novecošanai\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Jūs nevarat izslēgt lietotāju '%s' no viņa primārās grupas"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Sākums:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Lietotāja dati"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Atļaut konta novecošanu"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Konts noveco (GGGG-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Bloķēt lietotāja kontu"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Konta informācija"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Lietotājs pēdējo reizi mainīja paroli:"
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Atļaut paroles novecošanu"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dienas, līdz tiek atļauta nomaiņa:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Dienas līdz nomaiņas pieprasīšanai:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dienas, cik brīdināt pirms nomaiņas:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dienas, pirms konts kļūst neaktīvs:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Paroles informācija"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Izvēlieties grupas, kurām piederēs lietotājs:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Grupas dati"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Izvēlieties lietotājus, ko pievienot šai grupai:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Grupas lietotāji"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Rediģēt grupas / lietotājus"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Atklāta kļūda"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Aizvērt"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, fuzzy, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Autortiesības © 2003 Mandriva."
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, fuzzy, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Autortiesības © 2003 Mandriva."
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Lietotāju pārvaldība"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Vārda lauks ir tukšs, lūdzu ievadiet vārdu"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Vārdā var būt tikai mazie latīņu alfabēta burti, cipari,`-' un `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Vārds ir pārāk garš"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Kļūda"
@@ -680,73 +692,73 @@ msgstr "Mageia Lietotāju Pārvaldības Rīks"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, fuzzy, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Kļūda, izveidojot pasta buferi.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Kļūda, izveidojot `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Kļūda, izveidojot pasta buferi: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, fuzzy, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Kļūda, izveidojot pasta buferi.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "nezināma kļūda"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 #, fuzzy
 msgid "Group creation failed.\n"
 msgstr "Kļūda, izveidojot pasta buferi.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Kļūda, dzēšot pasta buferi,: %s\n"
diff --git a/po/mk.po b/po/mk.po
index b2b47d0..c2e0c47 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2004-08-11 16:38+0200\n"
 "Last-Translator: Зоран Димовски <decata@mt.net.mk>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -22,12 +22,12 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms: nplurals=2; plural= n==1 || n%10==1 ? 0 : 1\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Зе вчитуваат Корисниците и Групите... Ве молиме почекајте"
@@ -132,7 +132,7 @@ msgstr "Примени филтер"
 msgid "Users"
 msgstr "Корисници"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Групи"
@@ -153,7 +153,7 @@ msgstr "Корисничко име"
 msgid "User ID"
 msgstr "Кориснички ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Основна група"
@@ -213,7 +213,7 @@ msgstr "Додади група"
 msgid "Add a group to the system"
 msgstr "Додади група на системот"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Уреди"
@@ -223,7 +223,7 @@ msgstr "Уреди"
 msgid "Edit selected row"
 msgstr "Уреди го избраниот ред"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Отстрани"
@@ -243,57 +243,57 @@ msgstr "Освежи"
 msgid "Refresh the list"
 msgstr "Освежи ја листата"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Заклучено"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Изминато"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Притиснете на иконата за да ја смените"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Создади нов корисник"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Создади домашен директориум"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Домашен директориум: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Созадади приватна група за корисникот"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Рачно специфицирајте кориснички ID"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Корисникот веќе постои, ве молиме изберете друго корисничко име"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Лозинките не се совпаѓаат"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -302,12 +302,12 @@ msgstr ""
 "Оваа лозинка е премногу едноставна. \n"
 " Добрите лозинки треба да се повеќе од 6 карактери"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Корисничкиот Uid е помал од 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -318,91 +318,103 @@ msgstr ""
 "Дали сигурно сакате да го сторите ова?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Сместувам %s во 'корисничка' група"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Создавам нова група: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Додавам корисник: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Домашен директориум: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Откажи"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Во ред"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Избери група"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Додади на постоечката група"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Додади на 'корисничката' група"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Веќе постои група со ова име. Што сакате да направите?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Создади нова група"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Рачно специфицирај ја групната ID"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Групата веќе постои, ве молиме изберете друго име за групата"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " Групното Gid е помало од 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -413,22 +425,22 @@ msgstr ""
 " Дали сигурно сакате да го сторите ова?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Додавам група: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Дали да се избришат датотеките?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -437,27 +449,27 @@ msgstr ""
 "Отстранувам корисник %s\n"
 " Истотака, изврши ги следниве акции\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Избриши го домашниот директориум: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Избриши го поштенското сандаче >/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Отстранувам корисник: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Дали навистина сакате да ја избришете групата %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -466,47 +478,47 @@ msgstr ""
 "%s е основна група за корисникот %s\n"
 " Најпрво отстранете го корисникот"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Ја отстранувам групата: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Цело име:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Логин:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Потврди ја лозинката:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Школка за логирање:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Име на групата:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Ве молиме изберете најмалку една група за корисникот"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -515,159 +527,159 @@ msgstr ""
 "Ве молиме специфицирајте Година, месец и ден \n"
 " за истекување на сметката "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Ве молиме повторно пополнете ги сите полина во лозинката\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Не можете да го отстраните корисникот '%s' од неговата основна група"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Дома:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Кориснички податоци"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Овозможи истекување на сметката"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Сметката истекува (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Заклучи ја корисничката сметка"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Информации за сметката"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Корисникот последен пат ја сменил лозинката на : "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Овозможи истекување на лозинката"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Денови пред дозвола за изменување :"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Денови пред потреба за измена :"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Предупредувачки денови пред измена :"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Денови пред деактивирање на сметката :"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Информации за лозинката"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Изберете на кои групи корисникот ќе биде член:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Податоци за групата"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Изберете ѓи корисниците кои ќе се приклучат на групата:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Корисници на групата"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Уреди Групи / Корисници"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Се случи грешка"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Затвори"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Авторски права (C) %s од „Mandriva“"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, fuzzy, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Авторски права (C) %s од „Mandriva“"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Раководење со корисници"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Зоран Димовски - zoki.dimovski@gmail.com\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Полето за име е празно. Ве молиме внесете име"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Името мора да содржи само мали латински букви, бројки, `-' и `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Името е предолго"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Грешка"
@@ -681,73 +693,73 @@ msgstr "Mageia Алатка за раководење со корисници"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, fuzzy, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Грешка при содавање spool на поштата.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Грешка при создавање `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Грешка при содавање spool на поштата: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, fuzzy, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Грешка при содавање spool на поштата.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "непозната грешка"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 #, fuzzy
 msgid "Group creation failed.\n"
 msgstr "Грешка при содавање spool на поштата.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Грешка при бришење на spool на поштата: %s\n"
diff --git a/po/mn.po b/po/mn.po
index 840e384..40e5c2e 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2003-12-23 11:34+0100\n"
 "Last-Translator: Sanlig Badral <badral@openmn.org>\n"
 "Language-Team: Mongolian <openmn-linux@lists.sf.net>\n"
@@ -20,12 +20,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Хэрэглэгчийн драке"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr ""
@@ -130,7 +130,7 @@ msgstr ""
 msgid "Users"
 msgstr "Хэрэглэгчид"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Бүлгүүд"
@@ -151,7 +151,7 @@ msgstr "Хэрэглэгчийн нэр"
 msgid "User ID"
 msgstr "Хэрэглэгчийн ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr ""
@@ -211,7 +211,7 @@ msgstr "Бүлэг нэмэх"
 msgid "Add a group to the system"
 msgstr "Шинэ бүлэг нэмэх"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Засах"
@@ -221,7 +221,7 @@ msgstr "Засах"
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Устгах"
@@ -241,69 +241,69 @@ msgstr "Сэргээх"
 msgid "Refresh the list"
 msgstr "Хэрэглэгчдийн жагсаалт"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Түгжээтэй санах ой"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr ""
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Гэр лавлах үүсгэх"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Гэр лавлах: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, fuzzy, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Энэ нэр хэдийн системд орсон байна"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Нууц үгс ижил биш байна"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr ""
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -311,91 +311,103 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr ""
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, fuzzy, c-format
 msgid "Creating new group: %s"
 msgstr "Бүлгүүдийг харах"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, fuzzy, c-format
 msgid "Adding user: %s"
 msgstr "Хэрэглэгч нэмэх"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Гэр лавлах: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Хүчингүй"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ок"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, fuzzy, c-format
 msgid "Choose group"
 msgstr "Бүлгүүдийг харах"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, fuzzy, c-format
 msgid "Create New Group"
 msgstr "Үндсэн бүлэг"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr ""
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -403,255 +415,255 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, fuzzy, c-format
 msgid "Adding group: %s "
 msgstr "Бүлэг нэмэх"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr ""
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
 " Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, fuzzy, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Ldap хавтас сонгох"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, fuzzy, c-format
 msgid "Removing user: %s"
 msgstr "Хэрэглэгч (дийг) устгах"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr ""
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, fuzzy, c-format
 msgid "Removing group: %s"
 msgstr "Бүлэг (үүд)-ийг устгах"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Бүтэн нэр:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Нэвтрэх нэр:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Нууц үг:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Нууц үгээ бататгах:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Нэвтрэх тушаалын мөр:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, fuzzy, c-format
 msgid "Group Name:"
 msgstr "Бүлэг:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr ""
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Эзний гэр:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, fuzzy, c-format
 msgid "User Data"
 msgstr "Хэрэглэгчдийн жагсаалт"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr ""
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr ""
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr ""
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr ""
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr ""
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, fuzzy, c-format
 msgid "Password Info"
 msgstr "Нууц үг"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, fuzzy, c-format
 msgid "Group Data"
 msgstr "Бүлгийн жагсаалт"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr ""
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, fuzzy, c-format
 msgid "Group Users"
 msgstr "Бүлгүүд"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, fuzzy, c-format
 msgid "Edit Groups / Users"
 msgstr "Хэрэглэгч (дийг) засах"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr ""
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Хаах"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, fuzzy, c-format
 msgid "Users Management"
 msgstr "Хэрэглэгчийн нэр"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Мандрива Линукс"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Алдаа"
@@ -664,73 +676,73 @@ msgstr ""
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, fuzzy, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "pixmap файлыг ачаалж байхад алдаа: %s"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, fuzzy, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "pixmap файлыг ачаалж байхад алдаа: %s"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, fuzzy, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "pixmap файлыг ачаалж байхад алдаа: %s"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "тодорхойгүй алдаа"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 #, fuzzy
 msgid "Group creation failed.\n"
 msgstr "pixmap файлыг ачаалж байхад алдаа: %s"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, fuzzy, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "pixmap файлыг ачаалж байхад алдаа: %s"
diff --git a/po/ms.po b/po/ms.po
index 0650bfc..9144a3c 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2008-09-16 23:09+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -23,12 +23,12 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=1;\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Memuatkan Pengguna dan Kumpulan... Sila tunggu"
@@ -133,7 +133,7 @@ msgstr "Terap tapisan"
 msgid "Users"
 msgstr "User"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Kumpulan"
@@ -154,7 +154,7 @@ msgstr "Nama Pengguna"
 msgid "User ID"
 msgstr "ID Pengguna"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Kumpulan Utama"
@@ -214,7 +214,7 @@ msgstr "Tambah kumpulan"
 msgid "Add a group to the system"
 msgstr "Tambah kumpulan kepada sistem"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Edit"
@@ -224,7 +224,7 @@ msgstr "Edit"
 msgid "Edit selected row"
 msgstr "Edit baris dipilih"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Hapus"
@@ -244,57 +244,57 @@ msgstr "Segarkan"
 msgid "Refresh the list"
 msgstr "Segarkan senarai"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Terkunci"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Tamat tempoh"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Klik pada ikon untuk mengubahnya"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Cipta user baru"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Cipta direktori rumah"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Direktori rumah: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Cipta kumpulan peribadi bagi pengguna"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Nyatakan ID pengguna secara manual"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Pengguna telah wujud, sila pilih Nama Pengguna lain"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Katalaluan tidak sama"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -303,12 +303,12 @@ msgstr ""
 "Katalaluan ini terlalu mudah. \n"
 " Katalaluan yang baik seharusnya > 6 aksara"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Uid pengguna adalah < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -319,27 +319,39 @@ msgstr ""
 " Anda pasti anda mahu melakukannya?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Meletakkan %s ke kumpulan 'users'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Mencipta kumpulan baru: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Menambah pengguna: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Direktori rumah: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Wizard pemindahan"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -348,64 +360,64 @@ msgstr ""
 "Adakah anda hendak melaksanakan wizard pemindahan untuk mengimport dokumen "
 "dan tetapan Windows dalam edaran Mageia anda?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Pilih kumpulan"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Tambah ke kumpulan yang ada"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Tambah ke kumpulan 'users'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Kumpulan dengan nama itu sudah wujud.  Adakah anda ingin melakukannya?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Cipta Kumpulan baru"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Nyatakan ID kumpulan secara manual"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Kumpulan telah wujud, sila pilih Nama Kumpulan lain"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " Gid kumpulan adalah < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -416,22 +428,22 @@ msgstr ""
 "  Adakah anda pasti anda hendak melakukannya?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Menambah kumpulan: %s"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Padam fail atau tidak?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -440,27 +452,27 @@ msgstr ""
 "Memadam pengguna %s\n"
 " Juga melaksanakan tindkan berikut\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Padam direktori rumah: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Padam Kotakmel: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Membuang pengguna: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Adakah anda pasti untuk memadam kumpulan %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -469,47 +481,47 @@ msgstr ""
 "%s adalah kumpulan utama untuk pengguna %s\n"
 " Buang pengguna dahulu"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Membuang kumpulan: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Nama Penuh:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Katalaluan:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Sahkan Katalaluan:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell Logmasuk:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Nama kumpulan:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Sila pilih sekurang-kurangnya satu kumpulan bagi pengguna"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -518,160 +530,160 @@ msgstr ""
 "Sila nyatakan Tahun, Bulan dan Hari \n"
 " untuk Tempoh Tamat Akaun"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Sila penuhkan semua medan dalam penuaan katalaluan\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Anda tidak boleh membuang pengguna '%s' dari kumpulan utamanya"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Rumah:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Data Pengguna"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Hidupkan peluputan akaun"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Akaun luput (TTTT-BB-HH):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Kunci Akaun Pengguna"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Maklumat Akaun"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Pengguna terakhir menukar katalaluan pada:"
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Hidupkan Peluputan Katalaluan"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Hari sebelum perubahan diizinkan:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Hari sebelum penukaran diperlukan:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Hari amaran sebelum tukar:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Hari sebelum akaun tidak aktif:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Maklumat Katalaluan"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Pilih kumpulan dimana pengguna akan menjadi ahli:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Data Kumpulan"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Pilih pengguna untuk menyertai kumpulan ini:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Kumpul Pengguna"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Sunting Kumpulan / Pengguna"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Ralat telah berlaku"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Tutup"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Hakcipta (C) %s oleh Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, fuzzy, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Hakcipta (C) %s oleh Mandriva"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Pengurusan Pengguna"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Medan nama kosong, sila nyatakan nama"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 "Nama mesti mengandungi hanya aksara latin hufuf kecil, nombor, `-' dan `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Nama terlalu panjang"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Ralat"
@@ -685,73 +697,73 @@ msgstr "Alatan Mengurus Pengguna Mageia"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, fuzzy, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Ralat mencipta gulungan mel.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Ralat mencipta `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Ralat mencipta gulungan mel: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, fuzzy, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Ralat mencipta gulungan mel.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "ralat tidak diketahui"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 #, fuzzy
 msgid "Group creation failed.\n"
 msgstr "Ralat mencipta gulungan mel.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Ralat memadam gulungan mel: %s\n"
diff --git a/po/mt.po b/po/mt.po
index c3e6e0a..6da2359 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2004-09-03 18:55+0200\n"
 "Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
 "Language-Team: Maltese <mt@li.org>\n"
@@ -22,12 +22,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Qed jittellgħu utenti u gruppi... stenna ftit"
@@ -132,7 +132,7 @@ msgstr "Applika filtru"
 msgid "Users"
 msgstr "Utenti"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Gruppi"
@@ -153,7 +153,7 @@ msgstr "Isem il-utent"
 msgid "User ID"
 msgstr "ID tal-utent"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Grupp ewlieni"
@@ -213,7 +213,7 @@ msgstr "Żid grupp"
 msgid "Add a group to the system"
 msgstr "Żid grupp mas-sistema"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Ibdel"
@@ -223,7 +223,7 @@ msgstr "Ibdel"
 msgid "Edit selected row"
 msgstr "Ibdel il-linja magħżula"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Ħassar"
@@ -243,57 +243,57 @@ msgstr "Erġa' tella'"
 msgid "Refresh the list"
 msgstr "Erġa' tella' l-lista"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Imsakkar"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Skadut"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Klikkja fuq l-ikona biex tibdilha"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Oħloq utent ġdid"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Oħloq direttorju personali"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Direttorju personali:"
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Oħloq grupp privat għall-utent"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Speċifika ID tal-utent manwalment"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Dan l-isem diġà jeżisti; jekk jogħġbok agħżel ieħor"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Passwords ma jaqblux"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -302,12 +302,12 @@ msgstr ""
 "Dan il-password sempliċi wisq.\n"
 "Passwords tajbin iridu jkunu twal >6 ittri."
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "ID tal-utent < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -318,91 +318,103 @@ msgstr ""
 "Żgur li trid tagħmel dan?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Qed jiġi miżjud %s mal-grupp \"users\""
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Qed jinħoloq grupp: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Qed jiġi miżjud utent: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Direttorju personali:"
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Ikkanċella"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Agħżel grupp"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Żid ma' grupp eżistenti"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Żid mal-grupp \"users\""
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Diġà jeżisti grupp b'dan l-isem. X'tixtieq tagħmel?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Oħloq grupp ġdid"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Speċifika l-ID tal-grupp manwalment"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Dan l-isem ta' grupp diġà jeżisti. Jekk jogħġbok agħżel ieħor."
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "ID tal-grupp < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -413,22 +425,22 @@ msgstr ""
 "Żgur li trid tagħmel dan?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Qed jiġi miżjud grupp: %s"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Trid tħassar il-fajls jew le?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -437,27 +449,27 @@ msgstr ""
 "Qed jitħassar utent %s\n"
 " Agħmel ukoll dan li ġej\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Ħassar id-direttorju personali: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Ħassar il-kaxxa tal-ittri: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Qed jitneħħa utent: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Żgur trid tneħħi l-grupp %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -466,47 +478,47 @@ msgstr ""
 "%s huwa l-grupp ewlieni tal-utent %s\n"
 " L-ewwel ħassar lill-utent"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Qed jitneħħa grupp: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Isem sħiħ:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Password:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Ikkonferma password:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell tal-login:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Isem il-grupp:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Agħżel ta' l-inqas grupp wieħed għall-utent"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -515,148 +527,148 @@ msgstr ""
 "Jekk jogħġbok speċifika s-sena, xahar u ġurnata\n"
 "meta jiskadi l-kont "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Jekk jogħġbok speċifika d-dettalji tal-iskadenza tal-password\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Ma tistax tneħħi l-utent \"%s\" mill-grupp ewlieni"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Direttorju personali:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Informazzjoni tal-utent"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Kont jiskadi"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Kont jiskadi (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Sakkar il-kont tal-utent"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Info. dwar Kont"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Il-utent l-aħħar li bidel il-password f':"
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Password tiskadi"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Ġranet qabel tħalli tibdil :"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Ġranet qabel jiġi mġiegħel tibdil :"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Ġranet ta' twissija qabel jiskadi :"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Ġranet qabel jiġi inattivat il-kont :"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Info. Password"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Agħżel il-gruppi li l-utent huwa membru tagħhom:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Info. grupp"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Agħżel liema utenti se jkunu membri tal-grupp :"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Utenti tal-grupp"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Editja gruppi u utenti"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Inqalgħet problema"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Agħlaq"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Maniġġjar tal-utenti"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Ramon Casha <ramon.casha@linux.org.mt>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "L-isem huwa vojt. Jekk jogħġbok ipprovdi isem"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
@@ -664,12 +676,12 @@ msgstr ""
 "L-isem jista' jinkludi biss ittri żgħar bl-alfabett Infliż, numri, \"-\" u "
 "\"_\""
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Isem twil wisq"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Problema"
@@ -683,73 +695,73 @@ msgstr "Għodda tal-Mageia għall-Immaniġġjar tal-Utenti"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, fuzzy, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Problema biex jinħoloq spool tal-imejl.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Problema biex jinħoloq \"%s\": %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Problema biex jinħoloq spool tal-imejl: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, fuzzy, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Problema biex jinħoloq spool tal-imejl.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "problema mhux magħrufa"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 #, fuzzy
 msgid "Group creation failed.\n"
 msgstr "Problema biex jinħoloq spool tal-imejl.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Problema biex jitħassar spool tal-imejl: %s\n"
diff --git a/po/nb.po b/po/nb.po
index 5b077dd..d472050 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2017-04-26 17:16+0000\n"
 "Last-Translator: Karl Morten Ramberg <karl.m.ramberg@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/MageiaLinux/mageia/"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Vent litt … Laster brukere og grupper"
@@ -127,7 +127,7 @@ msgstr "Legg til filter"
 msgid "Users"
 msgstr "Brukere"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Grupper"
@@ -148,7 +148,7 @@ msgstr "Brukernavn"
 msgid "User ID"
 msgstr "Bruker-ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Primærgruppe"
@@ -208,7 +208,7 @@ msgstr "Legg til gruppe"
 msgid "Add a group to the system"
 msgstr "Legg til en gruppe på systemet"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Rediger"
@@ -218,7 +218,7 @@ msgstr "Rediger"
 msgid "Edit selected row"
 msgstr "Rediger valgt rad"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Slett"
@@ -238,57 +238,57 @@ msgstr "Oppdater"
 msgid "Refresh the list"
 msgstr "Oppdater listen"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Stengt"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Utløpt"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Klikk på ikonet for å endre det"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Lag ny bruker"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Lag hjemmemappe"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Hjemmemappe: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Opprett en privat gruppe for brukeren"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Angi bruker-ID manuelt"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Brukeren finnes allerede, vennligst velg et annet brukernavn"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Passordene er ulike"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -297,12 +297,12 @@ msgstr ""
 "Passordet er for enkelt. \n"
 "Gode passord bør være lengre enn seks tegn"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "BrukerID er lavere enn 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -313,27 +313,39 @@ msgstr ""
 " Er du sikker på at du vil gjøre dette?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Legger til %s i gruppa «users»"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Oppretter ny gruppe: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Legger til bruker: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Hjemmemappe: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Migrasjonsveiviser"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -342,64 +354,64 @@ msgstr ""
 "Ønsker du å kjøre migrasjonsveiviseren for å importere dokumenter og oppsett "
 "fra Windows i Mageia?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Velg gruppe"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Legg til eksisterende gruppe"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Legg til i gruppa «users»"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "En gruppe med dette navnet finnes allerede. Hva vil du gjøre?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Lag ny gruppe"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Angi gruppe-ID manuelt"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Gruppene finnes allerede, vennligst velg et annet gruppenavn"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "GruppeID er lavere enn 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -410,22 +422,22 @@ msgstr ""
 " Er du sikker på at du vil dette?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Legger til gruppa: %s"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Slette filer?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -434,27 +446,27 @@ msgstr ""
 "Sletter bruker %s\n"
 " Utfør også følgende handlinger\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Slett hjemmemappa: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Slett e-postboks: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Fjerner brukeren: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Vil du virkelig slette gruppa %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -463,47 +475,47 @@ msgstr ""
 "%s er en primær gruppe for brukeren %s\n"
 " Fjern brukeren først"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Fjerner gruppa: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Fullt navn:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Brukernavn:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Bekreft passord:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Innloggingsskall:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Gruppenavn:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Vennligst velg minst en gruppe for brukeren"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -512,138 +524,138 @@ msgstr ""
 "Vennligst angi dato, måned og dag \n"
 " for kontoens utløpsdato "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Vennligst fyll inn alle feltene for passordelding\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Du kan ikke fjerne bruker «%s» fra den primære gruppa"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Hjem:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Brukerdata"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Slå på utløpsdato for konto"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Konto utløper (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Lås brukerkonto"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Kontoinfo"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Bruker skiftet passord den :"
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Slå på utløpsdato for passord"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dager før bytte er tillatt:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Dager før bytte kreves:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Antall dager med varsel før bytte:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dager før konto blir stengt:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Passordinfo"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Velg gruppene som brukeren skal være medlem av:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Gruppedata"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Velg brukere som skal være med i denne gruppa:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Gruppebrukere"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Rediger grupper/brukere"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Det oppstod en feil:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Lukk"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Alle rettigheter © %s Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Alle rettigheter © %s Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Håndtering av brukere"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
@@ -656,23 +668,23 @@ msgstr ""
 "Terje Bjerkelia <terje@bjerkelia.com>, 1999-2000.\n"
 "Andreas Bergstrøm <abergstr@halden.net>, 2000.\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Navnefeltet er tomt, vennligst oppgi et navn"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Navnet kan bare inneholde små bokstaver, numre, «-» og «_»"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Navnet er for langt"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Feil"
@@ -685,72 +697,72 @@ msgstr "Kjør Mageia Brukeradministrasjon"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr "Autentisering kreves for å kjøre Mageia Brukeradministrasjon"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Kunne ikke lage kontoen: «%s».\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Kan ikke hente UID-nummer"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Kan ikke hente verdi"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Feil ved opprettelse av «%s»: %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Kunne ikke lage e-postkø: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Brukeren kunne ikke endres: «%s».\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Brukeren kunne ikke slettes: «%s».\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Kunne ikke angi passord: «%s».\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "ukjent feil"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Kunne ikke lage gruppa.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Kunne ikke endre gruppa: «%s».\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Kunne ikke slette gruppa: «%s».\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Brukeren har ingen hjemmemappe.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Kunne ikke slette hjemmemappa: «%s».\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Feil ved sletting av e-postboks: %s\n"
diff --git a/po/nl.po b/po/nl.po
index ebc709d..3ea2a92 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2015-01-04 12:20+0100\n"
 "Last-Translator: Marja van Waes <marja@mageia.org>\n"
 "Language-Team: Nederlands <i18n-nl@ml.mageia.org>\n"
@@ -24,12 +24,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Laden van gebruikers en groepen... Even geduld"
@@ -134,7 +134,7 @@ msgstr "Filter toepassen"
 msgid "Users"
 msgstr "Gebruikers"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Groepen"
@@ -155,7 +155,7 @@ msgstr "Gebruikersnaam"
 msgid "User ID"
 msgstr "Gebruikers-ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Primaire groep"
@@ -221,7 +221,7 @@ msgstr ""
 msgid "Add a group to the system"
 msgstr "Groep toevoegen aan het systeem"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Bewerken"
@@ -231,7 +231,7 @@ msgstr "Bewerken"
 msgid "Edit selected row"
 msgstr "Geselecteerde rij bewerken"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Verwijderen"
@@ -251,57 +251,57 @@ msgstr "Verversen"
 msgid "Refresh the list"
 msgstr "De lijst verversen"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Afgesloten"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Verlopen"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Klik op het pictogram om het te veranderen"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Nieuwe gebruiker aanmaken"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Persoonlijke map aanmaken"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Persoonlijke map: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Privé-groep aanmaken voor de gebruiker"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Handmatig gebruikers-ID opgeven"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "De gebruiker bestaat al, kies een andere gebruikersnaam"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Wachtwoord komt niet overeen"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -310,12 +310,12 @@ msgstr ""
 "Dit wachtwoord is te eenvoudig. \n"
 "Een goed wachtwoord bevat tenminste 6 karakters"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Gebruikers UID is < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -326,27 +326,39 @@ msgstr ""
 " Weet u zeker dat u dit wilt doen?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Bezig met toevoegen %s aan de groep 'users'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Bezig met aanmaken nieuwe groep: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Bezig met toevoegen gebruiker: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Persoonlijke map: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Migratiewizard"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -355,64 +367,64 @@ msgstr ""
 "Wilt u de migratiewizard uitvoeren om uw Windows-documenten en -instellingen "
 "te importeren in uw Mageia-installatie?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Kies een groep"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Toevoegen aan de bestaande groep"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Toevoegen aan de groep 'users'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Een groep met deze naam bestaat al. Wat wilt u nu doen?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Nieuwe groep aanmaken"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Handmatig groeps-ID opgeven"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "De groep bestaat al, kies een andere groepsnaam"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " De groep GID is < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -423,22 +435,22 @@ msgstr ""
 " Weet u zeker dat u dit wilt doen?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Bezig met toevoegen groep: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Bestanden verwijderen?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -447,27 +459,27 @@ msgstr ""
 "Verwijderen van gebruiker %s\n"
 " Voer ook de volgende acties uit\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Persoonlijke map verwijderen: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Verwijder Mailbox :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Bezig met verwijderen gebruiker: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Weet u zeker dat u de groep %s wilt verwijderen?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -476,47 +488,47 @@ msgstr ""
 "%s is een primaire groep voor gebruiker %s\n"
 " Verwijder eerst de gebruiker"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Bezig met verwijderen groep: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Volledige naam:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Aanmeldnaam:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Bevestig wachtwoord:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Aanmeldshell:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Groepsnaam:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Selecteer tenminste één groep voor de gebruiker"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -525,138 +537,138 @@ msgstr ""
 "Geef een jaar, maand en dag op \n"
 " waarop de account verloopt "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Vul alle velden in voor wachtwoord-verloop\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "U kunt gebruiker ‘%s’ niet verwijderen uit zijn primaire groep"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Persoonlijke map:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Gebruikersgegevens"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Verlopen van account inschakelen"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Account verloopt op (JJJJ-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Gebruikersaccount op slot zetten"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Account-informatie"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "De gebruiker heeft het wachtwoord voor het laatst veranderd op: "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Verlopen van wachtwoord inschakelen"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dagen voor verandering wordt toegestaan: "
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Dagen voor verandering noodzakelijk is:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dagen voordat veranderwaarschuwing wordt gegeven:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dagen voordat de account wordt gedeactiveerd:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Wachtwoord-informatie"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Selecteer de groepen waar de gebruiker lid van moet zijn:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Groepsgegevens"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Selecteer de gebruikers die lid moeten zijn van deze groep:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Gebruikers groeperen"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Groepen / gebruikers bewerken"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Er is een fout opgetreden:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Sluiten"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright © %s door Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Copyright © %s door Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Gebruikersbeheer"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
@@ -668,24 +680,24 @@ msgstr ""
 "Remco Rijnders <remco@webconquest.com>\n"
 "Marja van Waes <marja@mageia.org>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Naam-veld is leeg, geef een naam op"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 "De naam mag alleen bestaan uit kleine Latijnse letters, cijfers, `-' en `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "De naam is te lang"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Fout"
@@ -698,72 +710,72 @@ msgstr "Start Mageia's Gebruikersbeheer"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr "Authenticatie is nodig om Mageia's Gebruikersbeheer te starten"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "De account kon niet aangemaakt worden: '%s'.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Kan het UID-nummer niet verkrijgen"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Waarde kon niet opgehaald worden"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Fout bij aanmaken `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Fout bij het aanmaken van de e-mail-wachtrij: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "De gebruiker kon niet aangepast worden: '%s'.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Gebruiker kon niet verwijderd worden: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Het wachtwoord kon niet ingesteld worden: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "Onbekende fout"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "De groep kon niet aangemaakt worden.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "De groep kon niet aangepast worden: '%s'.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "De groep kon niet verwijderd worden: '%s'.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Geen thuismap voor de gebruiker.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "De thuismap kon niet verwijderd worden: '%s'.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Fout bij het verwijderen van de e-mail-wachtrij: %s\n"
diff --git a/po/nn.po b/po/nn.po
index 8926ecd..3e6980a 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2010-02-07 16:36+0100\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Lastar brukarar og grupper … Vent litt"
@@ -126,7 +126,7 @@ msgstr "Bruk filter"
 msgid "Users"
 msgstr "Brukarar"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Grupper"
@@ -147,7 +147,7 @@ msgstr "Brukarnamn"
 msgid "User ID"
 msgstr "Brukar-ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Hovudgruppe"
@@ -207,7 +207,7 @@ msgstr "Legg til gruppe"
 msgid "Add a group to the system"
 msgstr "Legg ei gruppe til systemet."
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Rediger"
@@ -217,7 +217,7 @@ msgstr "Rediger"
 msgid "Edit selected row"
 msgstr "Rediger merkt rad."
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Slett"
@@ -237,57 +237,57 @@ msgstr "Oppdater"
 msgid "Refresh the list"
 msgstr "Oppdater lista."
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Låst"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Utgått"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Trykk på ikonet for å endra det"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Lag ny brukar"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Lag heimemappe"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Heimemappe: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Lag ei privat gruppe for brukaren"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Vel gruppe-ID manuelt"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Brukaren finst alt. Vel eit anna brukarnamn."
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Passord er ikkje like"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -296,12 +296,12 @@ msgstr ""
 "Passordet er for enkelt.\n"
 "Eit godt passord på vera på minst 6 teikn."
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Brukar-ID-en er under 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -312,27 +312,39 @@ msgstr ""
 " Er du sikker på at du likevel vil gjera det?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Legg «%s» i «users»-gruppa"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Oppretter ny gruppe: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Legg til brukar: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Heimemappe: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Dataoverføringsvegvisar"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -341,64 +353,64 @@ msgstr ""
 "Ønskjer du å køyra dataoverføringsvegvisaren, slik at du kan henta inn "
 "Windows-dokumenta og -innstillingane dine til Mageia?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Vel gruppe"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Legg til gammal gruppe"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Legg til «users»-gruppa"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Det finst alt ei gruppe med dette namnet. Kva ønskjer du å gjera?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Lag ny gruppe"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Vel gruppe-ID manuelt"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Gruppa finst alt. Vel eit anna gruppenamn."
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " Gruppe-ID-en er under 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -409,22 +421,22 @@ msgstr ""
 " Er du sikker på at du likevel vil gjera det?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Legg til gruppe: %s"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Vil du sletta filene?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -433,27 +445,27 @@ msgstr ""
 "Fjernar brukaren «%s»\n"
 " Utfør òg følgjande handlingar\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Slett heimemappe: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Slett e-postboks: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Fjern brukar: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Er du sikker på at du vil sletta gruppa «%s»?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -462,207 +474,207 @@ msgstr ""
 "«%s» er ei hovudgruppe fro brukaren «%s».\n"
 " Fjern frukaren først."
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Fjernar gruppa: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Fullt namn:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Brukarnamn:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Stadfest passord:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Innloggingsskal:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Gruppenamn:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Du må velja minst éi gruppe for brukaren"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr "Vel år, månad og dag for kontoutløp."
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Fyll ut alle felta for passordutløp.\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Du kan ikkje fjerna brukaren «%s» frå hovudgruppa hans/hennar."
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Heime:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Brukardata"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Bruk utløpsdato for konto"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Kontoen går ut (ÅÅÅÅ-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Lås brukarkonto"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Kontoinformasjon"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Brukaren bytte seinast passord den: "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Bruk utløpsdato for passord"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dagar før byte er lov:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Dagar før byte er påkravd:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dagar med varsel før endring:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dagar før kontoen vert inaktiv:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Passordinformasjon"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Vel gruppene som brukaren skal vera medlem av:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Gruppedata"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Vel brukaren som skal vera med i gruppa:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Gruppebrukarar"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Rediger grupper/brukarar"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Det oppstod ein feil:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Lukk"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright © %s Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, fuzzy, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Copyright © %s Mandriva"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Brukaradministrering"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Karl Ove Hufthammer <karl@huftis.org>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Namnefeltet er tomt. Skriv inn namnet på brukaren."
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 "Brukarnamnet kan berre innehelda små bokstavar, tal, samt teikna «-» og «_»."
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Namnet er for langt."
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Feil"
@@ -676,72 +688,72 @@ msgstr "Brukaradministrering for Mageia"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Klarte ikkje leggja til konto: «%s».\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Klarte ikkje henta UID"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Klarte ikkje henta verdi"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Feil ved oppretting av «%s»: %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Feil ved oppretting av e-postkø: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Klarte ikkje endra brukaren: «%s».\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Klarte ikkje sletta brukaren: «%s».\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Klarte ikkje velja passord: «%s».\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "Ukjend feil"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Klarte ikkje laga ny gruppe.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Klarte ikkje endra gruppe: «%s».\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Klarte ikkje sletta gruppe: «%s».\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Brukaren manglar heimemappe.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Klarte ikkje sletta heimemappa: «%s».\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Feil ved sletting av e-postkø: %s\n"
diff --git a/po/pa_IN.po b/po/pa_IN.po
index b331f98..4301a17 100644
--- a/po/pa_IN.po
+++ b/po/pa_IN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2005-03-25 13:55+0530\n"
 "Last-Translator: Kanwaljeet Singh Brar <kanwaljeetbrar@yahoo.co.in>\n"
 "Language-Team: Panjabi <fedora-trans-pa@redhat.com>\n"
@@ -18,12 +18,12 @@ msgstr ""
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "ਉਪਭੋਗੀ ਤੇ ਗਰੁੱਪ ਲੋਡ ਕੀਤੇ ਜਾਦੇ ਹਨ... ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ"
@@ -128,7 +128,7 @@ msgstr "ਫਿਲਟਰ ਲਾਗੂ ਕਰੋ"
 msgid "Users"
 msgstr "ਉਪਭੋਗੀ"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "ਸਮੂਹ"
@@ -149,7 +149,7 @@ msgstr "ਉਪਭੋਗੀ ਨਾਂ"
 msgid "User ID"
 msgstr "ਉਪਭੋਗੀ ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "ਮੁੱਢਲਾ ਗਰੁੱਪ"
@@ -209,7 +209,7 @@ msgstr "ਗਰੁੱਪ ਸ਼ਾਮਲ"
 msgid "Add a group to the system"
 msgstr "ਸਿਸਟਮ ਤੇ ਗਰੁੱਪ ਸ਼ਾਮਲ ਕਰੋ"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "ਸੋਧ"
@@ -219,7 +219,7 @@ msgstr "ਸੋਧ"
 msgid "Edit selected row"
 msgstr "ਚੁਣੀ ਕਤਾਰ ਵਿੱਚ ਸੋਧ"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "ਹਟਾਓ"
@@ -239,57 +239,57 @@ msgstr "ਤਾਜ਼ਾ"
 msgid "Refresh the list"
 msgstr "ਸੂਚੀ ਤਾਜ਼ਾ ਕਰੋ"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "ਤਾਲਾਬੰਦ"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "ਮਿਆਦ ਖਤਮ"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "ਆਈਕਾਨ ਨੂੰ ਤਬਦੀਲ ਕਰਨ ਲਈ ਦਬਾਓ"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "ਨਵਾਂ ਉਪਭੋਗੀ ਬਣਾਓ"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "ਘਰ ਡਾਇਰੈਕਟਰੀ ਬਣਾਓ"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "ਘਰ ਡਾਇਰੈਕਟਰੀ: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "ਉਪਭੋਗੀ ਲਈ ਨਿੱਜੀ ਗਰੁੱਪ ਬਣਾਓ"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "ਉਪਭੋਗੀ ਲਈ ID ਖੁਦ ਦਿਓ"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "ਉਪਭੋਗੀ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਵੱਖਰਾ ਨਾਂ ਦਿਓ"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "ਗੁਪਤ-ਕੋਡ ਮੇਲ ਨਹੀ ਖਾ ਰਿਹਾ"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -298,12 +298,12 @@ msgstr ""
 "ਇਹ ਗੁਪਤ-ਕੋਡ ਬਹੁਤ ਸੌਖਾ ਹੈ।\n"
 " ਚੰਗ ਗੁਪਤ-ਕੋਡ > 6 ਅੱਖਰ ਤੋਂ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "ਉਪਭੋਗੀ Uid < 1000 ਹੈ"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -314,91 +314,103 @@ msgstr ""
 " ਕਿ ਤੁਸੀ ਇਹ ਕਰਨ ਲਈ ਸਹਿਮਤ ਹੋ?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "%s ਨੂੰ 'users' ਗਰੁੱਪ ਲਈ ਰੱਖਿਆ ਜਾਦਾ ਹੈ"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "ਨਵਾਂ ਗਰੁੱਪ ਬਣਾਇਆ ਜਾਦਾ ਹੈ: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "ਉਪਭੋਗੀ ਸ਼ਾਮਲ : %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "ਘਰ ਡਾਇਰੈਕਟਰੀ: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "ਰੱਦ ਕਰੋ"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "ਠੀਕ ਹੈ"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "ਗਰੁੱਪ ਚੁਣੋ"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "ਮੌਜੂਦਾ ਗਰੁੱਪ ਵਿੱਚ ਸ਼ਾਮਲ"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "'users' ਗਰੁੱਪ ਵਿੱਚ ਸ਼ਾਮਲ"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "ਸਮੂਹ ਨਾਂ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਤੁਸੀਂ ਕੀ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "ਨਵਾਂ ਗਰੁੱਪ ਬਣਾਓ"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "ਗਰੁੱਪ ID ਖੁਦ ਦਿਓ"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "ਗਰੁੱਪ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਵੱਖਰਾ ਨਾਂ ਚੁਣੋ"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " ਗਰੁੱਪ Gid < 1000 ਹੈ"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -409,22 +421,22 @@ msgstr ""
 " ਕੀ ਤੁਸੀਂ ਏਦਾਂ ਕਰਨ ਲਈ ਸਹਿਮਤ ਹੋ?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "ਗਰੁੱਪ ਸ਼ਾਮਲ : %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "ਫਾਇਲਾਂ ਹਟਾਉਣੀਆਂ ਹਨ ਜਾਂ ਨਹੀਂ?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -433,27 +445,27 @@ msgstr ""
 "ਉਪਭੋਗੀ %s ਹਟਾਉਣਾ\n"
 " ਹੇਠ ਦਿੱਤੀਆਂ ਕਾਰਵਾਈਆਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "ਘਰ ਡਾਇਰੈਕਟਰੀ ਹਟਾਓ :%s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "ਪੱਤਰ ਬਕਸਾ ਹਟਾਓ :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "ਉਪਭੋਗੀ ਹਟਾਉਣਾ: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "ਕੀ ਤੁਸੀਂ ਗਰੁੱਪ %s ਨੂੰ ਹਟਾਉਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰਦੇ ਹੋ"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -462,47 +474,47 @@ msgstr ""
 "%s ਉਪਭੋਗੀ %s ਦਾ ਮੁੱਢਲਾ ਗਰੁੱਪ ਹੈ\n"
 " ਪਹਿਲਾਂ ਉਪਭੋਗੀ ਨੂੰ ਹਟਾਓ"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "ਗਰੁੱਪ ਹਟਾਇਆ: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "ਪੂਰਾ ਨਾਂ:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "ਲਾਗਆਨ:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "ਗੁਪਤ-ਕੋਡ:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "ਗੁਪਤ-ਕੋਡ ਪ੍ਰਮਾਣਿਕਤਾ:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "ਲਾਗਿੰਨ ਸ਼ੈਲ:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "ਗਰੁੱਪ ਨਾਂ:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਪਭੋਗੀ ਲਈ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਗਰੁੱਪ ਚੁਣੋ"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -511,159 +523,159 @@ msgstr ""
 "ਕਿਰਪਾ ਕਰਕੇ ਖਾਤਾ ਮਿਆਦ, ਸਾਲ, ਮਹੀਨਾ ਅਤੇ ਦਿਨ\n"
 " ਦੇ ਅਨੁਸਾਰ ਦਿਓ"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਗੁਪਤ-ਕੋਡ ਉਮਰ ਵਿੱਚ ਸਭ ਖੇਤਰ ਭਰੋ\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "ਤੁਸੀਂ ਉਪਭੋਗੀ '%s' ਨੂੰ ਇਸ ਦੇ ਮੁੱਢਲੇ ਗਰੁੱਪ ਤੋਂ ਨਹੀਂ ਹਟਾ ਸਕਦੇ ਹੋ"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "ਘਰ:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "ਉਪਭੋਗੀ ਡਾਟਾ"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "ਖਾਤਾ ਮਿਆਦ ਚਾਲੂ"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "ਖਾਤਾ ਮਿਆਦ (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "ਉਪਭੋਗੀ ਖਾਤਾ ਤਾਲਾਬੰਦ"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "ਖਾਤਾ ਜਾਣਕਾਰੀ"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "ਉਪਭੋਗੀ ਨੇ ਆਖਰੀ ਵਾਰ ਗੁਪਤ-ਕੋਡ ਬਦਲਿਆ : "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "ਗੁਪਤ-ਕੋਡ ਮਿਆਦ ਯੋਗ"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "ਤਬਦੀਲੀ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਸਵੀਕਾਰ ਦਿਨਾਂ ਦੀ ਗਿਣਤੀ : "
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "ਤਬਦੀਲੀ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਲੋੜੀਦੇ ਦਿਨ :"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "ਤਬਦੀਲੀ ਤੋਂ ਪਹਿਲਾਂ ਚੇਤਾਵਨੀ ਦਿਨ :"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "ਖਾਤਾ ਬੰਦ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਦਿਨ :"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "ਗੁਪਤ-ਕੋਡ ਜਾਣਕਾਰੀ"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "ਗਰੁੱਪ ਚੁਣੋ, ਜਿਸ ਦਾ ਉਪਭੋਗੀ ਮੈਂਬਰ ਹੈ :"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "ਗਰੁੱਪ ਡਾਟਾ"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "ਇਸ ਗਰੁੱਪ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਉਪਭੋਗੀ ਚੁਣੋ :"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "ਗਰੁੱਪ ਉਪਭੋਗੀ"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "ਗਰੁੱਪ / ਉਪਭੋਗੀ ਸੋਧ"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "ਬੰਦ ਕਰੋ"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "ਉਪਭੋਗੀ ਪ੍ਰਬੰਧਕ"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "ਮੈਂਡਰਿਵ-ਆਨਲਾਈਨ"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "ਨਾਂ ਖੇਤਰ ਖਾਲੀ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਨਾਂ ਦਿਓ"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "ਨਾਂ ਵਿੱਚ ਛੋਟੇ ਅੰਗਰੇਜ਼ੀ ਅੱਖਰ, ਅੰਕ, `-' ਅਤੇ `_' ਹੀ ਹੋ ਸਕਦੇ ਹਨ"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "ਨਾਂ ਲੰਮਾ ਹੈ"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "ਗਲਤੀ"
@@ -677,73 +689,73 @@ msgstr "ਮੈਂਡਰਿਵ ਲੀਨਕਸ ਉਪਭੋਗੀ ਪ੍ਰਬੰ
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, fuzzy, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "ਪੱਤਰ ਸਪੂਲ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ।\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "`%s' ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ: %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "ਪੱਤਰ ਸਪੂਲ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ।: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, fuzzy, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "ਪੱਤਰ ਸਪੂਲ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ।\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "ਅਣਜਾਣੀ ਗਲਤੀ"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 #, fuzzy
 msgid "Group creation failed.\n"
 msgstr "ਪੱਤਰ ਸਪੂਲ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ।\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "ਪੱਤਰ ਸਪੂਲ ਹਟਾਉਣ ਦੌਰਾਨ ਗਲਤੀ: %s\n"
diff --git a/po/pl.po b/po/pl.po
index 1a90fea..1b071b0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2013-12-19 12:59+0100\n"
 "Last-Translator: Daniel Napora <napcok@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -25,12 +25,12 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Wczytywanie użytkowników i grup... proszę czekać"
@@ -135,7 +135,7 @@ msgstr "Zastosuj filtr"
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Grupy"
@@ -156,7 +156,7 @@ msgstr "Nazwa użytkownika"
 msgid "User ID"
 msgstr "ID użytkownika"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Podstawowa grupa"
@@ -219,7 +219,7 @@ msgstr "Dodaj grupę"
 msgid "Add a group to the system"
 msgstr "Dodaje grupę do systemu"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Edytuj"
@@ -229,7 +229,7 @@ msgstr "Edytuj"
 msgid "Edit selected row"
 msgstr "Modyfikuje wybrany wiersz"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Usuń"
@@ -249,57 +249,57 @@ msgstr "Odśwież"
 msgid "Refresh the list"
 msgstr "Odświeża listę"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Zablokowane"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Wygasło"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Kliknij na ikonę aby ją zmienić"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Utwórz nowego użytkownika"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Utwórz katalog domowy"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Katalog domowy: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Tworzy prywatną grupę dla użytkownika"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Określ ręcznie ID użytkownika"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Użytkownik już istnieje, wybierz inną nazwę użytkownika"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Hasła się nie zgadzają"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -308,12 +308,12 @@ msgstr ""
 "Hasło jest za proste.\n"
 " Dobre hasła powinny posiadać więcej niż 6 znaków"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "ID Użytkownika jest < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -324,27 +324,39 @@ msgstr ""
 " Czy na pewno chcesz to zrobić?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Wrzucanie użytkownika %s do grupy \"users\""
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Tworzenie nowej grupy: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Dodawanie użytkownika: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Katalog domowy: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Druid migracji"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -353,64 +365,64 @@ msgstr ""
 "Czy chcesz uruchomić druida migracji, aby zaimportować z systemu Windows "
 "dokumenty i ustawienia do systemu Mageia?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Wybierz grupę"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Dodaj do istniejącej grupy"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Dodaj do grupy \"users\""
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Grupa o tej nazwie już istnieje. Co chcesz uczynić?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Utwórz nową grupę"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Określ ręcznie ID grupy"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Grupa już istnieje, wybierz inną nazwę grupy"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " ID grupy jest < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -421,22 +433,22 @@ msgstr ""
 " Czy naprawdę chcesz to zrobić?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Dodawanie grupy: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Usunąć pliki czy nie?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -445,27 +457,27 @@ msgstr ""
 "Usuwanie użytkownika %s\n"
 " uruchamia także poniższe operacje\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Usuń katalog domowy: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Usuń skrzynkę pocztową :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Usuwanie użytkownika: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Czy na pewno chcesz usunąć grupę %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -474,47 +486,47 @@ msgstr ""
 "%s jest podstawową grupą dla użytkownika %s\n"
 " Usuń najpierw użytkownika"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Usuwanie grupy: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Pełna nazwa:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Użytkownik:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Hasło:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Potwierdź hasło:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Powłoka logowania:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Nazwa grupy:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Wybierz co najmniej jedną grupę dla użytkownika"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -523,159 +535,159 @@ msgstr ""
 "Podaj rok, miesiąc i dzień\n"
 " terminu ważności konta "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Wypełnij wszystkie pola związane z wiekiem hasła\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Nie można usunąć użytkownika \"%s\" z głównej grupy"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Katalog domowy:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Dane użytkownika"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Włączone wygasanie haseł"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Konto wygasa    (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Zablokuj konto użytkownika"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Informacje o koncie"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Użytkownik ostatnio zmieniał hasło : "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Włącz wygasanie hasła"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dni przed dozwoloną zmianą :"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Dni przed wymaganą zmianą :"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dni ostrzeżenia przed zmianą :"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dni przed wyłączeniem konta :"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Informacje o haśle"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Wybierz grupy, których użytkownik będzie członkiem:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Dane grupy"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Wybierz użytkownika dołączanego do grupy :"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Użytkownikcy grupowi"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Edycja grup / użytkowników"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Wystąpił błąd:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Zamknij"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Copyright (C) %s Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Zarządzanie użytkownikami"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "_: Translator(s) name(s) & email(s)\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Pole nazwy jest puste, podaj inną nazwę"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Nazwa musi zawierać tylko małe litery, liczby, \"-\" lub \"_\""
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Nazwa jest za długa"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Błąd"
@@ -688,72 +700,72 @@ msgstr "Uruchom Menadżer Użytkowników Mageia"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr "Menadżer Użytkowników Mageia - wymagane uwierzytelnianie"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Utworzenie konta nie powiodło się: '%s'.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Nie można pobrać numeru Uid"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Nie można pobrać wartości"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Błąd przy tworzeniu \"%s\": %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Błąd przy tworzeniu kolejki poczty: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Użytkownika nie można zmodyfikować: '%s'.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Użytkownika nie można usunąć: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Nie można ustawić hasła: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "nieznany błąd"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Utworzenie grupy nie powiodło się.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Grupy nie można zmodyfikować: '%s'.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Grupy nie można usunąć: '%s'.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Brak katalogu domowego dla użytkownika.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Katalogu domowego nie można usunąć: '%s'.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Błąd przy usuwaniu kolejki poczty: %s\n"
diff --git a/po/pt.po b/po/pt.po
index f18ef7f..e004f28 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2017-04-05 18:23+0000\n"
 "Last-Translator: Manuela Silva <manuela.silva@sky.com>\n"
 "Language-Team: Portuguese (http://www.transifex.com/MageiaLinux/mageia/"
@@ -22,12 +22,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "A carregar Utilizadores e Grupos... Por favor, aguarde"
@@ -132,7 +132,7 @@ msgstr "Aplicar filtro"
 msgid "Users"
 msgstr "Utilizadores"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Grupos"
@@ -153,7 +153,7 @@ msgstr "Nome de Utilizador"
 msgid "User ID"
 msgstr "ID de Utilizador"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Grupo Primário"
@@ -213,7 +213,7 @@ msgstr "Adicionar Grupo"
 msgid "Add a group to the system"
 msgstr "Adiciona um grupo ao sistema"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Editar"
@@ -223,7 +223,7 @@ msgstr "Editar"
 msgid "Edit selected row"
 msgstr "Edita a linha seleccionada"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Apagar"
@@ -243,57 +243,57 @@ msgstr "Refrescar"
 msgid "Refresh the list"
 msgstr "Refresca a lista"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Trancado"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Expirado"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Clique no ícone para o alterar"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Criar Novo Utilizador"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Criar Directório Pessoal"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Directório Pessoal: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Cria um grupo privado para o utilizador"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Indica manualmente o ID de utilizador"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Este utilizador já existe, por favor escolha outro Nome de Utilizador"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Senhas Diferentes"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -302,12 +302,12 @@ msgstr ""
 "Esta senha é demasiado simples. \n"
 "As boas senhas devem ter mais de 6 caracteres"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "O Uid de utilizador é < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -318,27 +318,39 @@ msgstr ""
 "Tem certeza que o deseja fazer?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "A colocar %s no grupo 'users'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "A criar novo grupo: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "A adicionar utilizador: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Directório Pessoal: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Assistente de migração"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -347,64 +359,64 @@ msgstr ""
 "Deseja correr o assistente de migração para importar documentos e "
 "configurações Windows para a sua distribuição Mageia?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Escolher grupo"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Adicionar ao grupo existente"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Adicionar ao grupo 'users'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Já existe um grupo com este nome. O que deseja fazer?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Criar Novo Grupo"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Indicar manualmente ID de grupo"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "O grupo já existe, por favor escolha outro Nome de Grupo"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " O Gid de Grupo é < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -415,22 +427,22 @@ msgstr ""
 "Tem certeza que o deseja criar?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "A adicionar o grupo: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Apagar ficheiros ou não?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -439,27 +451,27 @@ msgstr ""
 "A apagar utilizador %s\n"
 "Executar também as seguintes acções\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Apagar Directório Pessoal: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Apagar Caixa de Correio: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "A remover o utilizador: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Deseja realmente apagar o grupo %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -468,47 +480,47 @@ msgstr ""
 "%s é um grupo primário para o utilizador %s\n"
 "Remova o utilizador primeiro"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "A remover o grupo: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Nome Completo:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Nome de Utilizador:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Confirmar Senha:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Interpretador de Comandos:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Nome do Grupo:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Por favor seleccione pelo menos um grupo para o utilizador"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -517,159 +529,159 @@ msgstr ""
 "Por favor indique o Ano, Mês e Dia\n"
 "para a Expiração da Conta "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Por favor preencha todas os campos de duração da senha\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Não pode remover o utilizador '%s' do seu grupo primário"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Pasta Pessoal:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Dados do Utilizador"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Activar expiração da conta"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "A conta expira em (AAAA-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Trancar Conta de Utilizador"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Informações da Conta"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "O utilizador mudou a senha pela última vez em: "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Activar Expiração da Senha"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dias antes da mudança permitida:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Dias antes da mudança pedida:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dias de aviso antes da mudança:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dias antes da desactivação da conta:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Informação da Senha"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Seleccione os grupos de que o utilizador irá ser membro:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Dados do Grupo"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Seleccione os utilizadores a juntar a este grupo:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Utilizadores do Grupo"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Editar Grupos/Utilizadores"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Ocorreu um erro:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Fechar"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Direitos de Autor (C) %s Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Gestão de Utilizadores"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Zé <ze@mandriva.org>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "O campo do nome está vazio, por favor indique um nome"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "O nome deve conter apenas letras minúsculas, números, '-' e '_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "O nome é demasiado comprido"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Erro"
@@ -683,72 +695,72 @@ msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 "A autenticação é obrigatória para executar o Gestor de Utilizadores do Mageia"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Falha ao criar a conta: '%s'.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Não é possível obter o número Uid"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Não é possível obter o valor"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Erro ao criar `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Erro ao criar a fila de correio: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "O utilizador não pode ser modificado: '%s'.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "O utilizador não pode ser apagado: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Falha ao definir a senha: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "erro desconhecido"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Falha ao criar o grupo.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "O grupo não pode ser modificado: '%s'.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "O grupo não pode ser apagado: '%s'.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Nenhuma pasta pessoal para o utilizador.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "A pasta pessoal não pode ser apagada: '%s'.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Erro ao apagar a fila de correio: %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5b108b1..22ad359 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
-# 
+#
 # Translators:
 # ANDREI BOSCO BEZERRA TORRES <ANDREIBT@UOL.COM.BR>, 2000
 # Bruno Dorfman Buys <brunobuys@zipmail.com.br>, 2002
@@ -17,22 +17,23 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2014-11-15 21:30+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/mageia/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
+"mageia/language/pt_BR/)\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Carregando Usuários e Grupos... Aguarde por favor"
@@ -137,7 +138,7 @@ msgstr "Aplicar filtro"
 msgid "Users"
 msgstr "Usuários"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Grupos"
@@ -158,7 +159,7 @@ msgstr "Nome do usuário"
 msgid "User ID"
 msgstr "ID do Usuário"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Grupo primário"
@@ -218,7 +219,7 @@ msgstr "Adicionar Grupo"
 msgid "Add a group to the system"
 msgstr "Adicionar um grupo ao sistema"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Editar"
@@ -228,7 +229,7 @@ msgstr "Editar"
 msgid "Edit selected row"
 msgstr "Editar linha selecionada"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Apagar"
@@ -248,418 +249,448 @@ msgstr "Atualizar"
 msgid "Refresh the list"
 msgstr "Atualizar a lista de usuários"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Expirada"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Clique no ícone para mudá-lo"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Criar novo usuário"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Criar diretório principal do usuário"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Diretório principal"
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Criar grupo privado para este usuário"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Informe manualmente o ID deste usuário"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Esse usuário já existe. Por favor escolha outro nome."
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Senha diferente"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 characters"
-msgstr "Esta senha é muito simples. \nSenhas seguras devem ter mais de 6 caracteres."
+msgstr ""
+"Esta senha é muito simples. \n"
+"Senhas seguras devem ter mais de 6 caracteres."
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "UID do usuário < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
-msgstr "Criar um usuário com uma UID menor que 1000 não é recomendado.\nVocê tem certeza que quer isso?\n\n"
+msgstr ""
+"Criar um usuário com uma UID menor que 1000 não é recomendado.\n"
+"Você tem certeza que quer isso?\n"
+"\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Adicionando %s ao grupo 'users'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Criando novo grupo: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Adicionando usuário: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Diretório principal"
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Assistente de migração"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
-"Do you want to run the migration wizard in order to import Windows documents"
-" and settings in your Mageia distribution?"
-msgstr "Você deseja executar o assistente de migração para importar documentos e configurações do Windows para a sua distribuição Mageia?"
+"Do you want to run the migration wizard in order to import Windows documents "
+"and settings in your Mageia distribution?"
+msgstr ""
+"Você deseja executar o assistente de migração para importar documentos e "
+"configurações do Windows para a sua distribuição Mageia?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID:"
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Escolha um grupo"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Adicione a um grupo existente"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Adicione usuário ao grupo"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Um grupo com este nome já existe. O que você quer fazer?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Criar Novo Grupo"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Informe manualmente o ID do grupo"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Este grupo já existe. Por favor, escolha outro nome"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "Identificação do Grupo é < de 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
-msgstr "Não é recomendado criar um grupo com identificação < que 1000.\nVocê tem certeza que quer isso?\n\n"
+msgstr ""
+"Não é recomendado criar um grupo com identificação < que 1000.\n"
+"Você tem certeza que quer isso?\n"
+"\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Adicionando grupo: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Apagar arquivos ou não"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
 " Also perform the following actions\n"
-msgstr "Apagando usuário %s\nFazendo também as seguintes ações\n"
+msgstr ""
+"Apagando usuário %s\n"
+"Fazendo também as seguintes ações\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Apagar Diretório principal do usuário: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Excluir Caixa de Correio: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Removendo usuário(s): %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Você deseja realmente excluir o grupo %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
-msgstr "%s é o grupo principal do usuário %s\nPrimeiro apague o usuário"
+msgstr ""
+"%s é o grupo principal do usuário %s\n"
+"Primeiro apague o usuário"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Removendo grupo(s): %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Nome completo:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Confirme a senha:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Login:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Nome do grupo:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Por favor, selecione ao menos um grupo para este usuário"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
-msgstr "Favor informe Ano, Mês e Dia\ndo vencimento desta conta"
+msgstr ""
+"Favor informe Ano, Mês e Dia\n"
+"do vencimento desta conta"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Favor preencher todos os campos da senha\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Você não pode remover o usuário '%s' deste grupo primário"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Início:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Dados do usuário"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Permite vencimento da conta"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Conta expira em (AAA-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Bloquear a conta do usuário"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Informações da conta"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Última mudança de senha em: "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Permite vencimento da senha"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dias antes do vencimento:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Dias depois do vencimento:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dias para avisar antes do vencimento:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dias antes de conta inativa:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Informações de Senha"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Selecione os grupos que este usuário será membro:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Lista de grupos"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Selecione os usuários para juntar-se a este grupo:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Grupo de Usuários"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Editar Grupos / Usuários"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Um erro ocorreu:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Fechar"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s por Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Copyright (C) %s por Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Gerenciamento de Usuários"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
-#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith
-#. <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
-msgstr "Cristiano Otto Von Trompczynski <cris@mandriva.com>\nArthur Renato Mello <renato@conectiva.com.br>\nFelipe Arruda <felipemiguel@gmail.com>\n"
+msgstr ""
+"Cristiano Otto Von Trompczynski <cris@mandriva.com>\n"
+"Arthur Renato Mello <renato@conectiva.com.br>\n"
+"Felipe Arruda <felipemiguel@gmail.com>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "O campo do nome está vazio! Coloque um nome"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "O nome deve conter apenas caracteres minúsculos, números,'-' e '_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Nome muito grande"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Erro"
@@ -670,74 +701,75 @@ msgstr "Executar gerenciador de usuário Mageia"
 
 #: ../polkit/org.mageia.drakuser.policy.in.h:2
 msgid "Authentication is required to run Mageia User Manager"
-msgstr "A autenticação é necessária para executar o gerenciador de usuario Mageia"
+msgstr ""
+"A autenticação é necessária para executar o gerenciador de usuario Mageia"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Criação da conta falhou: '%s'.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Não foi possível obter número Uid"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Não consigo pegar o valor"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Erro ao criar `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Erro ao criar mail spool: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Usuário não pôde ser modificado: '%s'.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Usuário não pôde ser excluído: ''%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Falha ao definir senha: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "erro desconhecido"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "A criação do grupo falhou.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Grupo não pôde ser modificado: '%s'.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Grupo não pôde ser excluído: '%s'.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Sem diretório home para o usuário.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Diretório Home não pôde ser excluído: '%s'.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Erro ao remover o mail spool: %s\n"
diff --git a/po/ro.po b/po/ro.po
index 77a7e81..2d0e35d 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2013-11-21 12:46+0000\n"
 "Last-Translator: Florin Cătălin RUSSEN <cfrussen@yahoo.co.uk>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/mageia/language/"
@@ -18,12 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
 "2:1));\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Se încarcă utilizatorii și grupurile... Așteptați vă rog"
@@ -128,7 +128,7 @@ msgstr "Aplică filtru"
 msgid "Users"
 msgstr "Utilizatori"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Grupuri"
@@ -149,7 +149,7 @@ msgstr "Nume utilizator"
 msgid "User ID"
 msgstr "ID utilizator"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Grup principal"
@@ -213,7 +213,7 @@ msgstr ""
 msgid "Add a group to the system"
 msgstr "Adăugați un grup în sistem"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Editează"
@@ -223,7 +223,7 @@ msgstr "Editează"
 msgid "Edit selected row"
 msgstr "Editați rîndul selectat"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Șterge"
@@ -243,57 +243,57 @@ msgstr "Împrospătează"
 msgid "Refresh the list"
 msgstr "Împrospătează lista"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Blocat"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Expirat"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Faceți clic pe pictogramă pentru a o schimba"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Creați un utilizator nou"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Creează directorul personal"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Director personal: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Creează un grup privat pentru utilizator"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Specificați manual ID utilizator"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Acest utilizator există deja, folosiți un alt nume de utilizator"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Nepotrivire de parolă"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -302,43 +302,56 @@ msgstr ""
 "Această parolă este prea simplă. \n"
 " Parolele bune ar trebui să fie > de 6 caractere"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Identificatorul utilizatorului este < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
-"Nu se recomandă crearea unui utilizator cu un identificator mai mic de 1000.\n"
+"Nu se recomandă crearea unui utilizator cu un identificator mai mic de "
+"1000.\n"
 " Chiar doriți acest lucru?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Se adaugă %s în grupul „users”"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Se creează un grup nou: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Se adaugă utilizatorul: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Director personal: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Asistent de migrare"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -347,64 +360,64 @@ msgstr ""
 "Doriți să lansați asistentul de migrare pentru importarea documentelor și "
 "parametrilor Windows în distribuția Mageia?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Anulează"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Alegeți grupul"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Adaugă la grupul existent"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Adaugă la grupul „users”"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Un grup cu acest nume există deja. Ce doriți să faceți?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Creează un grup nou"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Specificați manual ID grup"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Grupul cu acest nume există deja, alegeți un alt nume pentru grup."
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " Identificatorul grupului este < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -415,22 +428,22 @@ msgstr ""
 " Sigur doriți acest lucru?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Se adaugă grupul: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Ștergeți sau nu fișierele?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -439,27 +452,27 @@ msgstr ""
 "Se șterge utilizatorul %s\n"
 " Se mai efectuează și următoarele acțiuni\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Șterge directorul personal: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Șterge căsuța poștală: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Se șterge utilizatorul: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Sigur doriți să ștergeți grupul %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -468,47 +481,47 @@ msgstr ""
 "%s este grupul principal pentru utilizatorul %s\n"
 " Ștergeți mai întîi utilizatorul"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Se înlătură grupul: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Nume complet: "
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Autentificare: "
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Parolă: "
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Confirmare parolă: "
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Interpretor de comenzi: "
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Nume grup: "
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Selectați cel putin un grup pentru utilizator"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -517,138 +530,138 @@ msgstr ""
 "Specificați anul, luna și ziua \n"
 " de expirare a contului "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Completați toate cîmpurile de expirare a parolei\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Nu se poate înlătura utilizatorul „%s” din grupul său principal"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Director personal: "
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Date despre utilizator"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Activează expirarea contului"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Contul expiră (YYYY-MM-DD): "
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Blochează contul utilizator"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Informații despre cont"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Utilizatorul a modificat parola ultima dată în: "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Activează expirarea parolei"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Numărul de zile înainte de a permite schimbarea: "
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Numărul de zile înaintea schimbării: "
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Numărul de zile înaintea avertizării: "
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Numărul de zile înaintea dezactivării contului: "
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Informații despre parolă"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Selectați grupurile cărora utilizatorul va aparține: "
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Date despre grup"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Selectați utilizatorii ce vor aparține acestui grup: "
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Membrii grupului"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Editare grupuri / utilizatori"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "S-a produs o eroare:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Închide"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Drepturi de autor (C) %s Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Drepturi de autor (C) %s Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Gestionare utilizatori"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
@@ -660,23 +673,23 @@ msgstr ""
 "Florin Cătălin RUSSEN <cfrussen@yahoo.co.uk>, 2009, 2010, 2011.\n"
 "Dan Marian JOIȚA <djmarian4u@yahoo.com>, 2011.\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Cîmpul numelui nu poate fi gol, indicați un nume"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Numele trebuie să conțină numai litere mici, numere, „-” și „_”"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Numele este prea lung"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Eroare"
@@ -690,72 +703,72 @@ msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 "Autentificare necesară pentru lansarea gestionarului de utilizatori Mageia"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Crearea contului a eșuat: „%s”.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Nu se poate obține numărul UID"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Nu se poate prelua valoarea"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Eroare la crearea „%s”: %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Eroare la crearea cozii de mesaje: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Utilizatorul nu poate fi modificat: „%s”.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Utilizatorul nu poate fi șters: „%s”.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Configurarea parolei a eșuat: „%s”.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "eroare necunoscută"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Crearea grupului a eșuat.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Grupul nu poate fi modificat: „%s”.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Grupul nu poate fi șters: „%s”.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Utilizatorul nu are director personal.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Directorul personal nu poate fi șters: „%s”.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Eroare la ștergerea cozii de mesaje: %s\n"
diff --git a/po/ru.po b/po/ru.po
index baf3e3e..8104715 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2013-10-24 16:01+0300\n"
 "Last-Translator: AlexL <loginov.alex.valer@gmail.com>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -24,12 +24,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Language: ru_RU\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Загружаются пользователи и группы... Подождите, пожалуйста"
@@ -134,7 +134,7 @@ msgstr "Применить фильтр"
 msgid "Users"
 msgstr "Пользователи"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Группы"
@@ -155,7 +155,7 @@ msgstr "Имя пользователя"
 msgid "User ID"
 msgstr "ID пользователя"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Главная группа"
@@ -221,7 +221,7 @@ msgstr ""
 msgid "Add a group to the system"
 msgstr "Добавить группу в систему"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Редактировать"
@@ -231,7 +231,7 @@ msgstr "Редактировать"
 msgid "Edit selected row"
 msgstr "Редактировать выбранную строку"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Удалить"
@@ -251,57 +251,57 @@ msgstr "Обновить"
 msgid "Refresh the list"
 msgstr "Обновить список"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Заблокирован"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Срок действия истёк"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Щёлкните по значку, чтобы сменить его"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Создать нового пользователя"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Создать домашний каталог"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Домашний каталог:"
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Создать личную группу для пользователя"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Указать ID пользователя вручную"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Пользователь уже существует, выберите другое Имя пользователя"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Пароли не совпадают"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -310,12 +310,12 @@ msgstr ""
 "Этот пароль слишком прост. \n"
 "Хорошие пароли должны быть > 6 символов"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "UID пользователя < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -326,27 +326,39 @@ msgstr ""
 "Вы уверены, что хотите сделать это?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "%s добавляется в группу 'users'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Создается новая группа: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Добавляется пользователь: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Домашний каталог:"
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Мастер миграции"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -355,64 +367,64 @@ msgstr ""
 "Запустить мастер миграции, чтобы импортировать документы и настройки Windows "
 "в данный дистрибутив Mageia?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Отмена"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ок"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Выбрать группу"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Добавить в существующую группу"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Добавить в группу 'users'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Группа с таким именем уже существует. Что вы хотите сделать?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Создать новую группу"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Указать ID группы вручную"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Группа уже существует, выберите другое Имя группы"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "GID группы < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -423,22 +435,22 @@ msgstr ""
 "Вы уверены, что хотите сделать это?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Добавляется группа: %s"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Удалить файлы или нет?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -447,27 +459,27 @@ msgstr ""
 "Удаляется пользователь %s\n"
 " Также выполняются следующие действия\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Удалить домашний каталог: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Удалить почтовый ящик :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Удаляется пользователь: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Удалить группу %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -476,47 +488,47 @@ msgstr ""
 "%s является главной группой для пользователя %s\n"
 "Сначала удалите пользователя"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Удаляется группа: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Полное имя:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Логин:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Подтверждение пароля:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Оболочка входа:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Имя группы:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Пожалуйста, выберите для пользователя по крайней мере одну группу"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -525,150 +537,150 @@ msgstr ""
 "Укажите год, месяц и день\n"
 "окончания срока действия учётной записи"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Заполните все поля для возраста пароля\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Нельзя удалить пользователя '%s' из его главной группы"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Домашний каталог:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Данные пользователя"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Включить срок действия учётной записи"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Срок действия учётной записи истекает (ГГГГ-ММ-ДД):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Заблокировать учётную запись пользователя"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Информация об учётной записи"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Последний раз пользователь сменил пароль:"
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Включить срок действия пароля"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Через сколько дней разрешить изменение:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Через сколько дней потребовать изменение:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "За сколько дней предупреждать об изменении:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Количество дней до отключения учётной записи:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Информация о пароле"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Выберите группы, членом которых будет пользователь:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Данные группы"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Выберите пользователей для присоединения к этой группе:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Группы пользователей"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Редактировать Группы / Пользователей"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Произошла ошибка:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Закрыть"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Copyright (C) %s by Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Управление пользователями"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Pavel Maryanov <acid_jack@ukr.net>, 2002, 2003, 2005, 2006, 2008.\n"
 "Alexander Kazancev <kazancas@mandriva.org> 2010\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Поле имени не заполнено. Укажите имя."
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
@@ -676,12 +688,12 @@ msgstr ""
 "Имя должно содержать только латинские символы нижнего регистра, цифры, `-' и "
 "`_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Имя слишком длинное"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Ошибка"
@@ -694,72 +706,72 @@ msgstr "Запуск утилиты управления пользовател�
 msgid "Authentication is required to run Mageia User Manager"
 msgstr "Требуется аутентификация для запуска утилиты управления пользователями"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Ошибка создания аккаунта:  '%s'.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Невозможно получить номер Uid"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Невозможно вернуть значение"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Ошибка создания `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Ошибка создания почтового спула: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Пользователь не может быть изменен: : '%s'.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Пользователь не может быть удален: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Сбой установки пароля: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "неизвестная ошибка"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Ошибка создания группы.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Группа не может быть изменена: '%s'.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Группа не может быть удалена: '%s'.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Нет домашней директории для пользователя.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Домашняя директория не может быть удалена: '%s'.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Ошибка удаления почтового спула: %s\n"
diff --git a/po/sc.po b/po/sc.po
index b430007..51cf10e 100644
--- a/po/sc.po
+++ b/po/sc.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-sc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2005-01-29 12:56+0100\n"
 "Last-Translator: Antoni Pistis <antonio.pistis@virgilio.it>\n"
 "Language-Team: Sardu\n"
@@ -19,12 +19,12 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Càrrigu Umperadoris e Grupus... Po praxeri, abeta"
@@ -129,7 +129,7 @@ msgstr "Àpriga ciliru"
 msgid "Users"
 msgstr "Umperadoris"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Grupus"
@@ -150,7 +150,7 @@ msgstr "Nòmini umperadori"
 msgid "User ID"
 msgstr "ID umperadori"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Grupu Primàriu"
@@ -210,7 +210,7 @@ msgstr "Açungi Grupu"
 msgid "Add a group to the system"
 msgstr "Açungi unu grupu a su sistema"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Muda"
@@ -220,7 +220,7 @@ msgstr "Muda"
 msgid "Edit selected row"
 msgstr "Muda s'arraya sçoberada"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Burra"
@@ -240,57 +240,57 @@ msgstr "Arrecasça"
 msgid "Refresh the list"
 msgstr "Arrecasça sa lista"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Arrocu"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Scadèssiu"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Craca me in sa màgini po da cambiai"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Crea Umperadori Nou"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Crea Home Directory"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Home Directory: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Crea unu grupu personali po s'umperadori"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Indita su ID umperadori a manu"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "S'umperadori esistit jai, sçobera un'atru Nòmini Umperadori"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Disacòrdiu de password"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -299,12 +299,12 @@ msgstr ""
 "Custa password est tropu simpli. \n"
 " Is passwords bonas iant a bolli > 6 caràteris"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Sa Uid umperadori est < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -315,91 +315,103 @@ msgstr ""
 " Ses siguru ki du bolis fàiri?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Ponju %s in su grupu 'umperadoris'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Creu su grupu nou: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Açungu umperadori: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Home Directory: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Annudda"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Sçobera grupu"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Açungi a grupu"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Açungi a su grupu 'umperadoris'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Unu grupu cun custu nòmini esistit jai. Ita bolis fàiri?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Crea Grupu Nou"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Indita ID Grupu a manu"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Su Grupu esistit jai, po praxeri, sçobera un'atru nòmini grupu"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "Su Gid de su Grupu est < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -410,22 +422,22 @@ msgstr ""
 " Ses siguru de du bolis fàiri?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Açungu Grupu: %s"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Burrai o no is file?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -434,27 +446,27 @@ msgstr ""
 "Burru umperadori %s\n"
 " Fatzu puru cantu sighit\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Burra sa Home Directory: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Burra sa Mailbox :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Srexinendi umperadori: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Diaderus bolis burrai su grupu %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -463,47 +475,47 @@ msgstr ""
 "%s est unu grupu primàriu po s'umperadori %s\n"
 " Burra s'umperadori a innantis"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Srèxinu grupu: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Nòmini prenu:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Password:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Cunfirma sa Password:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell de login:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Nòmini Grupu:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Sçobera a su mancu unu grupu po s'umperadori"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -512,160 +524,160 @@ msgstr ""
 "Po praxeri, indita Annu, Mesi e Dì \n"
 " po sa Scadèssida de s'Account "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Preni totu is campus po sa scadèssida de sa password\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "No podis srexinai s'umperadori '%s' de su grupu suu primàriu"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Home:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Dadus Umperadori"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Abiva sa scadèssida de s'account"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "S'account scadessit (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Arroca s'account umperadori"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Account Info"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "S'umperadori at mudau a ùrtimu sa password :"
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Abiva sa scadèssida de sa password"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dìs antis de podi mudai:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Dìs antis de depi mudai :"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dìs de avertimentu antis de sa muda :"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dìs antis de disabivai s'account :"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Password Info"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Sçobera is grupu ki s'umperadori at a essi membru :"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Dadus Grupu"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Sçobera is umperadoris de uniri a custu grupu :"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Umperadoris de su Grupu"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Muda Grupus / Umperadoris"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Faddina"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Serra"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Maniju Umperadoris"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Antoni Pistis <antonio.pistis@virgilio.it>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Su campu \"nòmini\" est sbuidu, po praxeri, intra unu nòmini"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 "Su nòmini depit cuntenni feti lìteras latinas piticas, nùmerus, `-' e `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Su nòmini est tropu longu"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Faddina"
@@ -679,73 +691,73 @@ msgstr "Aina de maniju umperadoris Mageia"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, fuzzy, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Faddina creendi coa de posta.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Faddina creendi `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Faddina creendi coa de posta: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, fuzzy, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Faddina creendi coa de posta.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "faddina disconnota"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 #, fuzzy
 msgid "Group creation failed.\n"
 msgstr "Faddina creendi coa de posta.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Faddina burrendi coa de posta: %s\n"
diff --git a/po/sk.po b/po/sk.po
index 8f80f01..ce08c3c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2015-07-18 22:18+0000\n"
 "Last-Translator: Milan Baša <minkob@mail.t-com.sk>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/mageia/language/"
@@ -19,12 +19,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Načítavajú sa používatelia a skupiny... Čakajte prosím"
@@ -129,7 +129,7 @@ msgstr "Aplikovať filter"
 msgid "Users"
 msgstr "Používatelia"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Skupiny"
@@ -150,7 +150,7 @@ msgstr "Používateľské meno"
 msgid "User ID"
 msgstr "ID používateľa"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Primárna skupina"
@@ -210,7 +210,7 @@ msgstr "Pridať skupinu"
 msgid "Add a group to the system"
 msgstr "Pridať skupinu do systému"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Upraviť"
@@ -220,7 +220,7 @@ msgstr "Upraviť"
 msgid "Edit selected row"
 msgstr "Zmeniť označený riadok"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Zmazať"
@@ -240,57 +240,57 @@ msgstr "Obnoviť"
 msgid "Refresh the list"
 msgstr "Obnoviť zoznam"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Zablokované"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Expirované"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Kliknite na ikonu pre zmenu"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Vytvoriť nového používateľa"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Vytvoriť domovský adresár"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Domovský adresár:"
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Vytvorenie privátnej skupiny pre používateľa"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Špecifikovať ID používateľa"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Používateľ už existuje, vyberte si iné používateľské meno"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Heslá nie sú zhodné"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -299,12 +299,12 @@ msgstr ""
 "Toto heslo je príliš jednoduché. \n"
 " Vhodné heslo by malo mať aspoň 6 znakov"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "ID používateľa je < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -315,27 +315,39 @@ msgstr ""
 " Naozaj si to želáte?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Priradenie %s do skupiny 'users'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Vytvoriť novú skupinu: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Pridávanie používateľa: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Domovský adresár:"
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Sprievodca migráciou"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -344,64 +356,64 @@ msgstr ""
 "Chcete spustiť sprievodcu migráciou aby ste naimportovali dokumenty a "
 "nastavenia z Windows do vašej distribúcie Mageia?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID:"
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Výber skupiny"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Pridať do existujúcej skupiny"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Pridať do skupiny 'users'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Skupina s takýmto menom už existuje. Čo chcete teraz spraviť?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Vytvoriť novú skupinu"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Špecifikovať GID skupiny"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Skupina už existuje, zvoľte si prosím iné meno skupiny"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "Skupinové GID je < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -412,22 +424,22 @@ msgstr ""
 " Ste si istí že to chcete?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Pridávanie skupiny: %s"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID:"
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Vymazať súbory?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -436,27 +448,27 @@ msgstr ""
 "Vymazenie používateľa %s\n"
 " Vykonajú sa aj nasledovné akcie\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Vymazať domovský adresár: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Vymazať mailbox :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Odstránenie používateľa: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Naozaj chcete vymazať skupinu %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -465,47 +477,47 @@ msgstr ""
 "%s je primárna skupina pre používateľa %s\n"
 " Najprv odstráňte používateľa"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Odstránenie skupiny: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Celé meno:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Používateľské meno:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Potvrdiť heslo:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Prihlasovací shell:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Meno skupiny:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Vyberte prosím aspoň jednu skupinu pre používateľa"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -514,159 +526,159 @@ msgstr ""
 "Vyšpecifikujte prosím rok, mesiac a deň\n"
 " kedy má byť konto zneplatnené"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Vyplňte prosím všetky položky pri nastavovaní platnosti hesla\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Nie je možné odstrániť používateľa '%s' z jeho primárnej skupiny"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Domovský adresár:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Používateľské údaje"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Povoliť vypršanie platnosti účtov"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Vypršanie platnosti účtu (ROK-MES-DEN):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Zablokovať používateľský účet"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Informácie o účte"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Používateľ si naposledy zmenil heslo:"
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Povoliť expiráciu hesiel"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dní pred povolenou zmenou hesla :"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Dni pred vyžadovanou zmenou :"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Koľko dní varovať pred zmenou :"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dní pred deaktivovaním konta :"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Informácie o hesle"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Označiť skupiny ktorých má byť používateľ členom:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Údaje skupiny"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Vybrať používateľov pre zaradenie do tejto skupiny :"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Skupina používateľov"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Upraviť Skupiny / Používateľov"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Nastala chyba:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Zatvoriť"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Copyright (C) %s by Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Správa používateľov"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Tibor Pittich <Tibor.Pittich@mandriva.org>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Položka s menom je prázdna, zadajte prosím meno"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Meno musí obsahovať iba malé písmená, čísla, `-' a `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Meno je príliš dlhé"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Chyba"
@@ -679,72 +691,72 @@ msgstr "Spustiť Mageia správcu uživateľov"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr "Overenie je požadované ku spusteniu Mageia správcu uživateľov"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Zlyhalo vytvorenie účtu: '%s'.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Nie je možné získať UID"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Nie je možné získať hodnotu"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Chyba vo vytváraní `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Chyba vo vytváraní fronty e-mailov: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Uživateľ nemôže byť modifikovaný : '%s'\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Uživateľ nemôže byť zmazaný: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Zlyhalo vytvorenie hesla: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "neznáma chyba"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Zlyhalo vytvorenie skupiny.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Skupina nemôže byť modifikovaná: '%s'.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Skupina nemôže byť zmazaná: '%s'.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Užívateľ nemá domovský adresár.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Domovský adresár nemôže byť vymazaný: '%s'.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Chyba pri vymazávaní fronty e-mailov: %s\n"
diff --git a/po/sl.po b/po/sl.po
index b3b7894..72d3b56 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2013-10-20 18:06+0200\n"
 "Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>, Translation list <mageia-"
@@ -22,12 +22,12 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3)\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Počakajte, nalaganje uporabnikov in skupin ..."
@@ -132,7 +132,7 @@ msgstr "Uporabi filter"
 msgid "Users"
 msgstr "Uporabniki"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Skupine"
@@ -153,7 +153,7 @@ msgstr "Uporabniško ime"
 msgid "User ID"
 msgstr "ID uporabnika"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Primarna skupina"
@@ -213,7 +213,7 @@ msgstr "Dodaj skupino"
 msgid "Add a group to the system"
 msgstr "Dodaj skupino v sistem"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Uredi"
@@ -223,7 +223,7 @@ msgstr "Uredi"
 msgid "Edit selected row"
 msgstr "Uredi izbrano vrstico"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Zbriši"
@@ -243,57 +243,57 @@ msgstr "Osveži"
 msgid "Refresh the list"
 msgstr "Osveži spisek"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Zaklenjeno"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Potečeno"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Kliknite ikono, če jo želite spremeniti."
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Ustvari novega uporabnika"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Ustvari domačo mapo"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Domača mapa: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Ustvari zasebno skupino za uporabnika"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Ročno določi ID uporabnika:"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Uporabniško ime že obstaja, izberite drugo ime"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Geslo se ne ujema"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -302,12 +302,12 @@ msgstr ""
 "Geslo je preenostavno. \n"
 " Dobro geslo je dolgo vsaj šest znakov"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Številka uporabnika (UID) je manj kot 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -318,27 +318,39 @@ msgstr ""
 "Ali ste prepričani, da želite narediti prav to?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Vstavljam %s v »uporabniško« skupino"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Ustvarjanje nove skupine: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Dodajanje uporabnika: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Domača mapa: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Čarovnik za selitev"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -347,64 +359,64 @@ msgstr ""
 "Ali želite zagnati čarovnika za selitev, ki vam pomaga uvoziti dokumente in "
 "nastavitve iz Windows v Mageia?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Potrdi"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Izberi skupino"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Dodaj v obstoječo skupino"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Dodaj v »uporabniško« skupino"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Skupina s tem imenom že obstaja. Kaj želite narediti?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Ustvari novo skupino"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Ročno določi ID skupine"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Skupina že obstaja, izberite drugo ime skupine"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "GID skupine je manj kot 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -415,22 +427,22 @@ msgstr ""
 "Ali ste prepričani, da želite narediti prav to?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Dodajanje skupine: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Zbrišem datoteke ali ne?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -439,27 +451,27 @@ msgstr ""
 "Brisanje uporabnika %s\n"
 " Prav tako izvrši naslednja dejanja\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Zbriši domačo mapo: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Zbriši poštni nabiralnik :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Odstranjevanje uporabnika: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Ali resnično želite izbrisati skupino %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -468,47 +480,47 @@ msgstr ""
 "%s je primarna skupina za uporabnika %s\n"
 " Najprej odstranite uporabnika"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Odstranjevanje skupine: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Polno ime:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Uporabniško ime:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Geslo:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Potrdi geslo:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Prijavna lupina:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Ime skupine:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Prosim izberite vsaj eno skupino za uporabnika"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -517,138 +529,138 @@ msgstr ""
 "Prosim določite leto, mesec in dan,\n"
 "ko uporabniški račun poteče "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Prosim izpolnite vsa polja o staranju gesla\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Uporabnika ni mogoče odstraniti »%s« iz njegove primarne skupine"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Dom:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Podatki o uporabniku"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Omogoči, da račun poteče"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Uporabniški račun poteče (YYYY-MM-DD oz. leto-mesec-dan):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Zakleni uporabnikov račun"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Podatki o uporabniškem računu"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Uporabnik je nazadnje spremenil geslo: "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Omogoči, da geslo poteče"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Število dnevov preden je dovoljena sprememba:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Število dnevov pred zahtevano spremembo:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Število dnevov opozorila pred spremembo:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Število dnevov pred neaktivnostjo računa:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Podatki o geslu"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Izberite skupine katerih član bo uporabnik:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Podatki o skupini"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Izberite uporabnike za pridružitev tej skupini"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Skupinski uporabniki"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Uredi Skupine / Uporabnike"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Prišlo je do napake:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Zapri"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Avtorske pravice (C) %s Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Avtorske pravice (C) %s Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Upravljanje z uporabniki"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
@@ -660,23 +672,23 @@ msgstr ""
 "Filip Komar <filip.komar@gmail.com>\n"
 "\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Polje z imenom je prazno, prosim podajte ime"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Ime lahko vsebuje le male črke, številke, »-« in »_«"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Ime je predolgo"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Napaka"
@@ -690,72 +702,72 @@ msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 "Za zagon Mageia orodja za upravljanje z uporabniki je zahtevano overjanje"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Ustvarjanje računa ni uspelo: »%s«.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Številke uporabnika (UID) ni mogoče pridobiti"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Vrednosti ni mogoče pridobiti"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Napaka pri ustvarjanju »%s«: %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Napaka pri ustvarjanju poštnega navitka (mail spool): %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Uporabnika ni bilo mogoče spremeniti: »%s«.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Uporabnika ni bilo mogoče izbrisati: »%s«.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Gesla ni bilo mogoče nastaviti: »%s«.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "neznana napaka"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Ustvaritev skupine ni uspela.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Skupine ni bilo mogoče spremeniti: »%s«.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Skupine ni bilo mogoče izbrisati: »%s«.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Za uporabnika ni domače mape.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Domače mape ni bilo mogoče izbrisati: »%s«.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Napaka pri odstranjevanju poštnega navitka (mail spool): %s\n"
diff --git a/po/sq.po b/po/sq.po
index 21726bd..fc075dc 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2016-03-13 00:33+0000\n"
 "Last-Translator: Ardit Dani <ardit.dani@gmail.com>\n"
 "Language-Team: Albanian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Ngarkimi i Përdoruesve dhe i Grupeve... Ju lutemi prisni"
@@ -128,7 +128,7 @@ msgstr "Aplikoje filterin"
 msgid "Users"
 msgstr "Përdoruesitë"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Grupet"
@@ -149,7 +149,7 @@ msgstr "Emri i Përdoruesit"
 msgid "User ID"
 msgstr "ID i Përdoruesit"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Grupi Primar"
@@ -209,7 +209,7 @@ msgstr "Shtoje një Grup"
 msgid "Add a group to the system"
 msgstr "Shtoje një grup në sistem"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Boto"
@@ -219,7 +219,7 @@ msgstr "Boto"
 msgid "Edit selected row"
 msgstr "Botoje rreshtin e zgjedhur"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Zhduke"
@@ -239,58 +239,58 @@ msgstr "Rifreskoje"
 msgid "Refresh the list"
 msgstr "Rifreskoje listën"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Mbyllur"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Skadon afati"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Kliko mbi ikonë për ta ndërruar"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Krijo një Përdorues të Ri"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Krijo Repertorin Home"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Repertori Home: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Kroji një grup privat për përdoruesin"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Specifikoje ID e përdoruesit manuelisht"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr ""
 "Ky përdorues ekziston, ju lutemi zgjedheni një emër tjetër të Pëdoruesin"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "fjalëkalimi nuk Përputhet"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -299,12 +299,12 @@ msgstr ""
 "Ky fjalëkalim është tejet e thjeshtë. \n"
 " Një parullë e mirë duhet të jetë me > 6 karaktere"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Uid i përdoruesit është < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -315,27 +315,39 @@ msgstr ""
 " A jeni i sigurt për këtë veprim?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Shtimi i %s në 'përdoruesit' e grupit"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Krijimi i një grupi të ri: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Shtimi i një përdoruesi: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Repertori Home: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Udhëzuesi Shpërngulje"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -344,64 +356,64 @@ msgstr ""
 "A doni të ekzekutoni Udhëzuesi e migrimit në mënyrë që të importoni "
 "dokumentet e Windows dhe cilësimet në shpërndarjen e Mageia's tuaj?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Anulo"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Zgjidh grupin"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Shtoje në grupin ekzistues"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Shtoi në 'përdoruesit' grup"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Një grup me këtë emër veçse ekziston.  Çka dëshironi të bëni?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Krijo një Grup të Ri"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Specifoje grupin e ID manuelisht"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Grupi veçse ekziston, ju lutemi zgjedheni një Emër tjetër të Grupit"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " Grupi Gid është < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -412,22 +424,22 @@ msgstr ""
 " A jeni i sigurt për këtë veprim?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Shtimi i një grupi: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Fshi dokumentet ose jo?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -436,27 +448,27 @@ msgstr ""
 "Zhdukja e përdoruesit %s\n"
 " Njashtu parashefë akcionet vijuese\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Zhduke Repertorin Home: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Zhduke Mailbox :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Zhdukja përdoruesit: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "A me të vërtet dëshironi ta zhdukni grupin %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -465,47 +477,47 @@ msgstr ""
 "%s është grup primar për përdoruesin %s\n"
 " Zhduke përdoruesin para se të vazhdosh"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Zhdukja e grupit: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Emri i Plot:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Fjalëkalimi:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Konfirmoje Fjalëkalimin:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Login Shell:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Emri i Grupit:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Ju lutemi zgjedheni më së paku një grup për përdoruesin"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -514,159 +526,159 @@ msgstr ""
 "Ju lutemi zgjedheni Vitin, Muajin dhe Ditën \n"
 " për Mbarimin e afatit të Kontos "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Ju lutemi mbushni të gjitha fushat e fjalëkalim përsëri\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Ju nuk mund ta zhdukni përdoruesin '%s' nga grupi i tij primar"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Repertori Home:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Të dhënat e përdoruesit"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Mundësoje konton e afatizuar"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Kontoja skadon (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Lidhe Konton e Përdoruesit"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Informcion mbi Konton"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Përdoruesi i fundit e ka ndrryshuar Fjalëkalim në:"
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Mundësoje Përfundimin Fjalëkalimit"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Ditët para se është mundësuar ndryshimi :"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Ditës para se është nevojitur ndryshimi :"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Ditër para se është ndryshuar vëmendja :"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Ditët para se të jetë dezaktivizuar kontoja :"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Info Fjalëkalimit"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Zgjedhi grupet për të cilat përdoruesi do të jetë anëtar i tyre:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Të dhëna të Grupit"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Zgjedhi përdoruesit të cilët do ti bashkangjiten grupit :"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Grup Përdoruesish"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Modifiko Grupet / Përdoruesit"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Një gabim ka ndodhur:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Mbylle"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Te Drejta Autorit (C) %s nga Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Te Drejta Autorit (C) %s nga Mandriva"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Menagjer për Përdorues"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "_: Ard1t(s) Ardit Dani(s) & ardit.dani@gmail.com(s)\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Emri i fushës është zbrazët ju lutemi furnizoni një emër"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Emri duhet të përmbaj më së paku shkronja, numra, `-' dhe `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Emri është shumë i gjatë"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Gabim"
@@ -681,74 +693,74 @@ msgstr ""
 "Vërtetimi është i nevojshëm për të ekzekutuar Menaxhuesin e Përdoruesit "
 "Mageia"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Krijimi Llogaria dështoj: '%s'.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Nuk u gjend numri Uid"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Nuk mund të marrë vlerën"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Gabim në krijim `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Gabim gjatë krijimit të postës spool: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Përdoruesi nuk mund të modifikohet: '%s'.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Përdoruesi nuk mund të fshihet: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Dështoj Vendosja e Fjalëkalimit: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "Gabim i panjohur"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Krijimi i Grupit dështoj.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Grupi nuk mund të modifikohet: '%s'.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Grupi nuk mund të fshihet: '%s'.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Nuk ka skedarë shtëpi për përdoruesin.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 "Skedari Shtëpi nuk mund të fshihet: '%s'.\n"
 "\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Gabim gjatë fshirjes të postës spool: %s\n"
diff --git a/po/sr.po b/po/sr.po
index 57f4829..252c770 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2004-02-01 19:18+0100\n"
 "Last-Translator: Toma Jankovic <webmaster@mandrake.co.yu>\n"
 "Language-Team: serbian <mdk@linux.rs.sr>\n"
@@ -25,12 +25,12 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Учитавам Кориснике и Групе... Молим Вас сачекајте"
@@ -135,7 +135,7 @@ msgstr "Примени филтер"
 msgid "Users"
 msgstr "Корисници"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Групе"
@@ -156,7 +156,7 @@ msgstr "Корисничко име"
 msgid "User ID"
 msgstr "Корисников ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Примарна група"
@@ -216,7 +216,7 @@ msgstr "Додај Групу"
 msgid "Add a group to the system"
 msgstr "Додај групу у систем"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Измени"
@@ -226,7 +226,7 @@ msgstr "Измени"
 msgid "Edit selected row"
 msgstr "Измени изабрани ред"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Бриши"
@@ -246,57 +246,57 @@ msgstr "Освежи"
 msgid "Refresh the list"
 msgstr "Освежи листу"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Закључано"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Истекло"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Кликните на икону да би је променили"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Креираљј новог корисника"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Креирај Home директоријум"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Home директоријум: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Крирај приватну групу за корисника"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Ручно одреди корисников ID"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "корисник већ постоји, изаберите друго Корисничко име"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Лозинкас се неодговара"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -305,12 +305,12 @@ msgstr ""
 "Ова лозинка је превише једноставна. \n"
 " Добра лозика има више од 6 карактера "
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "КОрисников  Uid је < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -321,91 +321,103 @@ msgstr ""
 " Да ли сте сигурни да жлите ово да урадите?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Постави %s у 'users' групу"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Креирам нову групу: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Додајем корисника: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Home директоријум: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Поништи"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "У реду"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Изабери групу"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Додај у постојећу групу"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Додај у корисникову групу"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Група са овим именом већ постоји. Шта желите да урадите?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Креирај нову групу"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Ручно одреди ID за групу"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Група већ постоји, изаберите друго име за Групу"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " Gid за Групу је < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -416,22 +428,22 @@ msgstr ""
 " да ли сте сигурни да желите да урадите ово?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Додајем групу: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Бришем фајлове или не?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -440,27 +452,27 @@ msgstr ""
 "Бришем корисника  %s\n"
 " Такође сроводим следеће акције\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Бриши Home Директоријум: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Бриши ailbox :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Уклањам корисника: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Да ли заиста желите да обришете групу %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -469,47 +481,47 @@ msgstr ""
 "%s је примарна група за корисника %s\n"
 " Прво уклони корисникат"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Уклањам групу: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Пуно име:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Пријава:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Потврди лозинку:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Login Shell:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Име групе:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Изаберите бар једну групу за корисника"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -518,159 +530,159 @@ msgstr ""
 "Одредите Годину, Месец и Дан \n"
 " за време истицања налога "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Поново попуните сва поља и лозинку\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Не можете да уклоните корисника %s' из његове примарне групе"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Home:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Корисникови подаци"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Омогући ограничење налога"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Налог истиче (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Закључај корисников налог"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Инфо о налогу"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Корисникова последња промењена лозинка на : "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Омогући ограничење трајања лозике"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Дана пре дозволе за промену :"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Дана пре захтеване промене :"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Дана упозорења пре пормене :"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Дана пре него налог постане неактиван :"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Инфо о лоозинци"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Изаберите групе у којима ће корисник бити члан:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Подаци о групи"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Изаберите кориснике који треба да приступе овој групи:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Корисници Групе"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Уреди Групе / Кориснике"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Хм,појавила се грешка"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Затвори"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Сва права (C) %s задржава Мандрива"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, fuzzy, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Сва права (C) %s задржава Мандрива"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Управљање корисницима"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Toma Jankovic <tomaja@net.yu>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Поље за име је празно, упишите име"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Име може да садржи само мала слова, бројеве, `-' и `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Име је предугачко"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Грешка"
@@ -684,73 +696,73 @@ msgstr "Мандрива Линукс алат за управљање кори�
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, fuzzy, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Грешка при прављењу мејл спула.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Прављење грешке %s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Грешка при прављењу мејл спула: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, fuzzy, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Грешка при прављењу мејл спула.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "непозната грешка"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 #, fuzzy
 msgid "Group creation failed.\n"
 msgstr "Грешка при прављењу мејл спула.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Грешка при брисању маејл спула: %s\n"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index f467851..0ed7c1c 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2004-02-01 19:18+0100\n"
 "Last-Translator: Toma Jankovic <webmaster@mandrake.co.yu>\n"
 "Language-Team: serbian <mdk@linux.rs.sr>\n"
@@ -25,12 +25,12 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Učitavam Korisnike i Grupe... Molim Vas sačekajte"
@@ -135,7 +135,7 @@ msgstr "Primeni filter"
 msgid "Users"
 msgstr "Korisnici"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Grupe"
@@ -156,7 +156,7 @@ msgstr "Korisničko ime"
 msgid "User ID"
 msgstr "Korisnikov ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Primarna grupa"
@@ -216,7 +216,7 @@ msgstr "Dodaj Grupu"
 msgid "Add a group to the system"
 msgstr "Dodaj grupu u sistem"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Izmeni"
@@ -226,7 +226,7 @@ msgstr "Izmeni"
 msgid "Edit selected row"
 msgstr "Izmeni izabrani red"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Briši"
@@ -246,57 +246,57 @@ msgstr "Osveži"
 msgid "Refresh the list"
 msgstr "Osveži listu"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Zaključano"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Isteklo"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Kliknite na ikonu da bi je promenili"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Kreiraljj novog korisnika"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Kreiraj Home direktorijum"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Home direktorijum: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Kriraj privatnu grupu za korisnika"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Ručno odredi korisnikov ID"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "korisnik već postoji, izaberite drugo Korisničko ime"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Lozinkas se neodgovara"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -305,12 +305,12 @@ msgstr ""
 "Ova lozinka je previše jednostavna. \n"
 " Dobra lozika ima više od 6 karaktera "
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "KOrisnikov  Uid je < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -321,91 +321,103 @@ msgstr ""
 " Da li ste sigurni da žlite ovo da uradite?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Postavi %s u 'users' grupu"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Kreiram novu grupu: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Dodajem korisnika: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Home direktorijum: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Poništi"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "U redu"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Izaberi grupu"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Dodaj u postojeću grupu"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Dodaj u korisnikovu grupu"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Grupa sa ovim imenom već postoji. Šta želite da uradite?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Kreiraj novu grupu"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Ručno odredi ID za grupu"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Grupa već postoji, izaberite drugo ime za Grupu"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " Gid za Grupu je < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -416,22 +428,22 @@ msgstr ""
 " da li ste sigurni da želite da uradite ovo?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Dodajem grupu: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Brišem fajlove ili ne?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -440,27 +452,27 @@ msgstr ""
 "Brišem korisnika  %s\n"
 " Takođe srovodim sledeće akcije\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Briši Home Direktorijum: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Briši ailbox :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Uklanjam korisnika: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Da li zaista želite da obrišete grupu %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -469,47 +481,47 @@ msgstr ""
 "%s je primarna grupa za korisnika %s\n"
 " Prvo ukloni korisnikat"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Uklanjam grupu: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Puno ime:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Prijava:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Potvrdi lozinku:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Login Shell:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Ime grupe:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Izaberite bar jednu grupu za korisnika"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -518,159 +530,159 @@ msgstr ""
 "Odredite Godinu, Mesec i Dan \n"
 " za vreme isticanja naloga "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Ponovo popunite sva polja i lozinku\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Ne možete da uklonite korisnika %s' iz njegove primarne grupe"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Home:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Korisnikovi podaci"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Omogući ograničenje naloga"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Nalog ističe (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Zaključaj korisnikov nalog"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Info o nalogu"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Korisnikova poslednja promenjena lozinka na : "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Omogući ograničenje trajanja lozike"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dana pre dozvole za promenu :"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Dana pre zahtevane promene :"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dana upozorenja pre pormene :"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dana pre nego nalog postane neaktivan :"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Info o loozinci"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Izaberite grupe u kojima će korisnik biti član:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Podaci o grupi"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Izaberite korisnike koji treba da pristupe ovoj grupi:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Korisnici Grupe"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Uredi Grupe / Korisnike"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Hm,pojavila se greška"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Zatvori"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Sva prava (C) %s zadržava Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, fuzzy, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Sva prava (C) %s zadržava Mandriva"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Upravljanje korisnicima"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Toma Jankovic_<tomaja@net.yu>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Polje za ime je prazno, upišite ime"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Ime može da sadrži samo mala slova, brojeve, `-' i `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Ime je predugačko"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Greška"
@@ -684,73 +696,73 @@ msgstr "Mageia alat za upravljanje korisnicima"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, fuzzy, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Greška pri pravljenju mejl spula.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Pravljenje greške %s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Greška pri pravljenju mejl spula: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, fuzzy, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Greška pri pravljenju mejl spula.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "nepoznata greška"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 #, fuzzy
 msgid "Group creation failed.\n"
 msgstr "Greška pri pravljenju mejl spula.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Greška pri brisanju maejl spula: %s\n"
diff --git a/po/sv.po b/po/sv.po
index 1a61e8c..4c7b178 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
-# 
+#
 # Translators:
 # Henrik Borg <hblinux@bredband.net>, 2004
 # Joel Andersson <joel@atari.org>, 2000
@@ -12,22 +12,23 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2015-02-13 05:26+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/mageia/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/mageia/language/"
+"sv/)\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Laddar användare och grupper.... Vänta."
@@ -132,7 +133,7 @@ msgstr "Tillämpa filter"
 msgid "Users"
 msgstr "Användare"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Grupper"
@@ -153,7 +154,7 @@ msgstr "Användarnamn"
 msgid "User ID"
 msgstr "Användar-id"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Primär grupp"
@@ -196,7 +197,9 @@ msgstr "Gruppmedlemmar"
 #: ../userdrake:224
 #, c-format
 msgid "Add User"
-msgstr "Lägg till\nanvändare"
+msgstr ""
+"Lägg till\n"
+"användare"
 
 #: ../userdrake:224
 #, c-format
@@ -206,14 +209,16 @@ msgstr "Lägg till en användare till systemet"
 #: ../userdrake:225
 #, c-format
 msgid "Add Group"
-msgstr "Lägg till\ngrupp"
+msgstr ""
+"Lägg till\n"
+"grupp"
 
 #: ../userdrake:225
 #, c-format
 msgid "Add a group to the system"
 msgstr "Lägg till en grupp till systemet"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Redigera"
@@ -223,7 +228,7 @@ msgstr "Redigera"
 msgid "Edit selected row"
 msgstr "Redigera markerad rad"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Ta bort"
@@ -243,418 +248,452 @@ msgstr "Uppdatera"
 msgid "Refresh the list"
 msgstr "Uppdatera listan"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Låst"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Utgången"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Klicka på ikonen för att ändra den"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Skapa ny användare"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Skapa hemkatalog"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Hemkatalog: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Skapa en privat grupp för användaren"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Ange användar-id manuellt"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Användaren finns redan, välj ett annat användarnamn"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Olika lösenord"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 characters"
-msgstr "Det här lösenordet är för enkelt. \n Bra lösenord ska vara längre än sex tecken."
+msgstr ""
+"Det här lösenordet är för enkelt. \n"
+" Bra lösenord ska vara längre än sex tecken."
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Användar-id är < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
-msgstr "Att skapa en användare med ett användar-id under 1000 rekommenderas inte.\nÄr du säker på att du vill göra detta?\n\n"
+msgstr ""
+"Att skapa en användare med ett användar-id under 1000 rekommenderas inte.\n"
+"Är du säker på att du vill göra detta?\n"
+"\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Lägger till användare %s i gruppen \"users\""
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Skapar ny grupp: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Lägger till användare: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Hemkatalog: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Migrationsguide"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
-"Do you want to run the migration wizard in order to import Windows documents"
-" and settings in your Mageia distribution?"
-msgstr "Vill du köra migreringsguiden för att importera Windows dokument och inställninar till din Mageia distribution?"
+"Do you want to run the migration wizard in order to import Windows documents "
+"and settings in your Mageia distribution?"
+msgstr ""
+"Vill du köra migreringsguiden för att importera Windows dokument och "
+"inställninar till din Mageia distribution?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Välj grupp"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Lägg till i den befintliga gruppen"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Lägg till i gruppen \"users\""
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "En grupp med detta namn finns redan. Vad vill du göra?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Skapa ny grupp"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Ange grupp-id manuellt"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Gruppen finns redan. Välj ett annat gruppnamn."
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " Grupp-id är < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
-msgstr "Att skapa en grupp med ett grupp-id under 1000 rekommenderas inte.\nÄr du säker på att du vill göra detta?\n\n"
+msgstr ""
+"Att skapa en grupp med ett grupp-id under 1000 rekommenderas inte.\n"
+"Är du säker på att du vill göra detta?\n"
+"\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Lägger till grupp: %s"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Ta bort filer eller inte?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
 " Also perform the following actions\n"
-msgstr "Tar bort användare %s\n Utför också följande åtgärder\n"
+msgstr ""
+"Tar bort användare %s\n"
+" Utför också följande åtgärder\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Ta bort hemkatalog: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Ta bort brevlåda: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Tar bort användare: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Vill du verkligen ta bort gruppen %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
-msgstr "%s är en primär grupp för användaren %s.\n Ta bort användaren först"
+msgstr ""
+"%s är en primär grupp för användaren %s.\n"
+" Ta bort användaren först"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Tar bort grupp: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Fullständigt namn:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Användarnamn:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Bekräfta lösenord:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Inloggningsskal:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Gruppnamn:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Välj minst en grupp åt användaren."
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
-msgstr "Ange år, månad och dag för \n tidsbegränsning av konto "
+msgstr ""
+"Ange år, månad och dag för \n"
+" tidsbegränsning av konto "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Fyll i alla fält för lösenordsåldrande\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Du kan inte ta bort användaren \"%s\" från dess huvudgrupp."
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Hem:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Användardata"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Aktivera tidsbegränsning av konto"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Kontot går ut den (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Lås användarkonto"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Kontoinformation"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Användaren ändrade lösenord: "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Aktivera tidsbegränsning av lösenord"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dagar innan ändring tillåts: "
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Dagar före ändring krävs: "
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Förvarningstid i dagar innan ändring:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dagar innan kontot blir inaktiverat:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Lösenordsinformation"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Välj de grupper som användaren ska vara medlem i:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Gruppdata"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Välj användarna som ska vara medlemmar i den här gruppen:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Gruppanvändare"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Ändra Grupper / Användare"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Ett fel inträffade:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Stäng"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s, Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Copyright (C) %s av Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Användarhantering"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
-#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith
-#. <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
-msgstr "Thomas Backlund <tmb@mandriva.org>\nLars Westergren <lars.westergren@home.se>\nMagnus Björklöf <bjorklof@nic.fi>\nMattias Newzella <newzella@linux.nu>\nMattias Dahlberg <voz@home.se>\nFuad Sabanovic <manijak@telia.com>\nKenneth Krekula\n"
+msgstr ""
+"Thomas Backlund <tmb@mandriva.org>\n"
+"Lars Westergren <lars.westergren@home.se>\n"
+"Magnus Björklöf <bjorklof@nic.fi>\n"
+"Mattias Newzella <newzella@linux.nu>\n"
+"Mattias Dahlberg <voz@home.se>\n"
+"Fuad Sabanovic <manijak@telia.com>\n"
+"Kenneth Krekula\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Namnfältet är tomt. Ange ett namn."
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Namnet måste bestå av endast små bokstäver, siffror, \"-\" och \"_\""
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Namnet är för långt"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Fel"
@@ -667,72 +706,72 @@ msgstr "Starta Mageias användarhanterare"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr "Autentisering krävs för att starta Mageias användarhanterare"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Fel vid skapande konto: '%s'.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Kan inte hitta Uid nummer"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Kan inte hämta värde"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Fel vid skapande av `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Fel vid skapande av e-postkö: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Användaren kunde inte ändras: '%s'.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Användaren kunde inte raderas: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Misslyckades ange lösenord: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "okänt fel"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Fel vid skapande av grupp.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Gruppen kunde inte ändras: '%s'.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Gruppen kunde inte raderas: '%s'.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Ingen hemkatalog för användaren.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Hemkatalogen kunde inte raderas: '%s'.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Fel vid borttagande av e-postkö: %s\n"
diff --git a/po/ta.po b/po/ta.po
index bc41a4f..81dc365 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2002-08-17 17:54-0400\n"
 "Last-Translator: prabu <prabu_anand2000@yahoo.com>\n"
 "Language-Team:  <en@li.org>\n"
@@ -20,12 +20,12 @@ msgstr ""
 "X-Generator: KBabel 0.9.6\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "டிரேக்பயனர்"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr ""
@@ -130,7 +130,7 @@ msgstr ""
 msgid "Users"
 msgstr "பயனர்கள்"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "குழுக்கள்"
@@ -151,7 +151,7 @@ msgstr "பயனர் பெயர்"
 msgid "User ID"
 msgstr "உபயோகிப்பாளர் அடையாளம்"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr ""
@@ -211,7 +211,7 @@ msgstr "குழுவை சேர்"
 msgid "Add a group to the system"
 msgstr "குழுவைச் சேர்"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "மாற்றியமை"
@@ -221,7 +221,7 @@ msgstr "மாற்றியமை"
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "நீக்கு"
@@ -241,69 +241,69 @@ msgstr "மீளேற்று"
 msgid "Refresh the list"
 msgstr "பயனரின் பட்டியல்"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "பூட்டப்பட்டது"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "காலாவதியாணது"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr ""
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, fuzzy, c-format
 msgid "Create Home Directory"
 msgstr "பயனரின் தொடக்க அடைவு"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, fuzzy, c-format
 msgid "Home Directory: "
 msgstr "பயனரின் தொடக்க அடைவு"
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, fuzzy, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "இப்பெயர் ஏற்கனவே பயன்பாட்டில் உள்ளது"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, fuzzy, c-format
 msgid "Password Mismatch"
 msgstr "கடவுச்சொல்"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr ""
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -311,91 +311,103 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr ""
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, fuzzy, c-format
 msgid "Creating new group: %s"
 msgstr "குழுக்களைக் காட்டு"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, fuzzy, c-format
 msgid "Adding user: %s"
 msgstr "பயனரைச் சேர்"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "பயனரின் தொடக்க அடைவு"
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "நீக்கு"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "சரி"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, fuzzy, c-format
 msgid "Choose group"
 msgstr "இடம்பெற்றுள்ள குழுக்கள்"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "புதிய குழுவை உருவாக்கு"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr ""
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -403,255 +415,255 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr ""
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr ""
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
 " Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, fuzzy, c-format
 msgid "Delete Home Directory: %s"
 msgstr "பயனரின் தொடக்க அடைவு"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, fuzzy, c-format
 msgid "Removing user: %s"
 msgstr "பயனரைச் நீக்கு"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr ""
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, fuzzy, c-format
 msgid "Removing group: %s"
 msgstr "குழுவை நீக்கு"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "முழுப் பெயர்:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "தொடங்கல் :"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "கடவுச்சொல்:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "கடவுச்சொல்லை உறுதிச் செய்:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "புகுபதிகை ஸ்செல்:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "குழுப்பெயர்:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr ""
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "ஆரம்பம்:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, fuzzy, c-format
 msgid "User Data"
 msgstr "பயனரின் பட்டியல்"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr ""
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr ""
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr ""
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr ""
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr ""
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, fuzzy, c-format
 msgid "Password Info"
 msgstr "கடவுச்சொல்"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, fuzzy, c-format
 msgid "Group Data"
 msgstr "குழு  பட்டியல்"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr ""
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, fuzzy, c-format
 msgid "Group Users"
 msgstr "குழுக்கள்"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, fuzzy, c-format
 msgid "Edit Groups / Users"
 msgstr "குழுக்கள்"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "பிழை நேர்ந்துள்ளது மன்னிக்கவும்"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "மூடு"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, fuzzy, c-format
 msgid "Users Management"
 msgstr "பயனர் பெயர்"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "மான்ட்ரிவ லினக்ஸ்"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "பிழை"
@@ -664,73 +676,73 @@ msgstr ""
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, fuzzy, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr " %s என்ற குறும்படத்தை ஏற்றுவதில் பிழை நேர்ந்துள்ளது"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, fuzzy, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr " %s என்ற குறும்படத்தை ஏற்றுவதில் பிழை நேர்ந்துள்ளது"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, fuzzy, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr " %s என்ற குறும்படத்தை ஏற்றுவதில் பிழை நேர்ந்துள்ளது"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "தெரியாத பிழை"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 #, fuzzy
 msgid "Group creation failed.\n"
 msgstr " %s என்ற குறும்படத்தை ஏற்றுவதில் பிழை நேர்ந்துள்ளது"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, fuzzy, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr " %s என்ற குறும்படத்தை ஏற்றுவதில் பிழை நேர்ந்துள்ளது"
diff --git a/po/tg.po b/po/tg.po
index 4cc25f2..b48d222 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2017-02-12 17:16+0000\n"
 "Last-Translator: Victor Ibragimov <victor.ibragimov@gmail.com>\n"
 "Language-Team: Tajik (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -19,12 +19,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Дар ҳоли боркунии корбарон ва гурӯҳҳо... Лутфан, интизор шавед"
@@ -129,7 +129,7 @@ msgstr "Татбиқ кардани филтр"
 msgid "Users"
 msgstr "Корбарон"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Гурӯҳҳо"
@@ -150,7 +150,7 @@ msgstr "Номи корбар"
 msgid "User ID"
 msgstr "Идентификатори корбар"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Гурӯҳи асосӣ"
@@ -210,7 +210,7 @@ msgstr "Илова кардани гурӯҳ"
 msgid "Add a group to the system"
 msgstr "Илова кардани гурӯҳ ба система"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Таҳрир кардан"
@@ -220,7 +220,7 @@ msgstr "Таҳрир кардан"
 msgid "Edit selected row"
 msgstr "Таҳрир кардани сатри интихобшуда"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Нест кардан"
@@ -240,58 +240,58 @@ msgstr "Навсозӣ"
 msgid "Refresh the list"
 msgstr "Навсозӣ карлани рӯйхат"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Баста шудааст"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Мӯҳлати амалиёт гузаштааст"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Барои тағирдиҳӣ ба тасвир ангушт занед"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Корванди Навро ташкил намудан"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Феҳристи хонагиро тартиб диҳед"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Феҳристи хонагӣ"
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Гурӯҳи шахсиро барои корванд ташкил намудан"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Дастӣ ID корвандро нишон додан"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr ""
 "Ин корванд аллакай вуҷуд дорад, лутфан номи корванди дигарро интихоб намоед"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Гузарвожа Mismatch"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -300,12 +300,12 @@ msgstr ""
 "Ин гузарвожа хеле содда аст. \n"
 "Гузарвожаҳои хуб бояд > аз 6 рамз бошанд"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Uid-и корванд < аз 1000 мебошад"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -316,27 +316,39 @@ msgstr ""
 "Шумо боварӣ доред, ки инро иҷро карданӣ ҳастед?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Гузоштани %s ба гурӯҳи 'users'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Ташкили гурӯҳи нав: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Иловаи корванд: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Феҳристи хонагӣ"
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Устоди интиқолдиҳӣ"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -345,64 +357,64 @@ msgstr ""
 "Шумо мехоҳед, ки барои ворид кардани ҳуҷҷатҳои Windows ва танзимот ба "
 "дистрибутиви Mageia-и худ устоди интиқолдиҳиро иҷро намоед?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Бекор кардан"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Гурӯҳро интихоб кунед"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Ба гурӯҳи вуҷуддошта дохил намудан"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Ба гурӯҳи 'users' илова намудан"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Гурӯҳ бо ин ном аллакай вуҷуд дорад.  Шумо чӣ кор каданӣ ҳастед?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Гурӯҳи навро ташкил намоед"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Дастӣ гурӯҳи ID-ро нишон диҳед"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Гурӯҳ аллакай вуҷуд дорад, лутфан Номи дигари Гурӯҳро интихоб намоед"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " Gid-и гурӯҳ < аз 1000 мебошад"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -413,22 +425,22 @@ msgstr ""
 "Шумо боварӣ доред, ки инро иҷро карданӣ ҳастед?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Гурӯҳ илова шуда истодааст: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Файлҳоро нобуд кунам ё не?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -437,27 +449,27 @@ msgstr ""
 "Корванд хориҷ карда мешавад %s\n"
 " Инчунин амалиётҳои зерин иҷро мешаванд\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Феҳристи хонагиро тоза намоед: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Қуттии мактубҳоро хориҷ намудан :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Хориҷи корванд(ҳо): %s "
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Шумо дар ҳақиқат гурӯҳро хориҷ карданӣ ҳастед %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -466,47 +478,47 @@ msgstr ""
 "%s гурӯҳи асосӣ барои корванд мебошад %s\n"
 "Сараввал корвандро хориҷ намоед"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Хориҷи гурӯҳ(ҳо): %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Номи Пурра:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Номи дохилӣ:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Гузарвожа:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Гузарвожаро тасдиқ намоед:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Ҷилди номи дохилӣ:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Номи гурӯҳ:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Лутфан, ақаллан як гурӯҳро барои корванд интихоб намоед"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -515,162 +527,162 @@ msgstr ""
 "Лутфан, сол, моҳ ва рӯзи \n"
 "тамом шудани мӯҳлати қайдро нишон диҳед "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Барои солгузории гузарвожа, лутфан ҳамаи майдонҳоро пур намоед\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Шумо корванди '%s' аз гурӯҳи асосии ӯ хориҷ карда наметавонед"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Хона (мавқеи аввала):"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Маълумоти корбар"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Мӯҳлати қайдро дохил намудан"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Мӯҳлати қайд мегузарад (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Қайди корвандро бастан"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Ахборот дар бораи суратҳисоб"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Дафъаи охирин корванд гузарвожаро иваз намуд : "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Мӯҳлати иҷроиши гузарвожаро дохил намудан"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Баъд аз чанд рӯз ба тағирот иҷозат дод :"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Баъд аз якчанд рӯз тағиротро талаб намуд:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Чанд рӯз дар бораи тағирот огоҳӣ намуд :"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Миқдори рӯзҳои то қатъи қайд :"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Ахборот дар бораи гузарвожа"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Гурӯҳҳоро интихоб намоед, ки аъзои онҳо корванд хоҳад шуд:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Додаҳои гурӯҳ"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Барои дохил шудан ба ин гурӯҳ корвандҳоро интихоб намоед :"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Гурӯҳҳои корванд"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Таҳрири Гурӯҳҳо/ Корвандон"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Хатое ба вуҷуд омад:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Пӯшидан"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Ҳуқуқи муаллиф (C) %s аз тарафи Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Ҳуқуқи муаллиф (C) %s аз тарафи Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Идоракунии корбарон"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "_: Translator(s) name(s) & email(s)\n"
 "Victor Ibragimov, victor.ibragimov@gmail.com\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Майдони ном холӣ аст, лутфан номро пешниҳод намоед"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 "Ном бояд танҳо рамзҳои лотинӣ қайди поён, рақамҳо, `-' ва `_' -ро дошта бошад"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Ном бениҳоят дароз аст"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Хато"
@@ -683,72 +695,72 @@ msgstr "Иҷро кардани мудири корбарони Mageia"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr "Барои иҷрокунии мудири корбарони Mageia, санҷиши ҳаққоният лозим аст"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Эҷоди ҳисоб иҷро нашуд: '%s'.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Рақами Uid гирифта нашуд"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Қимат бозёбӣ карда нашуд"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Хатогии офаридани `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Хатогии офаридани додаҳои пост: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Корбар тағйир дода намешавад: '%s'.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Корбар нест карда намешавад: '%s'..\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Парол танзим карда нашуд: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "хатои номаълум"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Эҷоди гурӯҳ иҷро нашуд..\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Гурӯҳ тағйир дода намешавад: '%s'..\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Гурӯҳ нест карда намешавад: '%s'..\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Ин корбар директорияи хонагӣ надорад.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Директорияи хонагӣ нест карда намешавад: '%s'.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Хатои несткунии навбати почта: %s\n"
diff --git a/po/th.po b/po/th.po
index 3f49695..35e209e 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2017-09-02 16:35+0000\n"
 "Last-Translator: Rockers <sumorock@hotmail.com>\n"
 "Language-Team: Thai (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "กำลังอ่านค่าผู้ใช้และกลุ่ม  กรรุณารอสักครู่"
@@ -128,7 +128,7 @@ msgstr "ใช้ตัวกรอง"
 msgid "Users"
 msgstr "ผู้ใช้"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "กลุ่ม"
@@ -149,7 +149,7 @@ msgstr "ชื่อผู้ใช้"
 msgid "User ID"
 msgstr "รหัสผู้ใช้"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "กลุ่มแรก"
@@ -209,7 +209,7 @@ msgstr "เพิ่มกลุ่ม"
 msgid "Add a group to the system"
 msgstr "เพิ่มกลุ่มเข้าระบบ"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "ปรับแต่ง"
@@ -219,7 +219,7 @@ msgstr "ปรับแต่ง"
 msgid "Edit selected row"
 msgstr "ปรับแต่งบรรทัดที่เลือก"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "ลบ"
@@ -239,57 +239,57 @@ msgstr "อ่านค่าใหม่"
 msgid "Refresh the list"
 msgstr "อ่านค่ารายการใหม่"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "ล็อก"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "หมดอายุ"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "กดที่รูปเพื่อเปลี่ยนแปลง"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "สร้างผู้ใช้ใหม่"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "สร้าง Home Directory"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Home Directory: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "สร้างกลุ่มส่วนตัวสำหรับผู้ใช้"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "ระบุรหัสผู้ใช้เอง"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "ชื่อนี้มีแล้วกรุณาใช้ชื่ออื่น"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "รหัสลับไม่ถูกต้อง"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -298,12 +298,12 @@ msgstr ""
 "รหัสลับนี้ง่ายเกินไป\n"
 "รหัสที่ดีต้องมีตัวหนังสือมากกว่า 6 "
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "รหัสผู้ใช้น้อยกว่า 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -314,27 +314,39 @@ msgstr ""
 "คุณแน่ใจหรือที่จะสร้าง\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "ใส่ %s เข้าไปที่กลุ่ม 'user' "
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "สร้างกลุ่มใหม่ %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "เพิ่มผู้ใช้: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Home Directory: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Migration wizard"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -343,64 +355,64 @@ msgstr ""
 "คุณต้องการรัน migration wizard เพื่อนำเข้าเอกสารและการตั้งค่าจากวินโดวส์ของคุณไปไว้ใน "
 "Mageia distribution หรือไม่?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "ตกลง"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "รหัส: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "เลือกกลุ่ม"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "เพิ่มเข้ากลุ่มที่มีอยู่แล้ว"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "เพิ่มไปที่กลุ่ม 'users'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "ชื่อกลุ่มนี้มีแล้ว คุณจะทำอย่างไรต่อ"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "สร้างกลุ่มใหม่"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "ระบุรหัสกลุ่มเอง"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "ชื่อกลุ่มนี้มีอยู่แล้ว กรุณาเลือกชื่ออื่น"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "รหัสกลุ่มน้อยกว่า 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -411,22 +423,22 @@ msgstr ""
 "คุณแน่ใจหรือที่จะสร้าง\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "เพิ่มกลุ่ม: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "รหัสกลุ่ม:"
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "ลบไฟล์หรือไม่"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -435,27 +447,27 @@ msgstr ""
 "กำลังลบผู้ใช้ %s\n"
 "และกำลังทำงานสิ่งต่อไปนี้\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "ลบ Home Directory: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "ลบ Mailbox :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "ลบผู้ใช้: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "คุณแน่ใจหรือที่จะลบกลุ่ม %s"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -464,47 +476,47 @@ msgstr ""
 "%s คือกลุ่มแรกของ %s\n"
 " ลบผู้ใช้นี้ก่อน"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "ลบกลุ่ม: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "ชื่อเต็ม:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "รหัสลับ:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "ยืนยันรหัสลับ:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "ล็อกอินเชล:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "ชื่อกลุ่ม:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "กรุณาเลือกอย่างน้อยหนึ่งกลุ่มสำหรับผู้ใช้"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -513,159 +525,159 @@ msgstr ""
 "กรุณาระบุ ปี เดือน และวัน\n"
 "ที่บัญชีจะหมดอายุ "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "กรุณากรอกทุกช่องในอายุของรหัสลับ\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "คุณไม่สามารถลบผู้ใช้ '%s' จากกลุ่มแรกของเขา"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Home:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "ข้อมูลผู้ใช้"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "ใช้งานการจับเวลาวันหมดอายุของบัญชี"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "บัญชีหมดอายุ (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "ล็อกบัญชีผู้ใช้"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "ข้อมูลบัญชี"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "ผู้ใช้เปลี่ยนรหัสลับครั้งสุดท้ายเมื่อ :"
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "ใช้งานวันหมดอายุของรหัสลับ"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "จำนวนวันก่อนที่จะเปลี่ยนได้:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "จำนวนวันก่อนเปลี่ยนที่ต้องการ:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "จำนวนวันที่จะเตือนก่อนเปลี่ยน:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr ":จำนวนวันก่อนบัญชีจะใช้งานไม่ได้"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "ข้อมูลรหัสลับ"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "เลือกกลุ่มที่ผู้ใช้จะเป็นสมาชิก"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "ข้อมูลกลุ่ม"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "เลือกผู้ใช้สำหรับกลุ่มนี้:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "กลุ่มผู้ใช้"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "แก้ใขกลุ่ม / ผู้ใช้"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "มีปัญหาเกิดขึ้น:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "ปิด"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "สงวนลิขสิทธิ์ (C) %s โดย Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "สงวนลิขสิทธิ์ (C) %s โดย Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "การบริหารผู้ใช้"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Rockers <sumorock@hotmail.com>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "ไม่มีชื่อ กรุณาใส่ชื่อด้วย"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "ชื่อต้องเป็นตัวหนังสือลาตินแบบตัวเล็ก ตัวเลข `-' และ `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "ชื่อยาวเกินไป"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "เกิดการผิดพลาด"
@@ -678,72 +690,72 @@ msgstr "เรียกโปรแกรมจัดการผู้ใช้
 msgid "Authentication is required to run Mageia User Manager"
 msgstr "ต้องผ่านการยืนยันตัวบุคคลก่อนเพื่อรันโปรแกรมจัดการผู้ใช้งานของ Mageia"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "การสร้างบัญชีผู้ใช้ล้มเหลว: '%s'\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "ไม่สามารถขอรับหมายเลข UID"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "ไม่สามารถรับข้อมูลเกี่ยวกับค่า"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "เกิดการผิดพลาดเวลาสร้าง `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "เกิดการผิดพลาดเวลาสร้าง mail spool: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "ไม่สามารถแก้ไขผู้ใช้: '%s'\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "ไม่สามารถลบผู้ใช้: '%s'\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "ไม่สามารถตั้งรหัสผ่าน: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "เกิดการผิดพลาดแบบไม่ทราบสาเหตุ"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "การสร้างกลุ่มล้มเหลว\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "ไม่สามารถแก้ไขกลุ่ม: '%s'\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "ไม่สามารถลบกลุ่ม: '%s'\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "ไม่มีไดเรกทอรีโฮมสำหรับผู้ใช้\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "ไม่สามารถลบไดเรกทอรีบ้านได้: '%s'\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "เกิดการผิดพลาดเวลาลบ mail spool: %s\n"
diff --git a/po/tl.po b/po/tl.po
index d3d7927..dd9a443 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-tl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2005-01-25 08:11+0000\n"
 "Last-Translator: Arys P. Deloso <arys@deloso.org>\n"
 "Language-Team: Filipino <salin@pandaypinoy.org>\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Nilo-load ang mga User at Grupo... Pakihintay"
@@ -127,7 +127,7 @@ msgstr "I-apply ang pangsala"
 msgid "Users"
 msgstr "Mga user"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Mga grupo"
@@ -148,7 +148,7 @@ msgstr "Pangalan ng User"
 msgid "User ID"
 msgstr "User ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Pangunahing Grupo"
@@ -208,7 +208,7 @@ msgstr "Magdagdag ng Grupo"
 msgid "Add a group to the system"
 msgstr "Magdagdag ng grupo sa sistema"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "I-edit"
@@ -218,7 +218,7 @@ msgstr "I-edit"
 msgid "Edit selected row"
 msgstr "I-edit ang piniling hanay (row)"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Alisin"
@@ -238,57 +238,57 @@ msgstr "Sariwain"
 msgid "Refresh the list"
 msgstr "Sariwain ang talaan"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Naka-lock"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Wala ng bisa"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "I-click ang icon para baguhin ito"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Gumawa ng Bagong User"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Gumawa ng Tahanang Directory"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Tahanang Directory: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Gumawa ng pribadong grupo para sa user"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Mano-manong banggitin ang user ID"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Mayroon nang User, pakiusap, pumili ng ibang Pangalan ng User"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Password Di-tugma"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -297,12 +297,12 @@ msgstr ""
 "Itong password ay sobrang simple. \n"
 " Ang mga magandang password ay dapat > 6 character"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "User Uid ay < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -313,92 +313,104 @@ msgstr ""
 " Sigurado ka bang gusto mong gawin ito?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Nilalagay ang %s sa 'users' na grupo"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Ginagawa ang bagong grupo: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Idinadagdag ang user: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Tahanang Directory: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Kanselahin"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Pumili ng grupo"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Idagdag sa mayroon nang grupo"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Idagdag sa 'users' na grupo"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 "Mayroon nang grupo na may ganitong pangalan.  Ano ang gusto mong gawin?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Gumawa ng Bagong Grupo"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Mano-manong banggitin ang ID ng grupo"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Mayroon nang Grupo, pakiusap, pumili ng ibang Pangalan ng Grupo"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " Gid ng Grupo ay < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -409,22 +421,22 @@ msgstr ""
 " Sigurado ka bang gusto mong gawin ito?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Idinadagdag ang grupo: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Alisin ang mga file o hindi?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -433,27 +445,27 @@ msgstr ""
 "Inaalis ang user %s\n"
 " At saka gawin ang mga sumusunod na aksyon\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Alisin ang Tahanang Directory: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Alisin ang Mailbox :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Inaalis ang user: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Gusto ma ba talagang alisin ang grupo na %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -462,47 +474,47 @@ msgstr ""
 "%s ay isang pangunahing grupo para sa user na %s\n"
 " Alisin muna ang user"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Inaalis ang grupo: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Buong Pangalan:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Password:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Ulitin ang Password:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Login Shell:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Pangalan ng Grupo:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Pakiusap, pumili ng isa man lang na grupo para sa user"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -511,148 +523,148 @@ msgstr ""
 "Pakibanggit ang Taon, Buwan at Araw \n"
 " para sa Pagkawala ng bisa ng Account "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Pakipuno lahat ng mga field sa pagtanda ng password\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Hindi mo maaalis ang user na '%s' mula sa kanilang pangunahing grupo"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Tahanan:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "User Data"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Paganahin ang pag-expire (walang bisa) ng account"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Mawawalang bisa (TTTT-BB-AA):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "I-lock ang Account ng User"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Inpormasyon sa Account"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Huling binago ng user ang password noong : "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Paganahin ang pag-expire (walang bisa) ng password"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Araw bago payagan pagbabago    :"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Araw bago kailanganing baguhin  :"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Araw ng pagbabala bago baguhin :"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Araw bago inactive ang account    :"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Inpormasyon sa Password"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Piliin ang mga grupo na magiging kasapi ang user:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Group Data"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Piliin ang mga user na sasali sa grupong ito :"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Mga User ng Grupo"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "I-Edit ang mga Grupo / User"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "May \"error\" na nangyari"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Isara"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Pangangasiwa ng mga User"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Arys P. Deloso <arys@deloso.org>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Ang field na Pangalan ay walang laman, magbigay ng pangalan"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
@@ -660,12 +672,12 @@ msgstr ""
 "Ang pangalan ay dapat maglaman lamang ng maliliit na latin na titik, bilang, "
 "`-' at `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Sobrang haba ng pangalan"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Error"
@@ -679,73 +691,73 @@ msgstr "Mageia Users Management Tool"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, fuzzy, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Hindi magawa ang mail spool.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Hindi magawa ang `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Hindi magawa ang mail spool: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, fuzzy, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Hindi magawa ang mail spool.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "di-alam na kamalian"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 #, fuzzy
 msgid "Group creation failed.\n"
 msgstr "Hindi magawa ang mail spool.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Hindi matanggal ang mail spool: %s\n"
diff --git a/po/tr.po b/po/tr.po
index 92db00b..dbf711b 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2013-11-05 22:34+0300\n"
 "Last-Translator: Atilla ÖNTAŞ <tarakbumba@gmail.com>\n"
 "Language-Team: Mageia Turkish Translation Team <i18n-tr@ml.mageia.org>\n"
@@ -23,12 +23,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Virtaal 0.7.1\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Kullanıcı ve Gruplar Yükleniyor... Lütfen bekleyin"
@@ -133,7 +133,7 @@ msgstr "Filtreyi uygula"
 msgid "Users"
 msgstr "Kullanıcılar"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Gruplar"
@@ -154,7 +154,7 @@ msgstr "Kullanıcı Adı"
 msgid "User ID"
 msgstr "Kullanıcı ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Birincil Grup"
@@ -214,7 +214,7 @@ msgstr "Grup Ekle"
 msgid "Add a group to the system"
 msgstr "Sisteme bir kullanıcı ekler"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Düzenle"
@@ -224,7 +224,7 @@ msgstr "Düzenle"
 msgid "Edit selected row"
 msgstr "Seçili sırayı süzenler"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Sil"
@@ -244,57 +244,57 @@ msgstr "Tazele"
 msgid "Refresh the list"
 msgstr "Listeyi tazeler"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Kilitli"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Hükmünü yitirmiş"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Değiştirmek için simgesine tıklayın"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Yeni Kullanıcı Oluştur"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Ev Dizini Oluştur"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Ev Dizini: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Kullanıcılar için özel bir grup oluştur"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Kullanıcının ID'sini elle belirle"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Kullanıcı zaten mevcut, lütfen bir başka Kullanıcı Adı seçin"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Parolalar uyuşmuyor"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -303,12 +303,12 @@ msgstr ""
 "Bu parola çok basit. \n"
 " İyi bir parola en az 6 karakterden oluşturulmalıdır"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Kullanıcı adı 1000 'den küçükj"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -320,27 +320,39 @@ msgstr ""
 " Bunu yapmak istediğinize emin misiniz ?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "%s 'users' grubuna koyuluyor"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Oluşturulan yeni grup: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Eklenen kullanıcı: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Ev Dizini: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Göç sihirbazı"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -349,90 +361,91 @@ msgstr ""
 "Windows belge ve seçeneklerinizi Mageia dağıtımına aktarmak için göç "
 "sihirbazını çalıştırmak istiyor musunuz?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Vazgeç"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Tamam"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Grup seçin"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Var olan bir gruba ekle"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "'users' grubuna ekle"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Bu isimde zaten bir grup mevcut .  Ne yapmak istersiniz ?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Yeni Grup Oluştur"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Grup ID'sini elle belirle"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Grup zaten mevut, lütfen bir başka Grup ismi seçin"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " Grup Gid 1000 'den küçük"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
-"Grup ID'si 1000 sayisindan küçük bir grup oluşturmak tavsiye edilmemektedir.\n"
+"Grup ID'si 1000 sayisindan küçük bir grup oluşturmak tavsiye "
+"edilmemektedir.\n"
 " Bunu yapmak istediğinize emin misiniz ?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Eklenen grup: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Dosyaları silinsin mi yoksa silinmesin mi?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -441,27 +454,27 @@ msgstr ""
 "%s Kullanıcısı siliniyor\n"
 " Sonrasında şu eylemler gerçekleştirilecek\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Ev Dizinini Sil: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Posta Kutusunu Sil :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Kaldırılan kullanıcı: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "%s grubunu gerçekten silmek istiyor musunuz?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -470,47 +483,47 @@ msgstr ""
 "%s grubu %s kullanıcısı için birincil gruptur\n"
 " Önce kullanıcıyı çıkartın"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Kaldırılan Grup: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Tam isim:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Giriş:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Parola:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Parolayı Tekrarla:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Giriş Kabuğu:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Grup Adı:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Lütfen kullanıcı için en az bir grup seçiniz"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -519,159 +532,159 @@ msgstr ""
 "Lütfen hesabın hükmünü yitireceği Yılı, \n"
 "Ayı ve Günü belirtin "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Lütfen şifre bölümündeki tüm bilgileri doldurunuz\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "'%s' kullanıcısını onların birincil grubundan çıkartamazsınız"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Ev:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Kullanıcı Verisi"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Hesabın hüküm yitirmesine imkan ver"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Hesabın sonlanması (YYYY-AA-GG):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Kullanıcı Hesabını Kilitle"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Hesap bilgisi"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Kullanıcı en son şu tarihte şifre değiştirdi : "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Parolanın hüküm yitirmesine imkan ver"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Değişikliğe kaç gün sonra izin verilecek"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Kaç gün sonra değiştirecek"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Değiştirmeden kaç gün önce uyarılacak :"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Hesap kaç gün sonra kapatılacak :"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Parola bilgisi"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Kullanıcının üyesi olacağı grupları seçiniz:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Grup Verisi"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Gruba eklenecek kullanıcıları seçin :"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Grup Kullanıcıları"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Grupları / Kullanıcıları Düzenle"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Bir hata oluştu:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Kapat"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Tüm Hakları Saklıdır (C) %s Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Copyright (C) %s. Bir Mageia ürünüdür."
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Kullanıcı Yönetimi"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Taha Özket <taha.ozket@obss.net> 2007\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "İsim alanı boş bırakılmış lütfen uygun şekilde doldurunuz"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "İsim sadece ufak latin harflerini , '-' ve '_' işaretlerini içerebilir"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "İsim çok uzun"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Hata"
@@ -685,72 +698,72 @@ msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 "Mageia Kullanıcı Yöneticisi' ni çalıştırmak için kimlik doğrulama gerekli"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Hesap oluşturma işlemi başarısız oldu: '%s'.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Uid numarası alınamıyor"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Değer alınamıyor"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Yaratılırken hata `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Yeni posta kuyruğu yaratma hatası: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Kullanıcı düzenlenemez: '%s'.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Kullanıcı Silinemez: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Parola ayarlanamadı: '%s'.\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Grup oluşturma işlemi başarısız oldu.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Grup düzenlenemez: '%s'.\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Grup silinemez: '%s'.\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "Kullanıcı için bir Ev dizini yok.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Ev Dizini silinemez: '%s'.\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Posta kuyruğu silme hatası: %s\n"
diff --git a/po/uk.po b/po/uk.po
index b3baf5f..2115d28 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2013-11-16 22:53+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
@@ -26,12 +26,12 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Завантажуються Користувачі і групи... Зачекайте, будь ласка"
@@ -136,7 +136,7 @@ msgstr "Застосувати фільтр"
 msgid "Users"
 msgstr "Користувачі"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Групи"
@@ -157,7 +157,7 @@ msgstr "Ім'я користувача"
 msgid "User ID"
 msgstr "Код користувача"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Первинна група"
@@ -219,7 +219,7 @@ msgstr "Додати групу"
 msgid "Add a group to the system"
 msgstr "Додати групу в систему"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Виправити"
@@ -229,7 +229,7 @@ msgstr "Виправити"
 msgid "Edit selected row"
 msgstr "Виправити вибраний рядок"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Видалити"
@@ -249,57 +249,57 @@ msgstr "Поновити"
 msgid "Refresh the list"
 msgstr "Поновити список"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Заблоковано"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Термін закінчився"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Клацніть на піктограмі, щоб змінити"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Створити нового користувача"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Створити домівку користувача"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Домівка користувача: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Створити особисту групу для користувача"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Задати код користувача вручну"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Такий користувач вже є, будь ласка, задайте інше ім'я користувача"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Паролі не збігаються"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -308,12 +308,12 @@ msgstr ""
 "Цей пароль занадто простий. \n"
 " Хороший пароль повинен мати більше 6 символів"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Код користувача менший за 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -324,27 +324,39 @@ msgstr ""
 " Ви впевнені, що хочете зробити саме так?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Додається %s в групу 'users'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Створюється нова група: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Додається користувач: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Домівка користувача: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Помічник переходу"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -353,64 +365,64 @@ msgstr ""
 "Чи хочете запустити Помічника переходу, щоб імпортувати налаштування і "
 "документи Віндовс у Мандріва Лінакс?"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Гаразд"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "Код користувача: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Виберіть групу"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Додати в існуючу групу"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Додати в групу 'users'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Група з такою назвою вже існує. Що хочете зробити?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Створити нову групу"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Задати код групи вручну"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Група вже існує, будь ласка, вкажіть іншу назву групи"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "Код групи менший за 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -421,22 +433,22 @@ msgstr ""
 " Ви впевнені, що хочете зробити саме так?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Додається група: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "Код групи: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Видалити файли, чи ні?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -445,27 +457,27 @@ msgstr ""
 "Вилучається користувач %s\n"
 " Також виконуються наступні дії\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Видалити домівку користувача: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Видалити поштову скриньку :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Вилучається користувач: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Ви справді хочете видалити групу %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -474,47 +486,47 @@ msgstr ""
 "%s є первинною групою для користувача %s\n"
 " Спочатку вилучіть користувача"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Вилучається група: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Ім’я повністю:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Користувач:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Підтвердіть пароль:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Командна оболонка:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Назва групи:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Будь ласка, виберіть хоч одну групу для користувача"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -523,160 +535,160 @@ msgstr ""
 "Будь ласка, задайте рік, місяць і день \n"
 " закінчення дії облікового запису "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Будь ласка, заповніть всі поля, щоб встановити термін дії пароля\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Ви не можете вилучити користувача '%s' з його первинної групи"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Домівка:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Дані користувача"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Увімкнути обмеження облікових записів"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Термін дії облікового запису закінчується (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Заблокувати обліковий запис"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Інформація про користувачів"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Остання зміна пароля користувачем: "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Увімкнути обмеження терміну дії пароля"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Дозволено днів перед зміною :"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Необхідно днів перед зміною :"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Днів попередження перед зміною :"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Днів до завершення дії облікового запису:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Інформація про пароль"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Виберіть групи, членом яких буде користувач:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Дані групи"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Виберіть користувачів, яких включити в цю групу :"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Згрупувати користувачів"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Редагувати Групи / Користувачів"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Сталася помилка:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Закрити"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Авторські права належать © Mageia, %s"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Керування користувачами"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Taras Boychuk <btr0001@ukr.net>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Поле з назвою порожнє, будь ласка, введіть назву."
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 "Назва може складатися тільки з малих латинських літер, цифр, `-' та `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Назва занадто довга"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Помилка"
@@ -691,72 +703,72 @@ msgstr ""
 "Щоб запустити засіб керування обліковими записами користувачів Mageia, слід "
 "пройти розпізнавання"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Спроба створення облікового запису зазнала невдачі: «%s».\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Не вдалося отримати номер Uid"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "Не вдалося отримати значення"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Помилка при створенні `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Помилка при створенні поштової низки: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Не вдалося змінити параметри запису користувача: «%s».\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "Не вдалося вилучити запис користувача: «%s».\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "Не вдалося встановити пароль: «%s».\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "невідома помилка"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "Помилка під час спроби створення групи.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "Не вдалося змінити параметри групи: «%s».\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "Не вдалося вилучити групу: «%s».\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "У цього користувача немає домашньої теки.\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "Не вдалося вилучити домашню теку: «%s».\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Помилка під час вилучення поштового буфера: %s\n"
diff --git a/po/userdrake.pot b/po/userdrake.pot
index 6059ffc..52d1975 100644
--- a/po/userdrake.pot
+++ b/po/userdrake.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+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"
@@ -15,12 +15,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr ""
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr ""
@@ -125,7 +125,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr ""
@@ -146,7 +146,7 @@ msgstr ""
 msgid "User ID"
 msgstr ""
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr ""
@@ -206,7 +206,7 @@ msgstr ""
 msgid "Add a group to the system"
 msgstr ""
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr ""
@@ -216,7 +216,7 @@ msgstr ""
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr ""
@@ -236,69 +236,69 @@ msgstr ""
 msgid "Refresh the list"
 msgstr ""
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr ""
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr ""
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr ""
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr ""
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr ""
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr ""
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -306,87 +306,97 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr ""
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr ""
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr ""
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, c-format
+msgid "Home directory already exists"
+msgstr ""
+
+#: ../userdrake:589
+#, c-format
+msgid "The requested home directory already exists. Would you like to preserve the existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid "Do you want to run the migration wizard in order to import Windows documents and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702 ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796 ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195 ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289 ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr ""
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr ""
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr ""
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr ""
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -394,254 +404,254 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr ""
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr ""
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
 " Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr ""
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr ""
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr ""
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr ""
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr ""
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr ""
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr ""
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr ""
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr ""
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr ""
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr ""
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr ""
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr ""
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr ""
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr ""
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr ""
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr ""
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr ""
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr ""
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr ""
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr ""
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr ""
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr ""
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr ""
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr ""
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr ""
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr ""
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr ""
@@ -654,72 +664,72 @@ msgstr ""
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr ""
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr ""
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr ""
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr ""
diff --git a/po/uz.po b/po/uz.po
index de32745..e8927c1 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2003-11-16 10:52+0100\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -26,12 +26,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake - foydalanuvchilarni boshqarish"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Foydalanuvchi va guruhlar yuklanmoqda, iltimos kutib turing..."
@@ -136,7 +136,7 @@ msgstr "Filterni qo'llash"
 msgid "Users"
 msgstr "Foydalanuvchilar"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Guruhlar"
@@ -157,7 +157,7 @@ msgstr "Foydalanuvchi"
 msgid "User ID"
 msgstr "Foydalanuvchining ID'si"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Asosiy guruh"
@@ -217,7 +217,7 @@ msgstr "Guruhni qo'shish"
 msgid "Add a group to the system"
 msgstr "Sistemaga guruhni qo'shish"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Tuzatish"
@@ -227,7 +227,7 @@ msgstr "Tuzatish"
 msgid "Edit selected row"
 msgstr "Belgilangan qatorni tuzatish"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "O'chirish"
@@ -247,58 +247,58 @@ msgstr "Yangilash"
 msgid "Refresh the list"
 msgstr "Ro'yxatni yangilash"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Qulflangan"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Muddati o'tgan"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Buni o'zgartirish uchun nishonchani bosing"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Yangi foydalanuvchini yaratish"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Uy direktoriyani yaratish"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Uy direktoriyasi: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Foydalanuvchi uchun shaxsiy guruhni yaratish"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr ""
 "Foydalanuvchi allaqachon mavjud, iltimos boshqa foydalanuvchini tanlang"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Maxfiy so'z mos kelmadi"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -307,12 +307,12 @@ msgstr ""
 "Bu maxfiy so'z juda sodda. \n"
 "Yaxshi maxfiy so'z 6 belgidan ko'p bo'lishi kerak"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Foydalanuvchining UID'si 1000 dan kam"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -323,91 +323,103 @@ msgstr ""
 " Buni bajarishga ishonchingiz komilmi?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "%s \"users\" guruhiga qo'shilmoqda"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Yangi guruh yaratilmoqda: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Foydalanuvchi qo'shilmoqda: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Uy direktoriyasi: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Bekor qilish"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, fuzzy, c-format
 msgid "Choose group"
 msgstr "Guruhni tanlang"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Mavjud bo'lgan guruhga qo'shish"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "\"users\" guruhiga qo'shish"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Bunday nomli guruh allaqachon mavjud. Siz nimani bajarishni istaysiz?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Yangi guruhni yaratish"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Guruh allaqachon mavjud, iltimos boshqa guruh nomini tanlang"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "Guruhning GID'si 1000 dan kam"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -418,22 +430,22 @@ msgstr ""
 " Buni bajarishga ishonchingiz komilmi?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Guruh qo'shilmoqda: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, fuzzy, c-format
 msgid "Delete files or not?"
 msgstr "Belgilangan qatorni o'chirish"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -442,27 +454,27 @@ msgstr ""
 "Foydalanuvchi %s o'chirilmoqda\n"
 " Budan tashqari quyidagi amallarni bajarish\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Uy direktoriyasini o'chirish: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Pochta qutisini o'chirish :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Foydalanuvchi olib tashlanmoqda: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Rostdan \"%s\" guruhini o'chirmoqchimisiz?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -471,47 +483,47 @@ msgstr ""
 "Guruh %s foydalanuvchi %s uchun asosiy\n"
 " Avvalo foydalanuvchini o'chiring"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Guruh olib tashlanmoqda: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "To'liq ismi:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Foydalanuvchi:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Maxfiy so'z:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Maxfiy so'zni tasdiqlang:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Kirish konsoli:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Guruhning nomi:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Iltimos foydalanuvchi uchun eng kamida bitta guruhni tanlang"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -520,148 +532,148 @@ msgstr ""
 "Iltimos hisob muddati o'tish\n"
 " yilni, oyni va kunni ko'rsating "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr ""
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Foydalanuvchini \"%s\" asosiy guruhidan o'chirib bo'lmaydi"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Uy direktoriya:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Foydalanuvchining ma'lumotlari"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Hisob muddati o'tishini yoqish"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Hisobning muddati o'tadi (YYYY-OO-KK):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Foydalanuvchining hisobini qulflash"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Hisob haqida ma'lumot"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Foydalanuvchi oxirgi marta maxfiy so'zni o'zgartirgan sana : "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Maxfiy so'z muddati o'tishini yoqish"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Shuncha kundan so'ng o'zgartirish mumkin :"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Shuncha kundan so'ng o'zgartirish talab qilinadi :"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr ""
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Shuncha kundan so'ng hisob qulflanadi :"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Maxfiy so'z haqida ma'lumot"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Foydalanuvchi a'zo bo'ladigan guruhni tanlang:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Guruhning ma'lumoti"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Bu guruhga a'zo bo'ladigan foydalanuvchilarni tanlang:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Guruh foydalanuvchilari"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, fuzzy, c-format
 msgid "Edit Groups / Users"
 msgstr "Guruh foydalanuvchilari"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Xato roʻy berdi:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Yopish"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, fuzzy, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Foydalanuvchilar boshqaruvi"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Mashrab Quvatov <kmashrab@uni-bremen.de>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Foydalanuvchi maydoni bo'sh. Iltimos foydalanuvchini kiriting."
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
@@ -669,12 +681,12 @@ msgstr ""
 "Foydalanuvchi faqat kichik lotin harflar, sonlar. \"-\" va \"_\" "
 "belgilaridan iborat bo'lishi mumkin"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Foydalanuvchining ismi juda uzun"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Xato"
@@ -688,72 +700,72 @@ msgstr "Mageia uchun foydalanuvchilarni boshqarish vositasi"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr ""
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "noma'lum xato"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr ""
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr ""
diff --git a/po/uz@cyrillic.po b/po/uz@cyrillic.po
index e051af2..e38eab3 100644
--- a/po/uz@cyrillic.po
+++ b/po/uz@cyrillic.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2003-11-16 10:52+0100\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -26,12 +26,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake - фойдаланувчиларни бошқариш"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Фойдаланувчи ва гуруҳлар юкланмоқда, илтимос кутиб туринг..."
@@ -136,7 +136,7 @@ msgstr "Филтерни қўллаш"
 msgid "Users"
 msgstr "Фойдаланувчилар"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Гуруҳлар"
@@ -157,7 +157,7 @@ msgstr "Фойдаланувчи"
 msgid "User ID"
 msgstr "Фойдаланувчининг ID'си"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Асосий гуруҳ"
@@ -217,7 +217,7 @@ msgstr "Гуруҳни қўшиш"
 msgid "Add a group to the system"
 msgstr "Системага гуруҳни қўшиш"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Тузатиш"
@@ -227,7 +227,7 @@ msgstr "Тузатиш"
 msgid "Edit selected row"
 msgstr "Белгиланган қаторни тузатиш"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Ўчириш"
@@ -247,57 +247,57 @@ msgstr "Янгилаш"
 msgid "Refresh the list"
 msgstr "Рўйхатни янгилаш"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Қулфланган"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Муддати ўтган"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Буни ўзгартириш учун нишончани босинг"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Янги фойдаланувчини яратиш"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Уй директорияни яратиш"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Уй директорияси: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Фойдаланувчи учун шахсий гуруҳни яратиш"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Фойдаланувчи аллақачон мавжуд, илтимос бошқа фойдаланувчини танланг"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Махфий сўз мос келмади"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -306,12 +306,12 @@ msgstr ""
 "Бу махфий сўз жуда содда. \n"
 "Яхши махфий сўз 6 белгидан кўп бўлиши керак"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "Фойдаланувчининг UID'си 1000 дан кам"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -322,91 +322,103 @@ msgstr ""
 " Буни бажаришга ишончингиз комилми?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "%s \"users\" гуруҳига қўшилмоқда"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Янги гуруҳ яратилмоқда: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Фойдаланувчи қўшилмоқда: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Уй директорияси: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Бекор қилиш"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "Ок"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, fuzzy, c-format
 msgid "Choose group"
 msgstr "Гуруҳни танланг"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Мавжуд бўлган гуруҳга қўшиш"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "\"users\" гуруҳига қўшиш"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Бундай номли гуруҳ аллақачон мавжуд. Сиз нимани бажаришни истайсиз?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Янги гуруҳни яратиш"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Гуруҳ аллақачон мавжуд, илтимос бошқа гуруҳ номини танланг"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "Гуруҳнинг GID'си 1000 дан кам"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -417,22 +429,22 @@ msgstr ""
 " Буни бажаришга ишончингиз комилми?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Гуруҳ қўшилмоқда: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, fuzzy, c-format
 msgid "Delete files or not?"
 msgstr "Белгиланган қаторни ўчириш"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -441,27 +453,27 @@ msgstr ""
 "Фойдаланувчи %s ўчирилмоқда\n"
 " Будан ташқари қуйидаги амалларни бажариш\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Уй директориясини ўчириш: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Почта қутисини ўчириш :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Фойдаланувчи олиб ташланмоқда: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Ростдан \"%s\" гуруҳини ўчирмоқчимисиз?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -470,47 +482,47 @@ msgstr ""
 "Гуруҳ %s фойдаланувчи %s учун асосий\n"
 " Аввало фойдаланувчини ўчиринг"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Гуруҳ олиб ташланмоқда: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Тўлиқ исми:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Фойдаланувчи:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Махфий сўз:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Махфий сўзни тасдиқланг:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Кириш консоли:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Гуруҳнинг номи:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Илтимос фойдаланувчи учун энг камида битта гуруҳни танланг"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -519,148 +531,148 @@ msgstr ""
 "Илтимос ҳисоб муддати ўтиш\n"
 " йилни, ойни ва кунни кўрсатинг "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr ""
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Фойдаланувчини \"%s\" асосий гуруҳидан ўчириб бўлмайди"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Уй директория:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Фойдаланувчининг маълумотлари"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Ҳисоб муддати ўтишини ёқиш"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Ҳисобнинг муддати ўтади (ЙЙЙЙ-ОО-КК):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Фойдаланувчининг ҳисобини қулфлаш"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Ҳисоб ҳақида маълумот"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Фойдаланувчи охирги марта махфий сўзни ўзгартирган сана : "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Махфий сўз муддати ўтишини ёқиш"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Шунча кундан сўнг ўзгартириш мумкин :"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Шунча кундан сўнг ўзгартириш талаб қилинади :"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr ""
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Шунча кундан сўнг ҳисоб қулфланади :"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Махфий сўз ҳақида маълумот"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Фойдаланувчи аъзо бўладиган гуруҳни танланг:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Гуруҳнинг маълумоти"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Бу гуруҳга аъзо бўладиган фойдаланувчиларни танланг:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Гуруҳ фойдаланувчилари"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, fuzzy, c-format
 msgid "Edit Groups / Users"
 msgstr "Гуруҳ фойдаланувчилари"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Хато рўй берди:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Ёпиш"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, fuzzy, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Фойдаланувчилар бошқаруви"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Машраб Қуватов <kmashrab@uni-bremen.de>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Фойдаланувчи майдони бўш. Илтимос фойдаланувчини киритинг."
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
@@ -668,12 +680,12 @@ msgstr ""
 "Фойдаланувчи фақат кичик лотин ҳарфлар, сонлар. \"-\" ва \"_\" белгиларидан "
 "иборат бўлиши мумкин"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Фойдаланувчининг исми жуда узун"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Хато"
@@ -687,72 +699,72 @@ msgstr "Mageia учун фойдаланувчиларни бошқариш во
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr ""
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "номаълум хато"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr ""
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index f6d5d0e..48a2706 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-vi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2004-08-21 09:06+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Đang nạp Nhóm và Người Dùng... Hãy đợi"
@@ -126,7 +126,7 @@ msgstr "Áp dụng trình lọc"
 msgid "Users"
 msgstr "Người dùng"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Nhóm"
@@ -147,7 +147,7 @@ msgstr "Tên Người Dùng"
 msgid "User ID"
 msgstr "ID Người Dùng"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Nhóm chính"
@@ -207,7 +207,7 @@ msgstr "Thêm Nhóm"
 msgid "Add a group to the system"
 msgstr "Thêm nhóm vào hệ thống"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Biên soạn"
@@ -217,7 +217,7 @@ msgstr "Biên soạn"
 msgid "Edit selected row"
 msgstr "Hiệu chỉnh hàng chọn"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Xóa"
@@ -237,57 +237,57 @@ msgstr "Cập nhật"
 msgid "Refresh the list"
 msgstr "Cập nhật lại Danh sách"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Bị khoá"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Hết hạn"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Nhấn chuột lên biểu tượng để thay đổi"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Tạo người dùng mới"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Tạo thư mục home"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Thư mục home:"
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Tạo nhóm riêng cho người dùng"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Tự định ra ID người dùng"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Người dùng này đã có rồi, hãy chọn tên người dùng khác"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Mật khẩu không khớp"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -296,12 +296,12 @@ msgstr ""
 "Mật khẩu quá đơn giản. \n"
 "Mật khẩu tốt phải có nhiều hơn 6 ký tự"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "UID người dùng là < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -312,91 +312,103 @@ msgstr ""
 "Bạn có chắc là muốn làm vậy không?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Đặt %s vào nhóm 'users'"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Tạo nhóm mới: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Thêm người dùng: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Thư mục home:"
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Bỏ qua"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Chọn nhóm"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Thêm vào nhóm đang tồn tại"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Thêm vào nhóm 'users'"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Đang có nhóm tồn tại với tên này. Bạn muốn làm gì?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Tạo Nhóm Mới"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Tự định ra ID nhóm"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Nhóm đang tồn tại rồi, hãy chọn một tên nhóm khác"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "GID nhóm là < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -407,22 +419,22 @@ msgstr ""
 " Bạn có chắc là muốn làm như vậy?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Thêm nhóm:  %s"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Xóa các tập tin hay không?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -431,27 +443,27 @@ msgstr ""
 "Xóa người dùng %s\n"
 "Cũng thực hiện cả hành động sau đây\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Xóa thư mục home: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Xóa hộp thư :/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Xóa bỏ người dùng: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Bạn thật sự muốn xoá nhóm %s không?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -460,47 +472,47 @@ msgstr ""
 "%s là nhóm chính cho người dùng %s\n"
 "Hãy xoá bỏ người dùng trước"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Xóa bỏ nhóm: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "Tên Đầy Đủ:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "Đăng nhập:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Mật khẩu:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Xác Nhận Mật Khẩu:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell Đăng nhập:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "Tên Nhóm:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Hãy chọn ít nhất một nhóm cho người dùng"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -509,159 +521,159 @@ msgstr ""
 "Hãy chỉ ra Năm, Tháng, Ngày cho \n"
 "thời hạn của Tài Khoản"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "Hãy điền đủ các trường trong thời hạn mật khẩu\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Bạn không thể xoá bỏ người dùng '%s' ra khỏi nhóm chính của nó"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Home:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Dữ Liệu Người Dùng"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Tính thời hạn của người dùng"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Hạn người dùng (YYYY-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Khoá Tài Khoản Người Dùng"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Thông tin tài khoản"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "Mật khẩu người dùng thay đổi lần cuối vào:"
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Tính thời hạn của mật khẩu"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Số ngày trước khi cho phép đổi:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Số ngày trước khi yêu cầu đổi :"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Cảnh báo số ngày trước khi đổi :"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Ngày trước khi tài khoản không hoạt động:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Thông Tin Mật Khẩu"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Chọn nhóm để người dùng trở thành thành viên:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Dữ Liệu Nhóm"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Chọn người dùng tham gia vào nhóm này:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Người Dùng Nhóm"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Hiệu chỉnh Người Dùng / Nhóm"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Lỗi xảy ra"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Đóng"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Quản Lý Người Dùng"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Trường tên trống, hãy nhập một tên"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Tên chỉ chứa chữ cái latin thường, số, `-' và `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Tên quá dài"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Lỗi"
@@ -675,73 +687,73 @@ msgstr "Công Cụ Quản Lý Người Dùng Mageia"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr ""
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, fuzzy, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "Lỗi tạo mail spool.\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Lỗi tạo `%s': %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Lỗi tạo mail spool: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, fuzzy, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "Lỗi tạo mail spool.\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "lỗi không xác định"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 #, fuzzy
 msgid "Group creation failed.\n"
 msgstr "Lỗi tạo mail spool.\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Lỗi xóa bỏ mail spool: %s\n"
diff --git a/po/wa.po b/po/wa.po
index c013777..a32b8ea 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2015-02-13 05:26+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Walloon (http://www.transifex.com/projects/p/mageia/language/"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Dji tchedje les uzeus et les groupes... tårdjîz s' i vs plait"
@@ -128,7 +128,7 @@ msgstr "Mete en alaedje li passete"
 msgid "Users"
 msgstr "Uzeus"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "Groupes"
@@ -149,7 +149,7 @@ msgstr "No di l' uzeu"
 msgid "User ID"
 msgstr "ID di l' uzeu"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "Prumioûle groupe"
@@ -213,7 +213,7 @@ msgstr ""
 msgid "Add a group to the system"
 msgstr "Radjouter on groupe å sistinme"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "Candjî"
@@ -223,7 +223,7 @@ msgstr "Candjî"
 msgid "Edit selected row"
 msgstr "Candjî l' roye tchoezeye"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "Disfacer"
@@ -243,57 +243,57 @@ msgstr "Rafrister"
 msgid "Refresh the list"
 msgstr "Rafrister l' djivêye"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "Bloké"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "Espiré"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "clitchîz so l' imådjete pol candjî"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "Ahiver on novea uzeu"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "Ahiver l' ridant måjhon"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "Ridant måjhon: "
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Ahiver on groupe privé po l' uzeu"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Diner al mwin l' idintifiant di l' uzeu"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Ci no egzistêye dedja el sistinme, tchoezixhoz è èn ôte s' i vs plait"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "Les screts n' sont nén les minmes"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -302,12 +302,12 @@ msgstr ""
 "Li scret est pår trop simpe. \n"
 " On bon scret doet aveur pus di 6 caracteres"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "L' UID est < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -318,92 +318,104 @@ msgstr ""
 "n' est nén ricmandé. Estoz seur del voleur fé?\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Dji radjoute %s å groupe «users»"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Dj' ahive li novea groupe: %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "Dji radjoute l' uzeu: %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "Ridant måjhon: "
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "Macrea d' ebagaedje"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "Rinoncî"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "'l est bon"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "Tchoezi groupe"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "Radjouter å groupe k' egzistêye dedja"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Radjouter å groupe «users»"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "I gn a ddja on groupe di ç' no la.  Cwè voloz vs fé?"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "Ahiver on novea groupe"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Diner al mwin l' idintifiant do groupe"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 "Li groupe egzistêye dedja, tchoezixhoz èn ôte no d' groupe s' i vs plait"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " Li GID est < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -414,22 +426,22 @@ msgstr ""
 "n' est nén ricmandé. Estoz seur del voleur fé?\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "Dji radjoute li groupe: %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "Disfacer les fitchîs ou nén?"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -438,27 +450,27 @@ msgstr ""
 "Dji disface l' uzeu %s\n"
 " Dji fwai eto les accions shuvantes\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Disfacer l' ridant måjhon: %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Disfacer l' boesse ås emiles: /var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "Dji oistêye l' uzeu: %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Voloz vs vormint disfacer l' groupe %s?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -467,47 +479,47 @@ msgstr ""
 "%s est l' groupe prumioûle da l' uzeu %s\n"
 " I vs fåt d' aprume oister l' uzeu"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "Dji oistêye li groupe: %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "No en etir:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "No d' elodjaedje:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "Sicret:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "Acertinaedje do scret:"
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell d' elodjaedje:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "No do groupe:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "Tchoezixhoz pol moens on groupe po l' uzeu s' i vs plait"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -516,148 +528,148 @@ msgstr ""
 "Dinez l' anêye, li moes eyet l' djoû \n"
 " ki l' conte doet espirer "
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "I vs fåt rimpli tos les tchamps po l' espiraedje des screts\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Vos n' poloz nén bodjî l' uzeu «%s» foû di s' groupe prumioûle"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "Måjhon:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "Dinêyes di l' uzeu"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "Mete en alaedje l' espiraedje des contes uzeu"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Li conte espire li (AAAA-MM-DD):"
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "Bloker l' conte di l' uzeu"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "Informåcion do conte"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "L' uzeu candja si scret pol dierin côp li:"
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Mete en alaedje l' espiraedje des screts"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Djoûs dvant d' poleur candjî:"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "Djoûs dvant dveur candjî:"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "Djoûs d' adviertixhmint divant d' diveur candjî:"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Djoûs dvant ki l' conte soeye djoké:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "Informåcion sol sicret"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Tchoezixhoz les groupes ki l' uzeu ndè serè mimbe:"
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "Dinêyes do groupe"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Tchoezixhoz les uzeus k' iront dins ç' groupe chal:"
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "Uzeus do groupe"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "Candjî groupes / uzeus"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "Åk n' a nén stî:"
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "Clôre"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright © %s pa Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Copyright © %s pa Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "Manaedjmint des uzeus"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Pablo Saratxaga <pablo@mandriva.com>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Li tchamp do no est vude, i vs fåt dner on no s' i vs plait"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
@@ -665,12 +677,12 @@ msgstr ""
 "Li no n' pout aveur ki des ptitès latenès letes, des chifes, li loyeure "
 "(«-») et li caractere sorlignî («_»)."
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "Li no est pår trop long"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "Aroke"
@@ -683,72 +695,72 @@ msgstr "Enonder l' manaedjeu des uzeus da Mageia"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr "I vs fåt otintifyî po-z enonder l' manaedjeu des uzeus da Mageia"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "L' ahivaedje do conte a fwait berwete: «%s».\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "Dji n' sai aveur li limero UID"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Åk n' a nén stî tot askepiant «%s»: %s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "Åk n' a nén stî tot askepiant l' cawêye d' emilaedje: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "aroke nén cnoxhowe"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr ""
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "Åk n' a nén stî tot disfaçant l' cawêye d' emilaedje: %s\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b98d90a..c6b9885 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
-# 
+#
 # Translators:
 # Danny Zeng <danny@zeng.com.cn>, 2000
 # Funda Wang <fundawang@linux.net.cn>, 2003
@@ -11,22 +11,23 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2015-02-13 05:26+0000\n"
 "Last-Translator: xiao wenming <xwm-citcc5@hotmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/"
+"language/zh_CN/)\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "正在加载用户和组... 请稍等"
@@ -131,7 +132,7 @@ msgstr "应用过滤器"
 msgid "Users"
 msgstr "用户"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "组"
@@ -152,7 +153,7 @@ msgstr "用户名"
 msgid "User ID"
 msgstr "用户 ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "主要的组"
@@ -212,7 +213,7 @@ msgstr "添加组"
 msgid "Add a group to the system"
 msgstr "向系统中添加一个组"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "编辑"
@@ -222,7 +223,7 @@ msgstr "编辑"
 msgid "Edit selected row"
 msgstr "编辑所选的行"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "删除"
@@ -242,418 +243,446 @@ msgstr "刷新"
 msgid "Refresh the list"
 msgstr "刷新列表"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "已锁定"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "已过期"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "单击图标进行更改"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "创建新用户"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "创建主文件夹"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "主文件夹："
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "为该用户创建一个私有组"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "手动指定用户 ID"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "用户已经存在，请选择其他用户名"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "密码不匹配"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 characters"
-msgstr "这个密码太简单了。\n好的密码应该大于 6 个字符"
+msgstr ""
+"这个密码太简单了。\n"
+"好的密码应该大于 6 个字符"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "用户的 UID 小于 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
-msgstr "不推荐创建一个 UID 小于 1000 的用户。\n您确定您要这么做吗?\n\n"
+msgstr ""
+"不推荐创建一个 UID 小于 1000 的用户。\n"
+"您确定您要这么做吗?\n"
+"\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "将 %s 添加到“users”组"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "创建新组：%s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "添加用户：%s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "主文件夹："
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "迁移向导"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
-"Do you want to run the migration wizard in order to import Windows documents"
-" and settings in your Mageia distribution?"
-msgstr "您是否想要运行迁移向导将 Windows 文档和设置导入到您的 Mageia 发行版中？"
+"Do you want to run the migration wizard in order to import Windows documents "
+"and settings in your Mageia distribution?"
+msgstr ""
+"您是否想要运行迁移向导将 Windows 文档和设置导入到您的 Mageia 发行版中？"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID："
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "选择组"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "添加到已有组"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "添加到“users”组"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "已经存在同名组。您想要怎么做？"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "创建新组"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "手动指定组 ID"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "组已经存在，请使用其他组名"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "组的 GID 小于 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
-msgstr "不推荐创建一个 GID 小于 1000 的组。\n您确定您要这么做吗？\n\n"
+msgstr ""
+"不推荐创建一个 GID 小于 1000 的组。\n"
+"您确定您要这么做吗？\n"
+"\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "添加组：%s"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID："
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "删除文件吗？"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
 " Also perform the following actions\n"
-msgstr "删除用户 %s\n 同时执行下列操作\n"
+msgstr ""
+"删除用户 %s\n"
+" 同时执行下列操作\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "删除主文件夹：%s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "删除邮箱：/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "删除用户：%s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "您真的想要删除组 %s 吗?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
-msgstr "%s 是用户 %s 的主要组\n请先删除这个用户"
+msgstr ""
+"%s 是用户 %s 的主要组\n"
+"请先删除这个用户"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "删除组：%s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "全名："
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "登录名："
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "密码："
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "确认密码："
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "登录 Shell："
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "组名："
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "请为该用户选择至少一个用户组"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
-msgstr "请指定账户过期的\n年月日"
+msgstr ""
+"请指定账户过期的\n"
+"年月日"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "请填满密码时效的所有域\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "您不能从用户“%s”的主要组中删除该用户"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "主文件夹："
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "用户数据"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "启用账号过期"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "账号过期时间 (YYYY-MM-DD)："
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "锁定用户账号"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "账号信息"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "用户最后一次修改密码的时间： "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "启用密码过期"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "允许修改前的天数："
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "必须修改前的天数："
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "更改前警告的天数："
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "账户不被激活前的天数:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "密码信息"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "选择该用户将属于哪些组："
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "组数据"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "选择要加入该组的用户："
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "组用户"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "编辑组/用户"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "发生了一个错误："
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "版权所有 (C) %s Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "版权所有 (C) %s Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "用户管理"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
-#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith
-#. <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
-msgstr "Funda Wang <fundawang@gmail.com>\ntuhaihe <1132321739qq@gmail.com>\n"
+msgstr ""
+"Funda Wang <fundawang@gmail.com>\n"
+"tuhaihe <1132321739qq@gmail.com>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "名称栏为空，请提供一个名称"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "名称只能为小写拉丁字母、数字、“-”和“_”"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "名称过长"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "错误"
@@ -666,72 +695,72 @@ msgstr "打开Mageia 用户管理工具"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr "需要授权才能打开Mageia用户管理工具"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "无法创建账号：“%s”。\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "无法获取 Uid 编号"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "无法获取数值"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "创建“%s”出错：%s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "创建邮件池出错：%s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "无法更改用户：“%s”。\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "无法删除用户：“%s”。\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "无法设置密码：“%s”。\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "未知错误"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "用户组创建失败。\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "用户组无法更改：“%s”。\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "用户组无法删除：“%s”。\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "该用户没有主文件夹。\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "无法删除主文件夹：“%s”。\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "删除邮件时出错：%s\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 56900d9..5c8840f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\n"
 "PO-Revision-Date: 2013-11-29 02:25+0000\n"
 "Last-Translator: You-Cheng Hsieh <yochenhsieh@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/mageia/"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "正在載入使用者與群組... 請稍候"
@@ -127,7 +127,7 @@ msgstr "套用過濾條件"
 msgid "Users"
 msgstr "使用者"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "群組"
@@ -148,7 +148,7 @@ msgstr "使用者名稱"
 msgid "User ID"
 msgstr "使用者 ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "主群組"
@@ -208,7 +208,7 @@ msgstr "新增群組"
 msgid "Add a group to the system"
 msgstr "新增一個群組到系統"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "編輯"
@@ -218,7 +218,7 @@ msgstr "編輯"
 msgid "Edit selected row"
 msgstr "編輯選擇的行"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "刪除"
@@ -238,57 +238,57 @@ msgstr "更新"
 msgid "Refresh the list"
 msgstr "更新列表"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "被鎖住了"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "過期的"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "點選圖示以改變它"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "建立新的使用者"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "建立家目錄"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "家目錄："
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "建立一個私有的群組給使用者"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "手動指定使用者 ID"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "這個使用者已經存在於系統中，請另外選取一個使用者名稱"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "密碼錯誤"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -297,12 +297,12 @@ msgstr ""
 "這個密碼太簡單。 \n"
 " 好的密碼應該至少有 6 個字元"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "使用者 Uid < 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
@@ -313,27 +313,39 @@ msgstr ""
 " 您確定要這樣做嗎？\n"
 "\n"
 
-#: ../userdrake:478
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "放置 %s 到 'users' 群組"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "建立新的群組： %s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "新增使用者： %s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "家目錄："
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "檔案及設定轉移精靈"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -342,64 +354,64 @@ msgstr ""
 "您要執行移轉精靈，將 Windows 的 Document and Settings 裡的資料匯入您的 "
 "Mageia 系統中嗎？"
 
-#: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
-#: ../userdrake:735 ../userdrake:1195
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "確定"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID："
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "選取群組"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "新增到已經存在的群組"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "新增到 'users' 群組"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "一個同名的群組已經存在，您要怎麼處理呢？"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "建立新的群組"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "手動指定群組 ID"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "群組已經存在，請另外選擇一個群組名稱"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr " 群組 Gid < 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
@@ -410,22 +422,22 @@ msgstr ""
 " 您確定要這樣做嗎？\n"
 "\n"
 
-#: ../userdrake:609
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "正在新增群組： %s "
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID："
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "是否要刪除檔案？"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -434,27 +446,27 @@ msgstr ""
 "正在刪除使用者 %s\n"
 " 也執行下列動作\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "刪除家目錄： %s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "刪除郵件匝：/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "移除使用者： %s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "您真的要刪除群組 %s 嗎？"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -463,47 +475,47 @@ msgstr ""
 "%s 是使用者 %s 的主群組\n"
 " 請先移除使用者"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "移除群組： %s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "全名:"
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "登入:"
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "密碼:"
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "確認密碼："
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "預設的 Shell:"
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "群組名稱:"
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "請選擇至少一個群組給此使用者"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -512,161 +524,161 @@ msgstr ""
 "請指定年、月與日 \n"
 " 為帳號的使用期限"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "請再次填入全部密碼欄位\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "您不能從使用者 '%s' 的主群組移除他"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "家目錄:"
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "使用者資料"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "啟用帳號使用期限"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "帳號可使用至 (YYYY-MM-DD)："
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "鎖住使用者帳號"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "使用者最後改變密碼於 : "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "啟用密碼使用期限"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "允許改變之前的日數 :"
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "需要改變之前的日數 :"
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "改變之前的日數警告 :"
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "帳號凍結之前的日數 :"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "密碼資訊"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "選擇使用者要加入的群組："
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "群組數據"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "選擇要加入此群組的使用者："
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "群組使用者"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "編輯群組/使用者"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "發生一個錯誤："
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "關閉"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "Copyright (C) %s by Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "使用者管理"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Shiva Huang <shivahuang@gmail.com>\n"
 "You-Cheng Hsieh <yochenhsieh@xuite.net>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "名稱欄位是空白的，請提供一個名稱"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "名稱中只能包含小寫的拉丁字母、數字、`-' 與 `_'"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "名稱太長"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "錯誤"
@@ -679,72 +691,72 @@ msgstr "執行 Mageia 使用者管理工具"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr "執行 Mageia 使用者管理工具需要認證"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "帳號建立失敗：'%s'。\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "無法取得 UID 編號"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "無法取得數值"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "建立 `%s'： %s 時發生錯誤"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "建立郵件夾時發生錯誤。: %s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "使用者無法修改：'%s'。\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "使用者無法刪除：'%s'。\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "密碼設定失敗︰'%s'。\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "未知的錯誤"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "群組建立失敗。\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "群組無法修改：'%s'。\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "群組無法刪除：'%s'。\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "使用者沒有家目錄。\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "家目錄無法刪除：'%s'。\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "刪除郵件夾時發生錯誤。: %s\n"