sync with code

author: Thierry Vignaud <tv@mandriva.org> 2010-02-02 08:44:09 +0000
committer: Thierry Vignaud <tv@mandriva.org> 2010-02-02 08:44:09 +0000
commit: 51c4e31c0ed0f881d6dde0d45b186f1f9d9c0986 (patch)
tree: 0b5b0046d170016650fbc110d2d2930a9266453c
parent: 15a8d265dea93d18c687d49b662d4aa0b9e9cc2b (diff)
download: userdrake-51c4e31c0ed0f881d6dde0d45b186f1f9d9c0986.tar
userdrake-51c4e31c0ed0f881d6dde0d45b186f1f9d9c0986.tar.gz
userdrake-51c4e31c0ed0f881d6dde0d45b186f1f9d9c0986.tar.bz2
userdrake-51c4e31c0ed0f881d6dde0d45b186f1f9d9c0986.tar.xz
userdrake-51c4e31c0ed0f881d6dde0d45b186f1f9d9c0986.zip
76 files changed, 16038 insertions, 11619 deletions
diff --git a/po/af.po b/po/af.po
index 5e08267..737cb18 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\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"
@@ -19,306 +19,358 @@ msgstr ""
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Fout met lees van %s: %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Fout met skep van %s: %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Fout met verwydering van %s: %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Kon nie spoellêer skep nie.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Kon nie spoellêer skep nie.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Kon nie spoellêer skep nie.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "onbekende fout"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Kon nie spoellêer skep nie.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Fout met uitvee van spoellêer.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Opsoek na Gerbruikers en Groepe .... Net 'n oomblik asb"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux Users Management Tool"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Aksies"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Redigeer"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Skrap"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Opsies"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Filtreer 'system' gebruikers"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Lêer"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Herlaai"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Verlaat"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Voeg Gebruiker By"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Voeg _Groep by"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Help"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Raporteer 'n Fout"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Otrent"
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Soek:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Pas filter toe"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Gebruikers"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Groepe"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr ""
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Gebruikernaam"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Gebruiker ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Primere Groep"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Volle Naam"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Aanteken Dop"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Tuisgids"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Stand"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Groep Naam"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Groep ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Group Lede"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Voeg Gebruiker By"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Voeg 'n gebruiker by die stelsel"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Voeg Groep By"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Voeg 'n groep by die stelsel"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Redigeer"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Redigeer gekose ry"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Verwyder"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Wis gekose ry"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Herlaai"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Herlaai die lys"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Gesluit"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Reeds Verval"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Kliek op die ikoon om dit te verander"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Skep Nuwe Gebruiker"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Skep Tuisgids"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Tuisgids: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Skep 'n unieke groep vir die gebruiker"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Spesifiseer gebruiker se ID self"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Gebruiker bestaan alreeds, kies asb. 'n ander gebruikernaam"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Ongepaarde Wagwoord"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -327,12 +379,12 @@ msgstr ""
 "Hierdie wagwoord is te eenvoudig. \n"
 "Behoorlike wagwoorde bevat meer as 6 karakters "
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Gebruiker UID is < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -343,91 +395,91 @@ msgstr ""
 "Wil u voort gaan?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Voeg %s by die 'users' groep"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Skep nuwe groep: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Voeg gebruiker: %s by."
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Kanselleer"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Kies Groep"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Voeg by die bestaande groep"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Voeg by die 'users' groep"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Skep Nuwe Groep"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Spesifiseer groep se ID self"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Groep bestaan alreeds, Gebruik asb. 'n ander Groepnaam"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "Groep GID is < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -438,22 +490,22 @@ msgstr ""
 "Moet ons voort gaan?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Voeg groep %s by"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Wis leêrs uit of nie?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -462,27 +514,27 @@ msgstr ""
 "Verwyder gebruiker %s\n"
 " Doen ook die volgende\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Verwyder Tuisgids: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Verwyder Posbus : /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Verwyder gebruiker: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Moet ons regtig groep %s verwyder?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -491,202 +543,210 @@ msgstr ""
 "%s is 'n primere groep vir gebruiker %s\n"
 " Verwyder eers die gebruiker"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Verwyder groep: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Volle Naam:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Inteken:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Wagwoord:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Bevestig Wagwoord"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Aanteken Dop:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Groep Naam:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Redigeer Groepe / Gebruikers"
+msgid "Please select at least one group for the user"
+msgstr "Kies asseblief ten minste een groep vir gebruiker"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Spesifiseer asseblief Jaar Maand en Dag \n"
+"waarop Rekening Verval "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
+"Voorsien asseblief al die verlangde inling rakende wagwoord veroudering\n"
+
+#: ../userdrake:965
+#, 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:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Tuis:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Gebruiker se Inligting"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Aktiveer verval van rekening"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Rekening verval (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Sluit Gebruiker se Rekening"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Rekening Inligting"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Gebruiker het laas sy/haar wagwoord verander op : "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Aktiveer Verval van Wagwoord"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dae voor verandering toelaat :"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Aantal dae voor verandering verlang :"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Waarsku soveel dae voor verandering :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dae voor rekening de-aktiveer :"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Wagwoord Detail"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, 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:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Groep Data"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Kies gebruikers vir hierdie groep :"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Groepeer Gebruikers"
 
-#: ../userdrake:847
+#: ../userdrake:1127
 #, c-format
-msgid "Please select at least one group for the user"
-msgstr "Kies asseblief ten minste een groep vir gebruiker"
-
-#: ../userdrake:856
-#, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Spesifiseer asseblief Jaar Maand en Dag \n"
-"waarop Rekening Verval "
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr ""
-"Voorsien asseblief al die verlangde inling rakende wagwoord veroudering\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "U kan nie gebruiker %s van hulle primere groep verwyder nie"
+msgid "Edit Groups / Users"
+msgstr "Redigeer Groepe / Gebruikers"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Maak Toe"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Bestuur Gebruikers"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Dirk van der Walt <dirkvanderwalt@webmail.co.za>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Naam spasie is leeg voorsien asseblief 'n naam"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Naam is te lank"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Probleme"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "onbekende fout"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Fout met skep van %s: %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Programeerders: "
diff --git a/po/am.po b/po/am.po
index e571c6c..f338bb3 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\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"
@@ -14,306 +14,357 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, fuzzy, c-format
 msgid "Error removing `%s': %s"
 msgstr "ተጠቃሚ በማስወገድ ላይ: %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr ""
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr ""
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+msgid "Group creation failed.\n"
+msgstr ""
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr ""
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "ተጠቃሚዎችን አና ቡድኖችን በመጫን ላይ...እባክዎ ይጠብቁ"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "የMandriva Linux ተጠቃሚዎች ማስተዳደሪያ መሳሪያ"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_ተግባራት"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_አርም"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_አጥፋ"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_ምርጫዎች"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_የሲስተም ተጠቃሚዎችን አጣራ"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_ፋይል"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_በድጋሚ ጀምር"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_ውጣ"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<ኮንትሮል>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_ተጠቃሚ ጨምር"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/_ቡድን ጨምር"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_መረጃ"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_የስህተቱን ጉዳይ አመልክት"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_ስለ..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "ፈልግ:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "ማጣሪያ ተጠቀም"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "ተጠቃሚዎች"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "ቡድኖች"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "ተጠቃሚዎች እና ቡድኖች"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "የተጠቃሚ ስም"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "የተጠቃሚ መለያ ቁጥር"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "ቀዳሚ ብድን"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "ሙሉ ስም"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "የመግቢያ ሼል"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "የመጀመሪያ ዶሴ"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "ሁኔታ"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "የብድን ስም"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "የብድን መለያ ቁጥር"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "የብድን አባላት"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "ተጠቃሚ ጨምር"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "ወደ ሲስተሙ ተጠቃሚ ጨምር"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "ብድን ጨምር"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "ወደ ሲስተሙ ብዱን ጨምር"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "አርም"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "የተመረጠውን ረድፍ አርም"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "አጥፋ"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "የተመረጠውን ረድፍ አጥፋ"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "በድጋሚ አስጀምር"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "ዝርዝሩን በድጋሚ አስጀምር"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "ተቆልፏል"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "አልፎበታል"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "ምልክቱን ለመለወጥ ይጫኑት"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "አዲስ ተጠቃሚ ፍጠር"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "የመጀመሪያ ዶሴ ፍጠር"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "የመጀመሪያ ዶሴ: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "ለተጠቃሚው የግል ቡድን ፍጠር"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "ተጠቃሚው ቀደም ሲል ነበሩ፣ እባክዎ ሌላ የተጠቃሚ ስም ይምረጡ"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "ሚስጢራዊ ቃል አይመሳሰልም"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -322,12 +373,12 @@ msgstr ""
 "ይህ ሚስጢራዊ ቃል በጣም ቀላል ነው። \n"
 " ጥሩ ሚስጢራዊ ቃላት ከ 6 የበለጠ አሃዞች ሊሆኑ ይገባል"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -335,91 +386,91 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "%sን ወደ 'ተጠቃሚዎች' ብድን በስገባት ላይ"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "አዲስ ብድን በመፍጠር ላይ: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "ተጠቃሚ በመጨመር ላይ ፡ %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "ተወው"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "እሺ"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "ብድን ይምረጡ"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "ቀደም ሲል ወደ ነበረው ብድን ጨምር"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "ወደ ብድን 'ተጠቃሚዎች' ጨምር"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "በዚህ ስም የሚጠራ ብድን ቀደም ሲል አለ። ምን ማድረግ ይፈልጋሉ?"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "አዲስ ብድን ፍጠር"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "ቡድኑ ቀደም ሲል ነበር፣ እባክዎ ሌላ የብድን ስም ይምረጡ"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -427,249 +478,253 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "ብድን በመጨመር ላይ ፡ %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "ፋይሎቹ ይጥፉ ወይስ አይጥፉ?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
 " Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "የመጀመሪያ ዶሴ አጥፋ: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "የፖስታ ሳጥን አጥፋ :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "ተጠቃሚ በማስወገድ ላይ: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "በርግጥ ይህንን ብድንን ማጥፋት ይፈልጋሉ?: %s"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "ብድን በማስወገድ ላይ: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "ሙሉ ስም:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "መግቢያ:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "ሚስጢራዊ ቃል:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "ሚስጢራዊ ቃሉን ያረጋግጡ:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "የመግቢያ ሼል:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "የብድን ስም:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "ቡድኖችን/ተጠቃሚዎችን አርም"
+msgid "Please select at least one group for the user"
+msgstr "እባክዎ ለተጠቃሚው ቢያንስ አንድ ቡድን ይምረጡ"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr ""
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "መጀመሪያ:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "የተጠቃሚ መረጃ"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "የመዝገብ ጊዜ ማለፍን አስችል"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "መዝገቡ ጊዜው የሚያልፍበት ቀን (አመት-ወር-ቀን):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "የተጠቃሚን መዝገብ ቆልፍ"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "የመዝገብ መረጃ"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "ተጠቃሚው ለመጨረሻ ጊዜ ሚስጢራዊ ቃሉን የቀየረው በ :"
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "የሚስጢራዊ ቃል ጊዜ ማለፍን አስችል"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "ቀናት፣ ለውጥ ከመፈቀዱ በፊት :"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "ቀናት፣ ለውጥ ከማስፈለጉ በፊት :"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "ከለውጥ በፊት የቀናት ማስጠንቀቂያ :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr ""
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "የሚስጢራዊ ቃል መረጃ"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "ተጠቃሚው አባል የሚሆንባቸውን ብድኖች ይምረጡ:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "የብድን መረጃ"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "ወደዚህ ብድን የሚገቡትን ተጠቃሚዎች ይምረጡ :"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "የቡድን ተጠቃሚዎች"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "እባክዎ ለተጠቃሚው ቢያንስ አንድ ቡድን ይምረጡ"
-
-#: ../userdrake:856
-#, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr ""
-
-#: ../userdrake:905
+#: ../userdrake:1127
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr ""
+msgid "Edit Groups / Users"
+msgstr "ቡድኖችን/ተጠቃሚዎችን አርም"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "ዝጋ"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "የተጠቃሚዎች ማስተዳደሪያ"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Alemayehu <alemayehu@gmx.at>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "የስሙ ቦታ ባዶ ነው፣ እባክዎ ስም ይስጡ"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "ስሙ በጣም ረጅም ነው"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "ስህተት"
 
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "ተጠቃሚ በማስወገድ ላይ: %s"
+
 #~ msgid "Authors: "
 #~ msgstr "ደራሲዎች: "
 
diff --git a/po/ar.po b/po/ar.po
index a80dc7c..de136f4 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2005-02-28 23:22+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -23,306 +23,358 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : "
 "3\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "خطأ في قراءة `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "خطأ في إنشاء `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "خطأ في حذف `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "خطأ في إنشاء لفيفة البريد.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "خطأ في إنشاء لفيفة البريد.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "خطأ في إنشاء لفيفة البريد.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "خطأ مجهول"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "خطأ في إنشاء لفيفة البريد.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "خطأ في حذف لفيفة البريد.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "تحميل المستخدمين والمجموعات... الرجاء الانتظار"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "أداة ماندريبا لينكس لإدارة المستخدمين"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_أحداث"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_تحرير"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_حذف"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_خيارات"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/ت_صفية مستخدمي النظام"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_ملف"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/تح_ديث"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_خروج"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>خ"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_إضافة مستخدم"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/إضافة م_جموعة"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/مسا_عدة"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/إ_رسال تقرير بالعيوب"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_حول..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "بحث:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "تصفية"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "المستخدمون"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "المجموعات"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "المستخدمون والمجموعات"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "اسم المستخدم"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "هوية المستخدم"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "المجموعة الأساسية"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "الاسم الكامل"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "صدفة الدخول"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "الدليل الخاص"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "الحالة"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "اسم المجموعة"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "هوية المجموعة"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "أعضاء المجموعة"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "إضافة مستخدم"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "إضافة مستخدم إلى النظام"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "إضافة مجموعة"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "إضافة مجموعة الى النظام"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "تحرير"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "تحرير الصف المختار"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "حذف"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "حذف الصف المختار"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "تحديث"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "تحديث القائمة"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "تم إقفاله"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "انتهت صلاحيته"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "اضغط على الأيقونة لتغييرها"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "إنشاء مستخدم جديد"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "إنشاء دليل خاص"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "الدليل الخاص: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "إنشاء مجموعة خاصة بالمستخدم"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "تحديد هوية المستخدم يدوياً"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "المستخدم موجود مسبقاً، الرجاء اختيار اسم مستخدم آخر"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "كلمة المرور غير مطابقة"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -331,12 +383,12 @@ msgstr ""
 "كلمة المرور هذه بسيطة جداً. \n"
 " كلمات المرور الجيدة يجب أن تكون > 6 رموز"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "هوية المستخدم < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -347,91 +399,91 @@ msgstr ""
 " هل أنت متأكد من أنك تريد فعل ذلك؟\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "إضافة %s إلى مجموعة المستخدمين 'users'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "إنشاء المجموعة الجديدة: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "إضافة المستخدم: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "إلغاء"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "موافق"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "هوية المستخدم: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "اختيار مجموعة"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "إضافة إلى المجموعة الموجودة"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "إضافة إلى مجموعة 'المستخدمين'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "توجد مجموعة بهذا الاسم مسبقاً.  ماذا تريد أن تفعل؟"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "إنشاء مجموعة جديدة"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "تحديد هوية المجموعة يدوياً"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "هذه المجموعة موجودة مسبقاً، الرجاء اختيار اسم آخر للمجموعة"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " هوية المجموعة < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -442,22 +494,22 @@ msgstr ""
 " هل أنت متأكد من أنك تريد فعل ذلك؟\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "جاري إضافة المجموعة: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "هوية المجموعة: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "حذف الصف المختار؟"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -466,27 +518,27 @@ msgstr ""
 "جاري حذف المستخدم %s\n"
 " قم كذلك بالمهام التالية\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "حذف الدليل الخاص: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "حذف صندوق البريد: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "جاري حذف المستخدم: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "هل تريد فعلاًُ حذف المجموعة %s؟"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -495,202 +547,210 @@ msgstr ""
 "%s مجموعة أساسية للمستخدم %s\n"
 " احذف المستخدم أولاً"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "جاري حذف المجموعة: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "الاسم الكامل:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "اسم الدخول:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "كلمة المرور:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "تأكيد كلمة المرور:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "صدفة الدخول:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "اسم المجموعة:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "تحرير المجموعات / المستخدمون"
+msgid "Please select at least one group for the user"
+msgstr "الرجاء اختيار مجموعة واحدة على الأقل للمستخدم"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"الرجاء تحديد السنة والشهر واليوم\n"
+" لانتهاء صلاحية الحساب "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "الرجاء ملء جميع حقول تقادم كلمة المرور\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "لا يمكنك حذف المستخدم '%s' من مجموعته الأساسية"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "الدليل الخاص:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "بيانات المستخدم"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "تمكين إنهاء صلاحية الحساب"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "تنتهي صلاحية الحساب (يوم/شهر/سنة):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "إقفال حساب المستخدم"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "معلومات الحساب"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "قام المستخدم بتغيير كلمة مروره عند: "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "تمكين إنهاء صلاحية كلمة المرور"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "عدد الأيام قبل السماح بالتغيير:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "عدد الأيام قبل المطالبة بالتغيير:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "عدد أيام التحذير قبل التغيير:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "عدد الأيام قبل إخماد الحساب:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "معلومات كلمة المرور"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "اختر المجموعات التي سيصبح المستخدم عضواً فيها: "
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "بيانات المجموعة"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "اختر المستخدمين الذين سيلتحقون بالمجموعة:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "مستخدمو المجموعة"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "الرجاء اختيار مجموعة واحدة على الأقل للمستخدم"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"الرجاء تحديد السنة والشهر واليوم\n"
-" لانتهاء صلاحية الحساب "
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "الرجاء ملء جميع حقول تقادم كلمة المرور\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "لا يمكنك حذف المستخدم '%s' من مجموعته الأساسية"
+msgid "Edit Groups / Users"
+msgstr "تحرير المجموعات / المستخدمون"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "إغلاق"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "إدارة المستخدمين"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "ﻡﺎﻧﺩﺮﻴﺑﺍ ﻞﻴﻨﻜﺳ"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Arabeyes <support@arabeyes.org>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "حقل الاسم فارغ فضلاً قم بتحديد اسم"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "يجب أن يحتوي الاسم فقط على حروف صغيرة، أرقام، `-' و `_'"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "الاسم طويل جداً"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "خطأ"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "خطأ مجهول"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "خطأ في إنشاء `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "المؤلفون: "
 
diff --git a/po/ast.po b/po/ast.po
index 6692dd0..3eef5e0 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2010-01-28 16:58+0100\n"
 "Last-Translator: marquinos <marquinos@mandriva.org>\n"
 "Language-Team: Asturian <alministradores@softastur.org>\n"
@@ -14,327 +14,358 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Fallu al lleer `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Fallu criando `%s': %s"
 
-#: ../USER/USER.xs:203
-#: ../USER/USER.xs:232
-#: ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Fallu desaniciando `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Fallu al criar cola de corréu.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Fallu al criar cola de corréu.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Fallu al criar cola de corréu.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "fallu desconocíu"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Fallu al criar cola de corréu.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Fallu al desaniciar cola de corréu.\n"
 
-#: ../userdrake:55
-#: ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Cargando usuarios y grupos... Por favor, espera"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Ferramienta d'alministración d'usuarios de Mandriva Linux"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr "/_Instalar cuenta d'invitáu"
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr "/_Desaniciar cuenta d'invitáu"
 
-#: ../userdrake:99
-#: ../userdrake:100
-#: ../userdrake:101
-#: ../userdrake:109
-#: ../userdrake:110
-#: ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Aiciones"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Desaniciar"
 
-#: ../userdrake:91
-#: ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Opciones"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Peñerar usuarios del sistema"
 
-#: ../userdrake:95
-#: ../userdrake:96
-#: ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Ficheru"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Refrescar"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Colar"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Amestar usuariu"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Amestar _Grupu"
 
-#: ../userdrake:108
-#: ../userdrake:109
-#: ../userdrake:110
-#: ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/A_ida"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Informar bug"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Tocante a..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Guetar:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Aplicar peñera"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../userdrake:133
-#: ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Grupos"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Usuarios y grupos"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Nome d'usuariu"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID d'usuariu"
 
-#: ../userdrake:154
-#: ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Grupu primariu"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Nome completu"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Shell d'identificación"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Directoriu personal"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Estáu"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Nome del grupu"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ID de grupu"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Miembros del grupu"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Amestar usuariu"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Amestar un usuariu al sistema"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Amestar grupu"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Amestar un grupu al sistema"
 
-#: ../userdrake:165
-#: ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Editar"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Editar filera seleicionada"
 
-#: ../userdrake:166
-#: ../userdrake:552
-#: ../userdrake:584
-#: ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Desaniciar"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Desaniciar filera seleicionada"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Refrescar la llista"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Bloquiáu"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Espiráu"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Calca sobro l'iconu pa camudalu"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Criar usuariu nuevu"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Criar direutoriu personal"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Directoriu personal: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Criar un grupu priváu pal usuariu"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Especificar ID d'usuariu manualmente"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "L'usuariu ya esiste nel sistema, por favor usa otru nome d'usuariu"
 
-#: ../userdrake:329
-#: ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Nun concasa la contraseña"
 
-#: ../userdrake:330
-#: ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -343,12 +374,12 @@ msgstr ""
 "Esta contraseña ye enforma simple. \n"
 " Les contraseñes bones deberíen tener más de 6 carauteres"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "L'UID del usuariu ye menor a 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -359,96 +390,93 @@ msgstr ""
 "¿De xuro que quies face esto?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Poniendo %s nel grupu 'users'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Criando grupu nuevu: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Amestando usuariu: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Asistente de migración"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
-msgid "Do you want to run the migration wizard in order to import Windows documents and settings in your Mandriva Linux distribution?"
-msgstr "¿Quies executar l'asistente de migración pa importar los axustes y documentos de Windows® na distribución Mandriva Linux?"
+msgid ""
+"Do you want to run the migration wizard in order to import Windows documents "
+"and settings in your Mandriva Linux distribution?"
+msgstr ""
+"¿Quies executar l'asistente de migración pa importar los axustes y "
+"documentos de Windows® na distribución Mandriva Linux?"
 
-#: ../userdrake:398
-#: ../userdrake:436
-#: ../userdrake:480
-#: ../userdrake:568
-#: ../userdrake:597
-#: ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Encaboxar"
 
-#: ../userdrake:383
-#: ../userdrake:417
-#: ../userdrake:466
-#: ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Aceutar"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Escoyer un grupu"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Amestar al grupu esistente"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Amestar al grupu 'users'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Ya esiste un grupu con esti nome.  ¿Qué quies facer?"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Criar nuevu grupu"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Especificar ID de grupu manualmente"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "El grupu ya esiste, por favor usa otru nome de grupu"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "El GID del grupu ye menor a 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -459,23 +487,22 @@ msgstr ""
 "¿De xuro que quies facer esto?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Amestando grupu: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516
-#: ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "¿Desaniciar ficheros o non?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -484,27 +511,27 @@ msgstr ""
 "Desaniciando usuariu %s\n"
 " Faciendo tamién les siguientes aiciones\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Desaniciar direutoriu personal: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Desaniciar buzón de corréu: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Desaniciando usuariu: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "¿De xuro que quies desaniciar el grupu %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -513,198 +540,206 @@ msgstr ""
 "%s ye un grupu primariu pal usuariu %s\n"
 "Desanicia primero al usuariu"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Desaniciando grupu: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Nome completu:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Identificación:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Confirmar contraseña:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell d'identificación:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Nome del grupu:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Editar Grupos / Usuarios"
+msgid "Please select at least one group for the user"
+msgstr "Por favor, escueyi al menos un grupu pal usuariu"
 
-#: ../userdrake:699
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Por favor, especifica l'añu, mes y día\n"
+"pa la espiración de la cuenta"
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Por favor, completa tolos campos na desactivación de la contraseña\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Nun puedes desaniciar al usuariu '%s' del so grupu primariu"
+
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Directoriu personal:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Datos d'usuariu"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Activar espiración de cuenta"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "La cuenta espira (AAAA-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Bloquiar cuenta d'usuariu"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Información de la cuenta"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "L'usuariu camudó la contraseña por cabera vegada'l : "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Activar espiración de contraseña"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Díes enantes de permitir el cambéu:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Díes enantes de requerir el cambéu:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Díes d'avisu enantes del cambéu:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Díes enantes que la cuenta se desactive:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Información de contraseña"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Escueyi los grupos a los cuales pertenecerá l'usuariu:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Datos del grupu"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Escueyi los usuarios que formarán parte d'esti grupu:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Grupu d'usuarios"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Por favor, escueyi al menos un grupu pal usuariu"
-
-#: ../userdrake:856
-#, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Por favor, especifica l'añu, mes y día\n"
-"pa la espiración de la cuenta"
-
-#: ../userdrake:862
+#: ../userdrake:1127
 #, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Por favor, completa tolos campos na desactivación de la contraseña\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Nun puedes desaniciar al usuariu '%s' del so grupu primariu"
+msgid "Edit Groups / Users"
+msgstr "Editar Grupos / Usuarios"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Zarrar"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Alministración d'usuarios"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Softastur <alministradores@softastur.org>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "El campu de nome ta baleru, por favor pon un nome"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
-msgid "The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "El nome tien de caltener namái lletres minúscules, númberos, `-' y `_'"
 
-#: ../userdrake:1039
-#, c-format
-msgid "Name is tolong"
+#: ../userdrake:1297
+#, fuzzy, c-format
+msgid "Name is too long"
 msgstr "El nome ye perllargu"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Fallu"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "fallu desconocíu"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Fallu criando `%s': %s"
diff --git a/po/az.po b/po/az.po
index a13b141..bd27a03 100644
--- a/po/az.po
+++ b/po/az.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-az\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2004-09-12 17:14+0300\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -22,307 +22,359 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "`%s' oxuna bilmədi: %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "`%s' yaradıla bilmədi: %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "`%s' silinə bilmədi: %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Mail spool yaradıla bilmədi.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Mail spool yaradıla bilmədi.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Mail spool yaradıla bilmədi.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "naməlum xəta"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Mail spool yaradıla bilmədi.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Mail spool silinə bilmədi.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../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"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux İstifadəçi İdarəsi Vasitəsi"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Gedişatlar"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Düzəlt"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Sil"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Seçimlər"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Sistem istifadəçilərini filtrlə"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Fayl"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Təzələ"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/Çı_x"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_İstifadəçi Əlavə Et"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/_Qrup Əlavə Et"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Xəta Raportu Göndər"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Haqqında..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Axtar:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Filtri tətbiq et"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "İstifadəçilər"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Qruplar"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "İstifadəçilər və qruplar"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "İstifadəçi Adı"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "İstifadəçi ID'si"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Əsas Qrup"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Tam Ad"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Giriş Qabığı"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Ev Cərgəsi"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Vəziyyət"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Qrup Adı"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Qrup ID'si"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Qrupun Üzvləri"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "İstifadəçi Əlavə Et"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Sistemə istifadəçi əlavə et"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Qrup Əlavə Et"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Sistemə qrup əlavə et"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Düzəlt"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Seçili sətiri düzəlt"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Sil"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Seçili sətiri sil"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Təzələ"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Siyahını təzələ"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Qıfıllı"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Vaxtı Bitib"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Dəyişdirmək üçün timsala tıqlayın"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Yeni İstifadəçi Yarat"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Ev Cərgəsi Yarat"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Ev Cərgəsi: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "İstifadəçi üçün xüsusi (private) qrup yarat"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "İstifadəçi ID'sini əllə müəyyən et"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, 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:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Şifrələr Uyğun Gəlmir"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -331,12 +383,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:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "İstifadəçi Uid'i < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -347,91 +399,91 @@ msgstr ""
 " Bunu həqiqətən də etmək istəyirsiniz?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "%s 'users' qrupuna yerləşdirilir"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Yeni qrup yaradılır: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "İstifadəçi əlavə edilir: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Ləğv et"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Oldu"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Qrupu seç"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Mövcud qrupa əlavə et"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "'users' qrupuna əlavə et"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Yeni Qrup Yarat"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Qrup ID'sini əllə müəyyən et"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, 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:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " Qrup Gid'i < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -442,22 +494,22 @@ msgstr ""
 " Bunu həqiqətən də etmək istəyirsiniz?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Qrup əlavə edilir: %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Fayllar silinsin?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -466,27 +518,27 @@ msgstr ""
 "%s istifadəçisi silinir\n"
 " Həmçinin bunları da yerinə gətir\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Ev Cərgəsini Sil: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Poçt Qutusunu Sil :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "İstifadəçi silinir: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, 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:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -495,203 +547,211 @@ msgstr ""
 "%s, %s istifadəçisinin əsas qrupudur\n"
 " Əvvəlcə istifadəçini silin"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Qrup silinir: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Tam Ad:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Giriş:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Şifrə:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Şifrənin Təsdiqi:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Giriş Qabığı:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Qrup Adı:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Qrupları/İstifadəçiləri Düzəlt"
+msgid "Please select at least one group for the user"
+msgstr "Xahiş edirik, istifadəçi üçün ən az bir qrup seçin"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Xahiş edirik, hesabın vaxtının bitməsinin \n"
+" İl, Ay və Gününü tə'yin edin"
+
+#: ../userdrake:914
+#, 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:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "'%s' istifadəçisini onun əsas qrupundan çıxara bilməzsiniz"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Ev:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "İstifadəçi Mə'lumatı"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Hesabın vaxtının bitməsini fəallaşdır"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Hesabın vaxtının bitmə tarixi (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "İstifadəçi Hesabını Qıfılla"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Hesab Mə'lumatı"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "İstifadəçi şifrəsini ən son bu vaxtda dəyişib : "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Şifrə Vaxtının Bitməsini Fəallaşdır"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dəyişdirmə icazəsi əvvəlindəki gün :"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Dəyişdirmə məcburiyyəti əvvəlindəki gün :"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dəyişdirmədən xəbərdarlıq əvvəlindəki gün :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Hesabın qeyri-fəal olması əvvəlindəki gün :"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Şifrə Mə'lumatı"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "İstifadəçinin üzv olacağı qrupları seçin:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Qrup Mə'lumatı"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Bu qrupa qoşulacaq istifadəçiləri seçin :"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Qrup İstifadəçiləri"
 
-#: ../userdrake:847
+#: ../userdrake:1127
 #, 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:856
-#, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Xahiş edirik, hesabın vaxtının bitməsinin \n"
-" İl, Ay və Gününü tə'yin edin"
-
-#: ../userdrake:862
-#, 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:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "'%s' istifadəçisini onun əsas qrupundan çıxara bilməzsiniz"
+msgid "Edit Groups / Users"
+msgstr "Qrupları/İstifadəçiləri Düzəlt"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Bağla"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "İstifadəçi İdarəsi"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Mətin Əmirov <metin@karegen.com>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, 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:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Ad çox uzundur"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Xəta"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "naməlum xəta"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "`%s' yaradıla bilmədi: %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Müəlliflər: "
diff --git a/po/be.po b/po/be.po
index 482ea95..af0221a 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2003-08-14 16:54+0300\n"
 "Last-Translator: Maxim Kuzmich <max_kuzm@tut.by>\n"
 "Language-Team: Belarusian\n"
@@ -14,306 +14,357 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr ""
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "невядомая памылка"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+msgid "Group creation failed.\n"
+msgstr ""
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr ""
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr ""
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr ""
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Дастасаваньне для кіраваньня карыстальнікамі Mandriva Linux"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Дзеяньні"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Рэдагаваць"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Выдаліць"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Налады"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Фільтраваць сыстэмных карыстальнікаў"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Файл"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Аднавіць"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Выхад"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Дадаць карыстальніка"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Дадаць _групу"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Дапамога"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Паведаміць пра памылку"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Пра..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Шукаць:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Ужыць фільтар"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Карыстальнікі"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Групы"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr ""
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Імя карыстальніка"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID карыстальніка"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Асноўная група"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Поўнае імя"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr ""
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Хатні каталёг"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Стан"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Імя групы"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ID групы"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Сябры групы"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Дадаць карыстальніка"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Дадаць карыстальніка ў сыстэму"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Дадаць групу"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Дадаць групу ў сыстэму"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Рэдагаваць"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Рэдагаваць вылучаны радок"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Выдаліць"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Выдаліць вылучаны радок"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Аднавіць"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Аднавіць сьпіс"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Блакіраваны"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Націсніце на піктаграму каб зьмяніць яе"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Стварыць новага карыстальніка"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Стварыць хатні каталёг"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Хатні каталёг: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Стварыць прыватную групу для карыстальніка"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Пазначыць карыстальніцкі ID"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Карыстальнік ўжо існуе, пазначце другое Імя"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Несупадзеньне пароляў"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -322,12 +373,12 @@ msgstr ""
 "Гэты пароль занадта просты. \n"
 " Добрыя паролі павінны быць большыя за 6 літараў"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Карыстальніцкі ID < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -338,91 +389,91 @@ msgstr ""
 " Ці вы ўпэўнены, што хочаце зрабіць гэта?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, fuzzy, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Дадаць у групу 'users'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr ""
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr ""
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Адмена"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Так"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, fuzzy, c-format
 msgid "Choose group"
 msgstr "Выберыце групу"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Дадаць у існуючую групу"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Дадаць у групу 'users'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Група з такім імём ўжо існуе. Што будзем рабіць?"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, fuzzy, c-format
 msgid "Create New Group"
 msgstr "Стварыць новага карыстальніка"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Пазначыць ID групы"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Група ўжо існуе, пазначце другое імя для групы"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " ID групы меншы за 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -433,22 +484,22 @@ msgstr ""
 " Ці вы ўпэўненыя ў тым што робіце?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr ""
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, fuzzy, c-format
 msgid "Delete files or not?"
 msgstr "Выдаліць вылучаны радок"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -457,27 +508,27 @@ msgstr ""
 "Выдаленьне карыстальніка %s\n"
 " Таксама выканаць наступныя дзеі\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Выдаліць хатні каталёг: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Выдаліць паштовую скрыню: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr ""
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Ці жадаеце выдаліць групу %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -486,201 +537,205 @@ msgstr ""
 "%s асноўная група для карыстальніка %s\n"
 " Спачатку выдаліце гэтага карыстальніка"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr ""
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Поўнае імя:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Уваход:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Яшчэ раз пароль:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr ":"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Імя групы:"
 
-#: ../userdrake:679
-#, fuzzy, c-format
-msgid "Edit Groups / Users"
-msgstr "Карыстальнікі групы"
+#: ../userdrake:894
+#, c-format
+msgid "Please select at least one group for the user"
+msgstr "Пазначце ня менш адной групы для карыстальніка"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
 
-#: ../userdrake:699
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Вы ня можаце выдаліць карыстальніка '%s' зь ягонай асноўнай групы"
+
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Хата:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Карыстальніцкія дадзеныя"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Дазволіць тэрмін дзеяньня запісу"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Тэрмін дзеяньня выцякае (ГГГГ-ММ-ДД)"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Блакіраваць карыстальніцкі запіс"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Інфармацыя запісу"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Карыстальнік змяняў пароль апошні раз: "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Дазволіць тэрмін дзеяньня паролю"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr ""
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr ""
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr ""
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr ""
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Інфармацыя пра пароль"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Выберыце групы сябром якіх будзе карыстальнік:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Дадзеныя групы"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Пазначце карыстальнікаў каб аб'яднаць у гэтыю групу"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Карыстальнікі групы"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Пазначце ня менш адной групы для карыстальніка"
-
-#: ../userdrake:856
-#, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr ""
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Вы ня можаце выдаліць карыстальніка '%s' зь ягонай асноўнай групы"
+#: ../userdrake:1127
+#, fuzzy, c-format
+msgid "Edit Groups / Users"
+msgstr "Карыстальнікі групы"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Зачыніць"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, fuzzy, c-format
 msgid "Users Management"
 msgstr "Імя карыстальніка"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Поле \"Імя\" пустое. Пазначце яго"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 "Імя павінна ўтрымліваць толькі маленькія лацінскія літары, лічбы, `-' ды `_'"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Імя занадта доўгае"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Памылка"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "невядомая памылка"
+
 #~ msgid "Authors: "
 #~ msgstr "Аўтары: "
 
diff --git a/po/bg.po b/po/bg.po
index e8bfb69..97c7e66 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2009-04-11 09:18+0200\n"
 "Last-Translator: Rossen Karpuzov <gustav cointech net>\n"
 "Language-Team: Mandriva User Group - Bulgaria  < mandriva-bg@googlegroups."
@@ -26,310 +26,362 @@ msgstr ""
 "X-Poedit-Language: Bulgarian\n"
 "X-Poedit-Country: BULGARIA\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Грешка при четене `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Грешка при създаване на `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Грешка при изтриване: `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Грешка при създаване на mail spool.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Грешка при създаване на mail spool.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Грешка при създаване на mail spool.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "непозната грешка"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Грешка при създаване на mail spool.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Грешка при изтриване на главен spool.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Зареждам потребителите и групите... Моля изчакайте"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Мандрива линукс инструмент за работа с потребителски сметки"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Действия"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Промени"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Изтрий"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Настройки"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Филтрира системните потребители"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Файл"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Опресни"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Изход"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Добави потребител"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Добави _група"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/Помощ"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Уведоми за грешка"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Информация..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Търси:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Използва филтър"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Потребители"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Групи"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Потребители и групи"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Име на потребител"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Потребителски номер"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Основна група"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Пълно име"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Влизане в системата"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Домашна директория на потребител"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Статус"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Име на група"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Номер на група"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Членове на група"
 
 # broken into two lines to avoid too large a button
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr ""
 "Добави\n"
 "потребител"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Добавя потребител към системата"
 
 # broken into two lines to avoid too large a button
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Добави група"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Добавя група към системата"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Промени"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Редактира избраната редица"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Изтрий"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Изтрива избраната редица"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Опресни"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Опресни списъка с потребителите"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Заключен"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Просрочен"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Щракнете на иконата,за да я промените"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Създава нов потребител"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Създава домашна директория"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Домашна директория:"
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Създава лична група за потребителя"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Ръчно задаване на потребителски номер"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Това име вече съществува в системата,моля изберете друго"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Паролите не съвпадат"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -338,12 +390,12 @@ msgstr ""
 "Паролата е твърде проста. \n"
 "Добри пароли са тези с поне 6 символа."
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Потребителският номер е по-малък от 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -354,27 +406,27 @@ msgstr ""
 "Сигурни ли сте,че го желаете ?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Добавяне на %s в група \"потребители\""
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Създаване на нова група: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Добавяне на потребител: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Помощник за миграция"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -383,64 +435,64 @@ msgstr ""
 "Искате ли да бъде стартиран помощника за миграция в задание давмъкне Windows "
 "документи и настройки във вашата Мандрива Линукс?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Отказ"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Добре"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Изберете група"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Добавя към съществуваща група"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Добавяне към група \"потребители\""
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr " Група с това име съществува. Какво желаете да направя?"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Създаване на нова група"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Ръчно задаване на номер на група"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Групата вече съществува,моля изберете друго име"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "ГИД е по-малък от 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -451,22 +503,22 @@ msgstr ""
 " Сигурен ли сте,че желаете да го направите ?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Добавяне на група: %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Изтриване на файлове ?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -475,27 +527,27 @@ msgstr ""
 "Изтриване на потребител %s\n"
 " Също изпълни следните действия:\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Изтриване на  домашна директория: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Изтриване на пощенска кутия: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Изтриване на потребител: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Наистина ли желаете да изтриете група %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -504,202 +556,210 @@ msgstr ""
 "%s е основната група на потребител %s\n"
 " Изтрийте първо потребителя."
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Изтриване на група: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Пълно име:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Влизане в с-мата:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Парола:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Потвърждение:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Влизане в системата:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Име на група:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Промяна на потребители/групати"
+msgid "Please select at least one group for the user"
+msgstr "Моля изберете поне една група за потребителя"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Моля въведете година,месец и ден, \n"
+" до които важи сметката"
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Моля попълнете всички полета за \"остаряване\" на паролата\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Не можете да махнете потребител %s от основната му група"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Дом:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Потребителска информация"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Включва валидност на сметките"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Сметката е валидна до (ГГГГ-ММ-ДД):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Заключва потребителска сметка"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Информация за сметка"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Потребителят е сменил последно паролата си на : "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Включва валидност на паролите"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Дни преди да бъде разрешена смяна:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Дни преди да бъде наложена смяна:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Предупреждение (в дни) преди промяната:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Дни преди сметката да стане неактивна"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Информация за паролите"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Изберете към на кои групи ще бъде член потребителят:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Информация за групите"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Изберете потребители за тази група:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Потребители в групата"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Моля изберете поне една група за потребителя"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Моля въведете година,месец и ден, \n"
-" до които важи сметката"
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Моля попълнете всички полета за \"остаряване\" на паролата\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Не можете да махнете потребител %s от основната му група"
+msgid "Edit Groups / Users"
+msgstr "Промяна на потребители/групати"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Затвори"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Запазени права (C) %s от Мандрива"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Работа със сметки"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Boyan Ivanov <boyan17@bulgaria.com>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Полето за име е празно,моля въведете нещо."
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 "Името трябва да съдържа латински букви в долен регистър,цифри,`-' и `_'"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Името е твърде дълго"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Грешка"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "непозната грешка"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Грешка при създаване на `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Автори:"
diff --git a/po/bn.po b/po/bn.po
index 58e825b..53246f8 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Userdrake VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2004-07-28 11:14+0600\n"
 "Last-Translator: Jamil Ahmed <jamil@bengalinux.org>\n"
 "Language-Team: Bangla <mdk-translation@bengalinux.org>\n"
@@ -15,306 +15,358 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "`%s' পড়ার সময় সমস্যা হয়েছে: %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "`%s' তৈরি করার সময় সমস্যা হয়েছে: %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "`%s' মুছে ফেলার সময় সমস্যা হয়েছে: %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "মেইল স্পুল তৈরি করার সময় সমস্যা হয়েছে।\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "মেইল স্পুল তৈরি করার সময় সমস্যা হয়েছে।\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "মেইল স্পুল তৈরি করার সময় সমস্যা হয়েছে।\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "অজানা সমস্যা"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "মেইল স্পুল তৈরি করার সময় সমস্যা হয়েছে।\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "মেইল স্পুল মুছার সময় সমস্যা হয়েছে।\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "ইউজারড্রেক"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "ব্যবহারকারী এবং দল লোড করা হচ্ছে... দয়া করে অপেক্ষা করুন"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "ম্যান্ড্রেক লিনাক্স ইউসারস ম্যানেজমেন্ট টুল"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/কার্যবলী (_ক)"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/সম্পাদনা (_প)"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/মুছে ফেলা (_ছ)"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/অপশন (_অ)"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/সিস্টেম ব্যবহারকারীদের ফিল্টার করো (_ব)"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/ফাইল (_ফ)"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/নতুন করে প্রদর্শন(_ন)"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/প্রস্থান (_হ)"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/ব্যবহারকারী যোগ করো (_য)"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/দল যোগ করো (_দ)"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/সহায়িকা (_স)"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/ত্রুটি পেশ (_ত)"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/সম্বন্ধে (_ম)..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "অনুসন্ধান:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "ফিল্টার ব্যবহার করো"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "ব্যবহারকারী"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "দল"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "ব্যবহারকারী এবং দল"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "ব্যবহারকারীর নাম"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ব্যবহারকারীর ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "প্রাথমিক দল"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "সম্পূর্ণ নাম"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "লগ - ইন শেল"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "হোম ডিরেক্টরি"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "অবস্থা"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "দলের নাম"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "দলের ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "দলের সদস্যবৃন্দ"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "ব্যবহারকারী যোগ করো"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "সিস্টেমে একজন ব্যবহারকারী যোগ করুন"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "দল যোগ করো"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "সিস্টেমে একটি দল যোগ করুন"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "সম্পাদন করো"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "নির্বাচিত সারি সম্পাদন করো"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "মুছে ফেলো"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "নির্বাচিত সারি মুছে ফেলো"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "পুনরায় প্রদর্শন করো"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "তালিকা পুনরায় প্রদর্শন করো"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "লক করা হয়েছে"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "সময়সীমা পেরিয়ে গেছে"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "পরিবর্তন করতে হলে আইকনে ক্লিক করুন"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "নুতন ব্যবহারকারী যোগ করো"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "হোম ডিরেক্টরি তৈরি করো"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "হোম ডিরেক্টরি তৈরি করো: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "ব্যবহারকারীর জন্য একটি ব্যক্তিগত দল তৈরি করো"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "ব্যবহারকারীর ID ম্যানুয়েলি নির্ধারণ করো"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "এই নামের ব্যবহারকারী বর্তমানে উপস্থিত আছে, দয়া করে আরেকটি নাম নির্বাচন করুন"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "পাসওয়ার্ড মেলেনি"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -323,12 +375,12 @@ msgstr ""
 "এই পাসওয়ার্ডটি বেশ সহজ। \n"
 " যে কোনো ভালো পাসওয়ার্ড অন্তত ৬ টি অক্ষরের বেশি হওয়া উচিত"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "আপনার Uid ৫০০ নিচে"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -339,91 +391,91 @@ msgstr ""
 " আপনি কি এই কাজ করার বিষয়ে নিশ্চিত?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "%s কে 'users' দলে  ঢোকানো হচ্ছে"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "নতুন দল তৈরি করা হচ্ছে: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "ব্যবহারকারী যোগ করা হচ্ছে: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "বাতিল"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "ঠিক আছে"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "দল নির্বাচন করুন"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "উপস্থিত দলে যোগ করো"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "'users' দলে যোগ করো"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "এই নামে একটি দল বর্তমানে উপস্থিত আছে। আপনি কী করতে ইচ্ছুক?"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "নতুন দল তৈরি করো"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "দলের ID ম্যানুয়েলি নির্ধারণ করো"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "দল বর্তমানে উপস্থিত আছে, দয়া করে দলের জন্য আরেকটি নাম নির্বাচন করুন"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " দলের Gid ৫০০-র নিচে আছে"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -434,22 +486,22 @@ msgstr ""
 " আপনি কি এই কাজ করার বিষয়ে নিশ্চিত?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "দল যোগ করা হচ্ছে: %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "ফাইল মুছে ফেলা হবে কি না?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -458,27 +510,27 @@ msgstr ""
 "%s ব্যবহারকারীকে মুছে ফেলা হচ্ছে\n"
 " নিম্নোক্ত কার্যগুলিও সম্পন্ন করো\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "হোম ডিরেক্টরি মুছে ফেলো: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "মেইলবক্স মুছে ফেলো :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "ব্যবহারকারীকে মুছে ফেলা হচ্ছে: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "আপনি কি %s দলটিকে মুছে ফেলার বিষয়ে নিশ্চিত"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -487,202 +539,210 @@ msgstr ""
 "%s দলটি %s ব্যবহারকারীর প্রাথমিক দল\n"
 " ব্যবহারকারীকে প্রথমে সরিয়ে ফেলো"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "দলটি সরিয়ে ফেলা হচ্ছে: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "সম্পূর্ণ নাম:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "লগ-ইন:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "পাসওয়ার্ড:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "পাসওয়ার্ড নিশ্চিত করুন:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "লগ - ইন শেল:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "দলের নাম:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "দল / ব্যবহারকারী সম্পাদন করুন"
+msgid "Please select at least one group for the user"
+msgstr "ব্যবহারকারীর জন্য অন্তত একটি দল নির্বাচন করুন"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"অ্যাকাউন্টের সময়সীমা পূরণের বত্‌সর, মাস এবং দিন \n"
+"দয়া করে নির্ধারণ করুন "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "পাসওয়ার্ড-এর সময়সীমা সম্বন্ধীয় সব ক্ষেত্রগুলিকে দয়া করে পূর্ণ করুন।\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "'%s' ব্যবহারকারীকে আপনি তাদের মূল দল থেকে সরিয়ে ফেলতে পারবেন না"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "হোম:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "ব্যবহারকারীর ডাটা"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "অ্যাকাউন্টের সময়সীমা কার্যকরী করো"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "অ্যাকাউন্টের সময়সীমা পার হবে এই তারিখে (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "ব্যবহারকারীর অ্যাকাউন্ট লক করো"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "অ্যাকাউন্ট সম্বন্ধিয় তথ্য"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "ব্যবহারকারী পাসওয়ার্ড সর্বশেষ পরিবর্তন করেছিলেন : "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "পাসওয়ার্ডের সময়সীমা কার্যকরী করো"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "কতদিন পর পরিবর্তন করা যাবে :"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "কত দিন পরে পরিবর্তন প্রয়োজন :"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "পরিবর্তন করার পূর্বে সতর্কবাণী দেওয়ার সময়সীমা (দিন) :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "অ্যাকাউন্টের সময়সীমা পুর্ণ হওয়ার আগের অবশিষ্ট দিন :"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "পাসওয়ার্ড সম্বন্ধিয় তথ্য"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "এই ব্যবহারকারী যে দলগুলির সদস্য হবে তা নির্বাচন করুন:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "ডাটা দলবদ্ধ করো"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "এই দলে যে ব্যবহারকারীদের যোগ করা হবে তাদের নির্বাচন করুন :"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "ব্যবহারকারীদের দলবদ্ধ করো"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "ব্যবহারকারীর জন্য অন্তত একটি দল নির্বাচন করুন"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"অ্যাকাউন্টের সময়সীমা পূরণের বত্‌সর, মাস এবং দিন \n"
-"দয়া করে নির্ধারণ করুন "
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "পাসওয়ার্ড-এর সময়সীমা সম্বন্ধীয় সব ক্ষেত্রগুলিকে দয়া করে পূর্ণ করুন।\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "'%s' ব্যবহারকারীকে আপনি তাদের মূল দল থেকে সরিয়ে ফেলতে পারবেন না"
+msgid "Edit Groups / Users"
+msgstr "দল / ব্যবহারকারী সম্পাদন করুন"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "বন্ধ করো"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "ব্যবহারকারীদের নিয়ন্ত্রন করা"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "ম্যান্ড্রিব লিনাক্স (Mandriva Linux)"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Bangla team <mdk-translation@bengalinux.org>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "নামের ক্ষেত্রটি ফঁাকা রয়েছে, দয়া করে একটি নাম লিখুন"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 "নামের মধ্যে শুধুমাত্র lowercase-এর লাতিন অক্ষর, সংখ্যা, `-' এবং `_' লেখা যাবে"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "নামটি অতিরিক্ত লম্বা"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "সমস্যা"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "অজানা সমস্যা"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "`%s' তৈরি করার সময় সমস্যা হয়েছে: %s"
+
 #~ msgid "Authors: "
 #~ msgstr "লেখক: "
diff --git a/po/br.po b/po/br.po
index eb27465..13c993d 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2006-03-17 16:59+0100\n"
 "Last-Translator: Ja-Mai Drapier <jan-mai.drapier@mail.dotcom.fr>\n"
 "Language-Team: Brezhoneg <ofisk.bzh@wanadoo.fr>\n"
@@ -15,318 +15,370 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1;plural=0\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Fazi en ur lenn `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Fazi en ur krouiñ `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Fazi en ur lemel `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Fazi en ur krouiñ al lostenn postel.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Fazi en ur krouiñ al lostenn postel.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Fazi en ur krouiñ al lostenn postel.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "fazi dianav"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Fazi en ur krouiñ al lostenn postel.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Fazi en ur lemel al lostenn postel.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "O kargañ arveriaded ha strolladoù ... Gortozit mar plij"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Ostil mereañ arveriaded Mandriva Linux"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Oberoù"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Aozañ"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Dilemel"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Dibarzhoù"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Restr"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Adtresañ"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Kuitaat"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/Ouzhpennañ un _arveriad"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Ouzhpennañ un _strollad"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Skoazell"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Reiñ da c'houzout ur gudenn"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_A-brepoz..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Klask :"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Arloañ ar sil"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Arveriadioù"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Strolladoù"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Tud ha strolladoù"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Anv arveriad"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID an arveriad"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Strollad kentañ"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Anv klok"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Shell ereañ"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Renkell ar gêr"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Stad"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Anv ar strollad"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ID ar strollad"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Ezelioù ar strollad"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Ouzhpennañ un arveriad"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Ouzhpennañ un arveriad d'ar reizhiad"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Ouzhpennañ ur strollad"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Ouzhpennañ ur strollad d'ar reizhiad"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Kemmañ"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Aozañ al linenn diuzet"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Lemel"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Lemel al linenn diuzet"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Adtresañ"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Adtresañ ar roll"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Krouilhet"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Kabac'het"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Klikit ouzh an arlun evit kemmañ anezhi"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Krouiñ un arveriad nevez"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Krouiñ ar renkell er-gêr"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Renkell ar gêr : "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Krouiñ ur strollad prevez evit an arveriad"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Lakaat ID an arveriad gant an dorn"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Endeo eo an arveriad, dibabit un anv arveriad all mar plij"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "An tremegerioù ne glot ket"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -334,91 +386,91 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Oc'h ouzhpennañ %s d'ar strollad « users »"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "O grouiñ ar strollad nevez : %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Oc'h ouzhpennañ un arveriad : %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Nullañ"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Ya"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID : "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Dibabit ur strollad"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Ouzhpennañ d'ar strollad a zo c'hoazh"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Ouzhpennañ d'ar strollad 'users'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Krouiñ ur strollad nevez"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Lakaat ID ar strollad gant an dorn"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Endeo eo ar strollad, dibabit un anv strollad all mar plij"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -426,250 +478,258 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Oc'h ouzhpennañ un strollad : %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID :"
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Dilemel ar restroù ?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
 " Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Dilemel renkell ar gêr : %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Dilemel ar voest-lizheroù : /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "O tilemel an arveriad : %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, 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:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "O tilemel ar strollad : %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Anv klok :"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Ereañ :"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Tremenger :"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Tremenger (adarre) :"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell ereañ :"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Anv ar strollad :"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Aozañ strolladoù hag arveriaded"
+msgid "Please select at least one group for the user"
+msgstr "Dibabit ur strollad evit an arveriad d'an nebeutañ mar plij"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr ""
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Ker :"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Roadoù arveriad"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Titouroù diwar ar gont"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr ""
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr ""
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr ""
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr ""
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr ""
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Titouroù diwar an tremenger"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Roadoù strollad"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr ""
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Arveriaded ar strollad"
 
-#: ../userdrake:847
-#, 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:856
-#, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr ""
-
-#: ../userdrake:905
+#: ../userdrake:1127
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr ""
+msgid "Edit Groups / Users"
+msgstr "Aozañ strolladoù hag arveriaded"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Serriñ"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s gant Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Mereañ ar averiaded"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, 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:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Goullo eo an tachenn « anv ». Reiñ un anv mar plij"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Re vras eo an anv"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Fazi"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "fazi dianav"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Fazi en ur krouiñ `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Obererour: "
diff --git a/po/bs.po b/po/bs.po
index 9bd97d4..42146cf 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\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"
@@ -23,306 +23,358 @@ 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"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Greška prilikom čitanja `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Greška prilikom kreiranja `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Greška prilikom uklonjanja `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Greška prilikom kreiranja 'mail spool'-a.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Greška prilikom kreiranja 'mail spool'-a.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Greška prilikom kreiranja 'mail spool'-a.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "nepoznata greška"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Greška prilikom kreiranja 'mail spool'-a.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Greška prilikom brisanja 'mail spool'-a.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Učitavam korisnike i grupe... Molim sačekajte"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Alat za menadžement korisnika na Mandriva Linuxu"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Akcije"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Edituj"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Izbriši"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Opcije"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Filtriraj sistemske korisnike"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Osvježi"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Kraj"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/Dodaj _korisnika"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Dodaj _grupu"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Prijavi grešku"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_O programu..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Pretraga:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Primijeni filter"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Korisnici"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Grupe"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Korisnici i grupe"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Korisničko ime"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Korisnički ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Primarna grupa"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Ime i prezime"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Shell"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Početni direktorij"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Status"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Naziv grupe"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Grupni ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Članovi grupe"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Dodaj korisnika"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Dodaj korisnika na sistem"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Dodaj grupu"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Dodaj grupu na sistem"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Izmijeni"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Izmijeni izabrani red"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Izbriši"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Izbriši izabrani red"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Osvježi"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Osvježi listu"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Zaključano"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Isteklo"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Kliknite na ikonu da je promijenite"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Napravi novog korisnika"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Napravi početni direktorij"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Početni direktorij: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Napravi privatnu grupu za korisnika"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Ručno definiši korisnički ID"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Korisnik već postoji na sistemu. Izaberite drugo korisničko ime"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Šifre nisu jednake"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -331,12 +383,12 @@ msgstr ""
 "Ova šifra je previše jednostavna.\n"
 " Dobre šifre trebaju biti veće od 6 karaktera"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Korisnički Uid je < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -347,91 +399,91 @@ msgstr ""
 " Da li ste sigurni da želite uraditi ovo?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Dodajem %s u grupu 'users'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Pravim novu grupu: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Dodajem korisnika: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "U redu"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Izaberite grupu"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Dodaj u postojeću grupu"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Dodaj u grupu 'users'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Napravi novu grupu"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Ručno definiši ID grupe"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Grupa već postoji, izaberite drugi naziv grupe"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " Grupni Gid je < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -442,22 +494,22 @@ msgstr ""
 " Da li ste sigurni da želite ovo uraditi?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Dodajem grupu: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Izbriši datoteke ili ne?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -466,27 +518,27 @@ msgstr ""
 "Brišem korisnika %s\n"
 " Također slijedeće akcije će biti poduzete\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Izbriši početni direktorij: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Izbriši mailbox :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Uklonjam korisnika: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Da li zaista želite izbrisatti grupu %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -495,202 +547,210 @@ msgstr ""
 "%s je primarna grupa za korisnika %s\n"
 " Prvo uklonite korisnika"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Uklonjam grupu: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Ime i prezime:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Korisničko ime:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Šifra:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Ponovo šifra:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Naziv grupe:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Promijeni grupe/korisnike"
+msgid "Please select at least one group for the user"
+msgstr "Izaberite bar jednu grupu za korisnika"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Definišite dan, mjesec i godinu\n"
+"kada će račun isteći"
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Popunite sva polja za starenje (aging) šifre\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Ne možete ukloniti korisnika '%s' iz njegove primarne grupe"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Početni direktorij:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Podaci korisnika"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Uključi istek računa"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Račun ističe (DD-MM-YYYY):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Zaključaj korisnički račun"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Podaci o računu"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Korisnik je zadnji put promijeni šifru:"
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Uključi istek šifre"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dana prije nego je dozvoljena promjena:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Dana prije nego je promjena zahtjevana:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dana upozorenja prije promjene:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dana prije nego račun bude isključen:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Podaci o šifri"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Izaberite grupe čiji će član korisnik biti"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Podaci o grupi"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Izaberite korisnike koji će se pridružiti grupi"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Korisnici grupe"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Izaberite bar jednu grupu za korisnika"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Definišite dan, mjesec i godinu\n"
-"kada će račun isteći"
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Popunite sva polja za starenje (aging) šifre\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Ne možete ukloniti korisnika '%s' iz njegove primarne grupe"
+msgid "Edit Groups / Users"
+msgstr "Promijeni grupe/korisnike"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Zatvori"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Menadžment korisnika"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Polje za ime je prazno. Unesite ime"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Ime je predugačko"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Greška"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "nepoznata greška"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Greška prilikom kreiranja `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Autori: "
 
diff --git a/po/ca.po b/po/ca.po
index 5df8bf3..0ef857d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2005-10-02 11:44GMT\n"
 "Last-Translator: \n"
 "Language-Team:  <ca@li.org>\n"
@@ -19,307 +19,359 @@ msgstr ""
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Error al llegir `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Error al crear `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Error al eliminar `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Error al crear cua de correu.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Error al crear cua de correu.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Error al crear cua de correu.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "error desconegut"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Error al crear cua de correu.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Error al esborrar cua de correu.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "S'està carregant els usuaris i els grups... Si us plau, espera"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Eina de gestió d'usuaris de Mandriva Linux"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/A_ccions"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/E_dita"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Esborra"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Opcions"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Filtra els usuaris de sistema"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Fitxer"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Refresca"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Surt"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Afegeix usuari"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Afegeix _grup"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Informeu d'un error"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Quant a..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Cerca:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Aplica el filtre"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Usuaris"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Grups"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Usuaris i grups"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Nom d'usuari"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID d'usuari"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Grup primari"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Nom complet"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Intèrpret de comandaments per al login"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Directori personal"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Estat"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Nom del grup"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ID de grup"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Membres del grup"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Afegir usuari"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Afegeix un usuari al sistema"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Afegeix grup"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Afegeix un grup al sistema"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Edita"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Edita la fila seleccionada"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Esborrar"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Elimina la fila seleccionada"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Refresca"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Actualitza la llista"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Bloquejat"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Expirada"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Clica l'icona per canviar-ho"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Crea nou usuari"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Crea el directori personal"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Directori personal: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Crea un grup privat per a l'usuari"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Especifica el ID d'usuari manualment"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr ""
 "Aquest usuari ja existeix dins el sistema, si us plau escull-ne un altre"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "La contrasenya no coincideix"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -328,12 +380,12 @@ msgstr ""
 "Aquesta contrasenya és massa simple. \n"
 " Les bones contrasenyes tenen més de 6 caràcters"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Uid d'usuari és < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -344,91 +396,91 @@ msgstr ""
 " Estàs segur de voler fer això?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "S'està posant %s al grup 'users'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "S'està creant el nou grup: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "S'està afegint l'usuari: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Bé"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Escull grup"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Afegeix a un grup existent"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Afegeix al grup 'users'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Crea un nou grup"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Especifica el ID de grup manualment"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "El grup ja existeix, si us plau escull un altre nom de grup"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " El Gid del grup és < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -439,22 +491,22 @@ msgstr ""
 "Esteu segur que voleu fer-ho?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "S'està afegint el grup: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Esborrar fitxers o no?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -463,27 +515,27 @@ msgstr ""
 "S'està esborrant l'usuari %s\n"
 " Fes també les següents accions\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Esborra el directori personal: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Esborra el mailbox :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "S'està eliminant l'usuari: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Estàs segur de voler eliminar el grup %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -492,203 +544,211 @@ msgstr ""
 "%s és un grup primari per l'usuari %s\n"
 " Elimina l'usuari abans"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "S'està eliminant el grup: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Nom complet:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Confirma la contrasenya:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Intèrpret de comandaments per al login:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Nom del grup:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Edita Grups / Usuaris"
+msgid "Please select at least one group for the user"
+msgstr "Si us plau, escull com a mínim un grup per l'usuari"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Si us plau indica l'any, més i dia\n"
+"per a l'expiració del compte"
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Si us plau empleneu tots els camps per l'envelliment de contrasenya\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "No pots eliminar '%s' del seu grup primari"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Home:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Dades de l'usuari"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Habilita l'expiració de comptes"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "El compte expira (AAAA-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Bloquejar Compte d'Usuari"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Informació del compte"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "L'usuari va canviar la contrasenya el: "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Habilita l'expiració de contrasenyes"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dies abans que es permeti el canvi:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Dies abans que es requereixi el canvi:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dies d'avís abans del canvi:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dies abans de que el compte s'inactivi:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Informació de la contrasenya"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Escull els grups dels quals serà membre aquest usuari:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Dades del grup"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Escull els usuaris que s'uniran a aquest grup :"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Usuaris del grup"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Si us plau, escull com a mínim un grup per l'usuari"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Si us plau indica l'any, més i dia\n"
-"per a l'expiració del compte"
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Si us plau empleneu tots els camps per l'envelliment de contrasenya\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "No pots eliminar '%s' del seu grup primari"
+msgid "Edit Groups / Users"
+msgstr "Edita Grups / Usuaris"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Tanca"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Gestió d'usuaris"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Albert Astals Cid <astals11@terra.es>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "El camp del nom està buit, si us plau, dona un nom"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "El nom és massa llarg"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Error"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "error desconegut"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Error al crear `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Autors: "
 
diff --git a/po/cs.po b/po/cs.po
index df9e5cb..802051b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2009-10-20 00:22+0200\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
@@ -19,309 +19,361 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 0.3\n"
-"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"
+"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"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Chyba při čtení `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Chyba při vytváření `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Chyba při odstranění `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Chyba při vytváření poštovní fronty.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Chyba při vytváření poštovní fronty.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Chyba při vytváření poštovní fronty.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "neznámá chyba"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Chyba při vytváření poštovní fronty.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Chyba při odstraňování poštovní fronty.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Načítám uživatele a skupiny... čekejte prosím"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Nástroj Mandriva Linux pro správu uživatelů"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr "/_Instalovat účet pro hosty"
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr "/_Odinstalovat účet pro hosty"
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Akce"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/Ú_pravy"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/O_dstranit"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/V_olby"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Filtrovat systémové uživatele"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Soubor"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/O_bnovit"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Konec"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/Přid_at uživatele"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Přidat s_kupinu"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/Nápo_věda"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Nahlásit chybu"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/O _aplikaci..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Hledat:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Použít filtr"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Uživatelé"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Skupiny"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Uživatelé a skupiny"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Jméno uživatele"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID uživatele"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Primární skupina"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Celé jméno"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Přihlašovací shell"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Domovský adresář"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Stav"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Název skupiny"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ID skupiny"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Členové skupiny"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Přidat uživatele"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Přidat uživatele do systému"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Přidat skupinu"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Přidat skupinu do systému"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Změnit"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Upravit vybraný řádek"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Odstranit"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Odstranit vybraný řádek"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Obnovit"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Obnovit seznam"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Zamkmutý"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Vypršel"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Klepnutím na ikonu provedete změnu"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Vytvořit nového uživatele"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Vytvořit domovský adresář"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Domovský adresář: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Vytvořit pro uživatele samostatnou skupinu"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Zadat ID uživatele ručně"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, 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:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Hesla se neshodují"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -330,12 +382,12 @@ msgstr ""
 "Toto heslo je příliš jednoduché.\n"
 " Správná hesla by měla být delší než 6 znaků"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "ID uživatele je menší než 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -346,27 +398,27 @@ msgstr ""
 "Jste si jisti, že to chcete udělat?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Přidávám %s do skupiny 'users'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Vytvářím novou skupinu: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Přidávám uživatele: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Průvodce migrací"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -375,64 +427,64 @@ msgstr ""
 "Chcete spustit průvodce migrací a importovat dokumenty a nastavení z Windows "
 "do vaší distribuce Mandriva Linux?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Budiž"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Vybrat skupinu"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Přidat k existující skupině"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Přidat ke skupině 'users'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Vytvořit novou skupinu"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Zadat ID skupiny ručně"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Skupina již existuje, vyberte prosím jiný název skupiny"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "GID skupiny je menší než 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -443,22 +495,22 @@ msgstr ""
 "Jste si jisti, že to chcete udělat?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Přidávám skupinu: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Odstranit soubory nebo ne?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -467,27 +519,27 @@ msgstr ""
 "Odstraňuji uživatele %s\n"
 " Provádějí se také následující akce\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Smazání domovského adresáře: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Smazání poštovní schránky: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Odebírám uživatele: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Opravdu chcete odstranit skupinu %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -496,199 +548,206 @@ msgstr ""
 "%s je primární skupina pro uživatele %s\n"
 "Odstraňte nejprve tohoto uživatele"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Odebírám skupinu: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Celé jméno:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Přihlášení:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Potvrdit heslo:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Přihlašovací shell:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Název skupiny:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Upravit skupiny / uživatele"
+msgid "Please select at least one group for the user"
+msgstr "Vyberte prosím pro uživatele alespoň jednu skupinu"
 
-#: ../userdrake:699
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Zadejte prosím Rok, Měsíc a Den\n"
+"vypršení účtu"
+
+#: ../userdrake:914
+#, 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:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Nelze odstranit uživatele '%s' z jeho primární skupiny"
+
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Domovský adresář:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Údaje o uživateli"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Povolit vypršení účtu"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Účet vyprší   (RRRR-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Zamknout účet uživatele"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Informace o účtu"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Uživatel naposledy změnil heslo dne: "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Povolit vypršení hesla"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Počet dní před povolením změny:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Počet dní před vyžadováním změny:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Varovat dní před změnou:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Počet dní před vypršením účtu:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Informace o heslu"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, 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:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Údaje o skupině"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Vyberte uživatele, kteří mají být v této skupině:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Uživatelé skupiny"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Vyberte prosím pro uživatele alespoň jednu skupinu"
-
-#: ../userdrake:856
-#, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Zadejte prosím Rok, Měsíc a Den\n"
-"vypršení účtu"
-
-#: ../userdrake:862
-#, 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:905
+#: ../userdrake:1127
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Nelze odstranit uživatele '%s' z jeho primární skupiny"
+msgid "Edit Groups / Users"
+msgstr "Upravit skupiny / uživatele"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Zavřít"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright ©%s by Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Správa uživatelů"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Michal Bukovjan <bukm@centrum.cz>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, 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:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Jméno je příliš dlouhé"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Chyba"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "neznámá chyba"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Chyba při vytváření `%s': %s"
diff --git a/po/cy.po b/po/cy.po
index 7549a65..037cc72 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2007-09-24 19:02+0100\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
@@ -20,306 +20,358 @@ msgstr ""
 "X-Poedit-Country: UK\n"
 "Plural-Forms: nplurals=2; plural=(n == 2) ? 1 : 0;\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Gwall darllen `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Gwall greu `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Gwall tynnu `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Gwall creu sbŵl e-bost.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Gwall creu sbŵl e-bost.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Gwall creu sbŵl e-bost.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "gwall anhysbys"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Gwall creu sbŵl e-bost.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Gwall dileu'r sbŵl e-bost.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Llwytho Defnyddwyr a Grwpiau... Arhoswch"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Offeryn Rheoli Defnyddwyr Mandriva Linux"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Gweithredoedd"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/+Golygu"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Dileu"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Dewisiadau"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Hidlo defnyddwyr y system"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Ffeil"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Adnewyddu"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Gadael"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Ychwanegu Defnyddiwr"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Ychwanegu_Grŵp"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Cymorth"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Adroddiad Gwall"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Ynghylch"
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Chwilio:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Gosod Hidl"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Defnyddwyr"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Grwpiau"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Defnyddwyr a grwpiau"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Enw Defnyddiwr"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Enw Defnyddiwr"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Grŵp Cynradd"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Enw Llawn"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Cragen Mewngofnod"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Cyfeiriadur Cartref"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Statws"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Enw Grŵp"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Enw Grŵp"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Aelodau Grŵp"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Ychwanegu Defnyddiwr"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Ychwanegu defnyddiwr i'r system"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Ychwanegu Grŵp"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Ychwanegu grŵp i'r system"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Golygu"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Golygu'r rhes yma"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Dileu"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Dileu rhes"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Adnewyddu"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Adnewyddu'r rhestr"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Clowyd"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Dod i Ben:"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Cliciwch ar yr eicon i'w newid"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Creu Defnyddiwr Newydd"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Creu Cyfeiriadur Cartref"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Cyfeiriadur Cartref:"
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Creu grŵp preifat ar gyfer y defnyddiwr"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Enwch enw'r defnyddiwr gyda llaw"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Mae'r defnyddiwr yn bodoli eisoes, dewiswch Enw Defnyddiwr arall"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Cyfrinair Anghywir"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -328,12 +380,12 @@ msgstr ""
 "Mae'r cyfrinair yn rhy syml.\n"
 "Mae cyfrineiriau effeithiol yn fwy na 6 nod"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "UID Defnyddiwr < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -344,27 +396,27 @@ msgstr ""
 "Ydych chi'n siŵr eich bod am wneud hyn?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Rhoi '%s' yn grŵp 'defnyddwyr'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Creu grŵp newydd: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Ychwanegu defnyddiwr: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Dewin mudo"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -373,64 +425,64 @@ msgstr ""
 "Hoffech chi redeg y dewin mudo er mwyn mewnforio eich holl dogfennau a'ch "
 "gosodiadau Windows i'ch dosbarthiad Mandriva Linux?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Dileu"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Dewis grŵp"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Ychwanegu at y grŵp presennol"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Ychwanegu at y grŵp 'defnyddwyr'."
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Creu Grŵp Newydd"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Enwch enw'r grŵp gyda llaw"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, 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:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " Gid Grŵp < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -441,22 +493,22 @@ msgstr ""
 "Ydych chi'n siwr eich bod am wneud hyn?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Ychwanegu grŵp: %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Dileu ffeil neu beidio?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -465,27 +517,27 @@ msgstr ""
 "Dileu defnyddiwr %s\n"
 " Hefyd cyflawni'r gweithredoedd canlynol\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Dileu Cyfeiriadur Cartref: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Dileu'r Blwch E-bost: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Tynnu defnyddiwr: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Ydych chi wir eisiau dileu grŵp %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -494,202 +546,210 @@ msgstr ""
 "%s yw'r grŵp cynradd ar gyfer defnyddiwr %s\n"
 " Tynnwch y defnyddiwr yn gyntaf"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Tynnu grŵp: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Enw Llawn:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Mewngofnod:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Cadarnhau Cyfrinair:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Cragen Mewngofnod:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Enw Grŵp:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Golygu Grwpiau / Defnyddwyr"
+msgid "Please select at least one group for the user"
+msgstr "Dewiswch o leiaf un grŵp ar gyfer y defnyddiwr"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Nodwch Flwyddyn, Mis a Diwrnod\n"
+"i'r Cyfrif Ddod i Ben"
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Llanwch yr holl feysydd yn y cyfrinair eto\n"
+
+#: ../userdrake:965
+#, 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:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Cartref:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Data Defnyddiwr"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Galluogi trefnu'r cyfrif"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Cyfrif yn dod i ben: (BBBB-MMM-DD)"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Cloi Cyfrif Defnyddiwr"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Gwybodaeth Cyfrif"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Newidiodd y defnyddiwr gyfrinair ar:"
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Galluogi Terfyn Amser i Gyfrinair"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Diwrnod cyn caniatáu newid"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Diwrnod cyn bo angen newid"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dangos rhybudd cyn newid:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Diwrnod cyn i'r cyfrif ddod i ben:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Gwybodaeth am Gyfrinair"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Dewis y grwpiau y bydd yr a defnyddiwr yn aelod ohonynt:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Data Grŵp"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Dewis defnyddwyr i ymuno â'r grŵp"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Defnyddwyr Grwpiau"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Dewiswch o leiaf un grŵp ar gyfer y defnyddiwr"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Nodwch Flwyddyn, Mis a Diwrnod\n"
-"i'r Cyfrif Ddod i Ben"
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Llanwch yr holl feysydd yn y cyfrinair eto\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Nid oes modd tynnu defnyddiwr '%s; o'u grŵp cynradd"
+msgid "Edit Groups / Users"
+msgstr "Golygu Grwpiau / Defnyddwyr"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Cau"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Hawlfraint (C) %s  Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Rheoli Defnyddwyr"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Rhoslyn Prys <post@meddal.com>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Mae'r maes enw'n wag cynigwch enw"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Mae'r enw'n rhy hir"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Gwall"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "gwall anhysbys"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Gwall greu `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Awduron:"
diff --git a/po/da.po b/po/da.po
index df9c4e1..fbdfa84 100644
--- a/po/da.po
+++ b/po/da.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2009-10-19 11:41+0200\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -22,306 +22,358 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Fejl ved læsning af '%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Fejl ved oprettelse af '%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Fejl ved fjernelse af '%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Fejl ved oprettelse af mellemlager for post\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Fejl ved oprettelse af mellemlager for post\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Fejl ved oprettelse af mellemlager for post\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "ukeldt fejl"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Fejl ved oprettelse af mellemlager for post\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Fejl ved sletning af mellemlager for post\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Indlæser brugere og grupper... Vent venligst"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux' værktøj til brugeradministration"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr "/_Installér gæstekonto"
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr "/_Afinstallér gæstekonto"
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Handlinger"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Redigér"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Slet"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Valgmuligheder"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Filtrér systembrugere"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Filer"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Genopfrisk"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Afslut"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/Tilføj _bruger"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Tilføj _gruppe"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Hjælp"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Rapportér fejl"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Om..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Søg:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Udfør filter"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Brugere"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Grupper"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Brugere og grupper"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Brugernavn"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Bruger-id"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Primær gruppe"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Fulde navn"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Login skál"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Hjemmekatalog"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Status"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Gruppenavn"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Gruppe-id"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Gruppemedlemmer"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Tilføj bruger"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Tilføj en bruger til systemet"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Tilføj gruppe"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Tilføj en gruppe til systemet"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Redigér"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Redigér valgte række"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Slet"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Slet valgte række"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Genopfrisk"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Genopfrisk listen"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Låst"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Udløbet"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Klik på ikonen for at ændre den"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Opret ny bruger"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Opret hjemmekatalog"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Hjemmekatalog;: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Opret en privat gruppe for brugeren"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Angiv bruger-id manuelt"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Brugeren findes allerede, vælg venligst et andet brugernavn"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Adgangskode passer ikke"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -330,12 +382,12 @@ msgstr ""
 "Denne adgangskode er for simpel. \n"
 " Gode adgangskoder bør være på 7 tegn eller mere"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Brugernes UID er mindre end 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -346,27 +398,27 @@ msgstr ""
 "Er du sikker på at du vil gøre dette?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Tilføjer %s til 'users'-gruppen"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Opretter ny gruppe: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Tilføjer bruger: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Migrationshjælper"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -375,64 +427,64 @@ msgstr ""
 "Ønsker du at køre migrationshjælperen for at importere Windows-dokumenter og "
 "-opsætninger til din Mandriva Linux-distribution?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Annullér"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Vælg gruppe"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Tilføj til eksisterende gruppe"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Tilføj til 'users'-gruppen"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "En gruppe med dette navn eksisterer allerede, Hvad ønsker du at gøre?"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Opret ny gruppe"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Angiv gruppe-id manuelt"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Gruppe eksisterer allerede, vælg venligst et andet gruppenavn"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "Gruppe-GID er mindre end 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -443,22 +495,22 @@ msgstr ""
 " Er du sikker på at du  ønsker at gøre dette?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Tilføjer gruppe: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Skal filer slettes eller ej?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -467,27 +519,27 @@ msgstr ""
 "Sletter bruger %s\n"
 " Udfør også de følgende de følgende handlinger\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Slet hjemmekatalog: %s "
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Slet postbakke :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Fjerner bruger: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Vil du virkelig slette gruppen %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -496,198 +548,206 @@ msgstr ""
 "%s er en primær gruppe for bruger %s\n"
 " Fjern brugeren først"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Fjerner gruppe: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Fulde navn:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Bekræft adgangskode:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Login skál:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Gruppenavn:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Redigér grupper og brugere"
+msgid "Please select at least one group for the user"
+msgstr "Vælg venligst mindst en gruppe for brugeren"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Angiv venligst år, måned og dag\n"
+" for udløb af konto "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Angiv venligst alle felter for forældelse af adgangskoder\n"
+
+#: ../userdrake:965
+#, 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:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Hjem:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Brugerdata"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Aktivér udløb for konti"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Kontoen udløber (ÅÅÅÅ-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Lås brugerkonto"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Konto-information"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Bruger ændrede sidst adgangskode den: "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Aktivér udløbtid for adgangskoder"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dage før ændring er tilladt: "
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Dage før ændring er krævet: "
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Advarsel gives antal dage før ændring: "
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dage før konto deaktiveres: "
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Info om adgangskode"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, 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:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Gruppedata"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Vælg de brugere som skal tilføjes i denne gruppe"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Gruppebrugere"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Vælg venligst mindst en gruppe for brugeren"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Angiv venligst år, måned og dag\n"
-" for udløb af konto "
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Angiv venligst alle felter for forældelse af adgangskoder\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Du kan ikke fjerne bruger '%s' fra deres primære gruppe"
+msgid "Edit Groups / Users"
+msgstr "Redigér grupper og brugere"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Luk"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Ophavsret © %s ved Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Administration af brugere"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Keld Simonsen <keld@rap.dk>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Navnefelt er tomt, opgiv venligst et navn"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
-msgid "The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Navnet må kun indeholde små bogstaver, cifre ,'-' og '_'"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Navnet er for langt"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Fejl"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "ukeldt fejl"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Fejl ved oprettelse af '%s': %s"
diff --git a/po/de.po b/po/de.po
index 4309ceb..f435b94 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2008-03-05 21:14+0100\n"
 "Last-Translator: Nicolas Bauer <rastafarii@mandrivauser.de>\n"
 "Language-Team:  <de@li.org>\n"
@@ -23,306 +23,358 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Fehler beim Lesen von `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Fehler beim Anlegen von `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Fehler beim Löschen von `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Fehler beim Anlegen der Mail Spool.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Fehler beim Anlegen der Mail Spool.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Fehler beim Anlegen der Mail Spool.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "unbekannter Fehler"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Fehler beim Anlegen der Mail Spool.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Fehler beim Entfernen der Mail Spool.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "UserDrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Lade Benutzer und Gruppen...Bitte warten"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux Benutzerverwaltung"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Bearbeiten"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Ändern"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Löschen"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Bearbeiten"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/Systemkennzeichen _filtern"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Datei"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Aktualisieren"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Beenden"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Benutzer hinzufügen"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/_Gruppe hinzufügen"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Fehler melden"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Über..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Suche:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Filter anwenden"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Benutzer"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Gruppe(n)"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Benutzer und Gruppen"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Benutzername"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Benutzer ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Primärgruppe"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Vollständiger Name"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Login-Shell"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Persönliches Verzeichnis"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Status"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Gruppenname"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Gruppen ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Gruppenmitglieder"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Benutzer hinzufügen"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Benutzer zum System hinzufügen"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Gruppe hinzufügen"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Gruppe hinzufügen"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Ändern"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Ausgewählte Zeile bearbeiten"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Ausgewählte Zeile löschen"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Liste aktualisieren"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Gesperrt"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Abgelaufen"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Klicken Sie auf das Symbol, um es zu ändern."
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Neuen Benutzer erstellen"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Persönliches Verzeichnis erstellen"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Persönliches Verzeichnis:"
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Private Gruppe für den Benutzer erstellen"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Benutzer ID manuell angeben"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Benutzer existiert bereits. Bitte einen anderen Namen wählen."
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Passwort fehlerhaft"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -331,12 +383,12 @@ msgstr ""
 "Das Passwort ist zu einfach. \n"
 "Gute Passwörter sind länger als 6 Zeichen."
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Benutzer ID ist unter 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -347,27 +399,27 @@ msgstr ""
 "Wollen Sie das wirklich machen?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Nehme %s in die Gruppe „users“ auf."
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Erstelle neue Gruppe: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Benutzer hinzufügen: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Migrations Wizard"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -376,64 +428,64 @@ msgstr ""
 "Wollen Sie den Migrations Wizard für den Import von Windows Dokumenten und "
 "Einstellungen starten?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Gruppe auswählen"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Zur existierenden Gruppe hinzufügen"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "In die Gruppe „users“ aufnehmen"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Neue Gruppe erstellen"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Gruppen ID manuell angeben"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Gruppe existiert bereits. Bitte einen anderen Namen wählen."
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "Gruppen ID ist unter 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -444,22 +496,22 @@ msgstr ""
 "Wollen Sie das wirklich machen?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Füge Gruppe hinzu %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Dateien löschen oder nicht?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -468,27 +520,27 @@ msgstr ""
 "Lösche Kennzeichen %s\n"
 " Und führe folgende Aktionen aus\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Lösche Persönliches Verzeichnis: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Lösche Mailbox :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Lösche Kennzeichen: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Wollen Sie wirklich die folgende Gruppe löschen: %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -497,189 +549,189 @@ msgstr ""
 "%s ist die Hauptgruppe des Kennzeichens %s\n"
 "Entfernen Sie zuerst den Benutzer"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Lösche Gruppe: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Vollständiger Name:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Kennzeichen:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Passwort bestätigen:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Login-Shell:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Gruppenname:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Benutzer / Gruppen bearbeiten"
+msgid "Please select at least one group for the user"
+msgstr "Bitte wählen Sie mindestens eine Gruppe für den Benutzer"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Geben Sie Jahr, Monat und Tag \n"
+" des Ablaufens des Kennzeichens an. "
+
+#: ../userdrake:914
+#, 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:965
+#, 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:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Persönliches Verzeichnis:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Benutzerdaten"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Benutzerkonto soll ablaufen"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Konto läuft ab (JJJJ-MM-TT):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Benutzerkennzeichen sperren"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Info über Konto"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Passwort zuletzt geändert am:"
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Passwort soll ablaufen"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Tage vor nächster erlaubter Änderung:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Tage vor nächster erzwungener Änderung:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Anzahl Tage vor Änderung ab denen gewarnt wir:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Tage bevor Kennzeichen gesperrt wird:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Passwort-Info"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, 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:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Gruppendaten"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Wählen Sie die Benutzer für diese Gruppe:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Benutzergruppen"
 
-#: ../userdrake:847
-#, 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:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Geben Sie Jahr, Monat und Tag \n"
-" des Ablaufens des Kennzeichens an. "
-
-#: ../userdrake:862
-#, 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:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Sie können den Benutzer „%s“ nicht aus seiner Hauptgruppe entfernen."
+msgid "Edit Groups / Users"
+msgstr "Benutzer / Gruppen bearbeiten"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Schließen"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright·(C)·%s·bei·Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Benutzerverwaltung"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Nicolas Bauer <rastafarii@mandrivauser.de>\n"
 "Sebastian Deutscher <sebastian.deutscher@web.de>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Es wurde kein Name angegeben. Bitte ändern."
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
@@ -687,15 +739,23 @@ msgstr ""
 "Der Name darf nur Kleinbuchstaben ohne Umlaute, Zahlen,  „-“ und „_“ "
 "enthalten."
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Der Name ist zu lang"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Fehler"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "unbekannter Fehler"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Fehler beim Anlegen von `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Autoren:"
diff --git a/po/el.po b/po/el.po
index d1ad64d..6e0fbfa 100644
--- a/po/el.po
+++ b/po/el.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2009-10-18 10:05+0200\n"
 "Last-Translator: Glentadakis Dimitrios <dglent@gmail.com>\n"
 "Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
@@ -27,306 +27,358 @@ msgstr ""
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Σφάλμα στην ανάγνωση του `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Σφάλμα στην δημιουργία του `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Σφάλμα στην αφαίρεση του `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Σφάλμα στην δημιουργία του ταχυδρομικού νήματος.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Σφάλμα στην δημιουργία του ταχυδρομικού νήματος.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Σφάλμα στην δημιουργία του ταχυδρομικού νήματος.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "άγνωστο σφάλμα"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Σφάλμα στην δημιουργία του ταχυδρομικού νήματος.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Σφάλμα στην διαγραφή του ταχυδρομικού νήματος.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Φορτώνονται οι Χρήστες και οι Ομάδες... Παρακαλώ περιμένετε"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Εργαλείο Διαχείρισης Χρηστών Mandriva Linux"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr "/_Εγκατάσταση λογαριασμού guest"
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr "/_Απεγκατάσταση του λογαριασμού guest"
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Ενέργειες"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Επεξεργασία"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Διαγραφή"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Επιλογές"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Φιλτράρισμα χρηστών συστήματος"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Αρχείο"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Ανανέωση"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Εξοδος"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Προσθήκη Χρήστη"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Προσθήκη _Ομάδας"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Βοήθεια"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Αναφορά Σφάλματος"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Περί..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Αναζήτηση:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Εφαρμογή φίλτρου"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Χρήστες"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Ομάδες"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Χρήστες και Ομάδες"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Όνομα Χρήστη"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID Χρήστη"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Πρωτεύουσα Ομάδα"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Πλήρες Όνομα"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Κέλυφος Προσπέλασης"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Αρχικός Κατάλογος"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Όνομα Ομάδας"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ID Ομάδας"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Μέλη Ομάδας"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Προσθήκη Χρήστη"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Προσθήκη ενός χρήστη στο σύστημα"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Προσθήκη Ομάδας"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Προσθήκη μιας ομάδας στο σύστημα"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Επεξεργασία"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Επεξεργασία επιλεγμένης γραμμής"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Διαγραφή επιλεγμένης σειράς"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Ανανέωση"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Ανανέωση της λίστας"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Κλειδωμένος"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Έληξε"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Κάντε κλικ πάνω στο εικονίδιο για να το αλλάξετε"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Δημιουργία Νέου Χρήστη"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Δημιουργία Αρχικού Καταλόγου Χρήστη"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Αρχικός Κατάλογος: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Δημιουργία μιας προσωπικής ομάδας για τον χρήστη"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Χειροκίνητος ορισμός ID χρήστη"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Ο χρήστης υπάρχει ήδη, παρακαλώ επιλέξτε ένα άλλο Όνομα Χρήστη"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Ο κωδικός δεν συμπίπτει"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -335,12 +387,12 @@ msgstr ""
 "Αυτός ο κωδικός πρόσβασης είναι πολύ απλός. \n"
 " Ένας καλός κωδικός πρέπει να έχει > 6 χαρακτήρες"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Το Uid χρήστη είναι < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -351,27 +403,27 @@ msgstr ""
 "Είστε βέβαιοι ότι θέλετε να συνεχίσετε;\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Τοποθέτηση %s στην ομάδας 'χρηστών'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Δημιουργία νέας ομάδας: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Προσθήκη χρήστη: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Οδηγός εισαγωγής"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -380,64 +432,64 @@ msgstr ""
 "Θέλετε να εκκινήσετε τον οδηγό εισαγωγής των εγγράφων και των ρυθμίσεων από "
 "τα Windows, προς την διανομή σας Mandriva Linux ;"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Εντάξει"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Επιλέξτε Ομάδα"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Προσθήκη στην υπάρχουσα ομάδα"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Προσθήκη στην ομάδα 'χρηστών'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Μια ομάδα με αυτό το όνομα υπάρχει ήδη.  Τι θέλετε να κάνετε;"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Δημιουργία Νέας Ομάδας"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Χειροκίνητος ορισμός ID ομάδας"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Η ομάδα υπάρχει ήδη, παρακαλώ επιλέξτε ένα άλλο Όνομα Χρήστη"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "Το Gid της ομάδας είναι < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -448,22 +500,22 @@ msgstr ""
 "Είστε βέβαιοι ότι θέλετε να συνεχίσετε;\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Προστίθεται η ομάδα: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Σβήσιμο των αρχείων ή όχι;"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -472,27 +524,27 @@ msgstr ""
 "Διαγράφεται ο χρήστης %s\n"
 "Επίσης κάντε και τα παρακάτω\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Διαγραφή Αρχικού Καταλόγου: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Διαγραφή Γραμματοκιβωτίου :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Αφαίρεση χρήστη: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Είστε βέβαιοι για τη διαγραφή τις ομάδας %s;"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -501,189 +553,189 @@ msgstr ""
 "Η %s είναι μια πρωτεύουσα ομάδα για τον χρήστη %s\n"
 " Αφαιρέστε πρώτα τον χρήστη"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Αφαίρεση ομάδας: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Πλήρες Όνομα:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Προσπέλαση:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Κωδικός πρόσβασης:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Επαλήθευση Κωδικού:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Κέλυφος Προσπέλασης:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Όνομα Ομάδας:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Επεξεργασία Ομάδων / Χρηστών"
+msgid "Please select at least one group for the user"
+msgstr "Παρακαλώ επιλέξτε τουλάχιστον μία ομάδα για τον χρήστη"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Παρακαλώ ορίστε την Ημέρα, Μήνα και \n"
+"Χρόνο Λήξης του Λογαριασμό "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Παρακαλώ συμπληρώστε όλα τα πεδία στη γήρανση κωδικού πρόσβασης\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Δεν μπορείτε να αφαιρέσετε τον χρήστη '%s' από την πρωτεύουσα ομάδα"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Αρχικός κατάλογος:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Δεδομένα Χρήστη"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Ενεργοποίηση λήξης λογαριασμού"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Λήξη λογαριασμού (ΧΧΧΧ-ΜΜ-ΗΗ):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Κλείδωμα του Λογαριασμού Χρήστη"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Πληροφορίες Λογαριασμού"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Ο χρήστης άλλαξε τελευταία τον κωδικό του στις : "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Ενεργοποίηση Λήξης Κωδικού Πρόσβασης"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Ημέρες πριν επιτραπεί η αλλαγή :"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Μέρες πριν από την υποχρεωτική αλλαγή :"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Ημέρες προειδοποίησης πριν από την αλλαγή :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Μέρες πριν ο λογαριασμός γίνει ανενεργός :"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Πληροφορίες κωδικού"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Επιλέξτε τις ομάδες στις οποίες θα ανήκει αυτός ο χρήστης:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Δεδομένα Ομάδας"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Επιλέξτε τους χρήστες που θα προστεθούν σε αυτή την ομάδα :"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Ομάδα Χρηστών"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Παρακαλώ επιλέξτε τουλάχιστον μία ομάδα για τον χρήστη"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Παρακαλώ ορίστε την Ημέρα, Μήνα και \n"
-"Χρόνο Λήξης του Λογαριασμό "
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Παρακαλώ συμπληρώστε όλα τα πεδία στη γήρανση κωδικού πρόσβασης\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Δεν μπορείτε να αφαιρέσετε τον χρήστη '%s' από την πρωτεύουσα ομάδα"
+msgid "Edit Groups / Users"
+msgstr "Επεξεργασία Ομάδων / Χρηστών"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C)%s by mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Διαχείριση Χρηστών"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Νίκος Νύκταρης <niktarin@yahoo.com>\n"
 "Glentadakis Dimitrios <dglent@gmail.com>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Το πεδίο όνομα είναι κενό, παρακαλώ δώστε ·ένα όνομα"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
@@ -691,16 +743,24 @@ msgstr ""
 "Το όνομα πρέπει να περιέχει μόνο μικρά λατινικά γράμματα, αριθμούς, `-' και "
 "`_'"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Το όνομα είναι πολύ μακρύ"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Σφάλμα"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "άγνωστο σφάλμα"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Σφάλμα στην δημιουργία του `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Δημιουργοί: "
 
diff --git a/po/eo.po b/po/eo.po
index 7016840..abdb7cb 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2008-01-11 19:18+0100\n"
 "Last-Translator: Vilhelmo Lutermano <vlutermano@free.fr>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -20,306 +20,358 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Eraro dum legado `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Eraro dum kreado `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Eraro dum forigado `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Error kreante retpoŝtan fon-eneligonl.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Error kreante retpoŝtan fon-eneligonl.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Error kreante retpoŝtan fon-eneligonl.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "nekonata eraro"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Error kreante retpoŝtan fon-eneligonl.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Eraro forigante retpoŝtan fon-eneligon.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Ŝargante Uzulojn kaj Grupojn... Bonvole atendi"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mastrumilo por Mandriva Linux Uzuloj"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Agoj"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Redaktu"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Forigu"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Opcioj"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Filtrilo uzuloj"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Dosiero"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Rekalkulu"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Finu"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Aldonu uzulon"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Aldonu _grupon"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Helpo"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Raportu cimon"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Pri..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Serĉu:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Apliku filtrilon"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Uzuloj"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Grupoj"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Uzuloj kaj grupoj"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Uzul-nomo"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Uzula ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Primara grupo"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Plena nomo"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Salutnoma kampo"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Hejma dosierujo"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Statuso"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Grupa nomo"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Grupa ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Grupanoj"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Aldonu uzulon"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Aldonu uzulon al la sistemo"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Aldonu grupon"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Aldonu grupon al la sistemo"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Redaktu"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Redaktu selektitan linion"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Forigu"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Forigu selektitan linion"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Rekalkulu"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Rekalkulu la liston"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Ŝlosita"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Eksvalida"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Alklaku la piktogramon por ŝanĝi ĝin"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Kreu novan uzulon"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Kreu hejman dosierujon"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Hejma dosierujo"
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Kreu privatan grupon por la uzulo"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Mane difinu uzul-ID"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Ĉi tiu nomo jam ekzistas, bonvolu elekti alian uzulnomon"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Pasvorta konfuzo"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -328,12 +380,12 @@ msgstr ""
 "Tiu ĉi pasvorto estas tro simpla. \n"
 " Bonaj pasvortoj havu > 6 signojn"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Uzula Uid estas < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -344,27 +396,27 @@ msgstr ""
 " Ĉu vi certas  ke vi volas tion?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Aldonante %s al la grupo 'uzuloj'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Kreante novan grupon: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Mi aldonas uzulon: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Migrad-helpilo"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -373,64 +425,64 @@ msgstr ""
 "Ĉu vi deziras funkciigi la migrado-helpilon por importi Vindozajn "
 "dokumentojn kaj agordojn en vian Mandriva Linukso-eldonon?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Nuligu"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "JES"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Elektu grupon"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Aldonu al la ekzistanta grupo"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Aldonu al la grupo 'uzuloj' ('users')"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Kreu novan grupon"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Difinu grupan ID mane"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Grupo jam ekzistas, bonvolu elekti alian grupnomon"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "Gid de la grupo estas < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -441,22 +493,22 @@ msgstr ""
 " Ĉu vi certas ke vi volas tion?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Mi aldonas grupon: %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Ĉu forigi la dosierojn aŭ ne?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -465,27 +517,27 @@ msgstr ""
 "Mi forigas la uzulon %s\n"
 " Faru ankaŭ la jenon\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Forigu hejman dosierujon: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Forigu la poŝtkeston: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Mi forigas uzulon: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Ĉu vi vere volas forigi la grupon %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -494,198 +546,206 @@ msgstr ""
 "%s estas primara grupo por uzulo %s\n"
 " Unue forigu la uzulon"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Mi forigas grupon: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Plena nomo:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Salutnomo:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Pasvorto:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Konfirmu pasvorton:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Salutnoma kampo:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Grupa nomo:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Redakti Grupojn/Uzulojn"
+msgid "Please select at least one group for the user"
+msgstr "Bonvolu selekti almenaŭ unu grupon por la uzulo"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Bonvolu difinu Jaron, Monaton kaj Tagon \n"
+" por kont-eksvalidiĝo "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Bonvolu difini la tutan kampon por pasvort-aĝiĝo\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Vi ne povas forigi la uzulon '%s' de ties primara grupo"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Hejmo:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Uzul-datumoj"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Enŝaltu kont-eksvalidiĝon"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Konto eksvalidiĝos (JJJJ-MM-TT):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Ŝlosu la uzul-konton"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Kont-informo"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Uzulo laste ŝanĝis pasvorton al: "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Enŝaltu pasvort-eksvalidiĝon"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Tagoj antaŭ ol ŝanĝo estas permesita:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Tagoj postulataj antaŭ ŝanĝo:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Tagoj da avertado antaŭ ŝanĝo:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Tagoj antaŭ malaktivigo de la konto:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Pasvort-informo"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Selektu la grupojn kies ano estu la uzulo:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Grupo-datumoj"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Selektu la uzulojn aniĝendajn al tiu grupo:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Grupo Uzuloj"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Bonvolu selekti almenaŭ unu grupon por la uzulo"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Bonvolu difinu Jaron, Monaton kaj Tagon \n"
-" por kont-eksvalidiĝo "
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Bonvolu difini la tutan kampon por pasvort-aĝiĝo\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Vi ne povas forigi la uzulon '%s' de ties primara grupo"
+msgid "Edit Groups / Users"
+msgstr "Redakti Grupojn/Uzulojn"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Fermu"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Kopirajto (C) %s ĉe Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Uzul-mastrumado"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Vilhelmo Lutermano <vlutermano@free.fr>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Nomo-kampo malplenas, bonvolu enmeti nomon"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "La nomo devas havi nur minusklajn literojn, ciferojn,`-' kaj `_'"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Nomo tro longas"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Eraro"
+
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "nekonata eraro"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Eraro dum kreado `%s': %s"
diff --git a/po/es.po b/po/es.po
index 606a3ca..8b1390b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2007-10-03 11:24-0300\n"
 "Last-Translator: Fabián Mandelbaum <fmandelbaum@gmail.com>\n"
 "Language-Team: Español <es@li.org>\n"
@@ -23,307 +23,359 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Error al leer `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Error al crear `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Error al quitar `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Error al crear cola de correo.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Error al crear cola de correo.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Error al crear cola de correo.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Error al crear cola de correo.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Error al eliminar cola de correo.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Cargando usuarios y grupos... Por favor, espere"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Herramienta de administración de usuarios de Mandriva Linux"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Acciones"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Borrar"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Opciones"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Filtrar usuarios del sistema"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Fichero"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Refrescar"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Salir"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>S"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Añadir usuario"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Añadir _Grupo"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/a_Yuda"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Reportar bug"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Acerca de..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Buscar:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Aplicar filtro"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Grupos"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Usuarios y grupos"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Nombre de usuario"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID de usuario"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Grupo primario"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Nombre completo"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Shell de login"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Directorio personal"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Estado"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Nombre del grupo"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ID de grupo"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Miembros del grupo"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Añadir usuario"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Añadir un usuario al sistema"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Añadir grupo"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Añadir un grupo al sistema"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Editar"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Editar fila seleccionada"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Borrar fila seleccionada"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Refrescar la lista"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Trabado"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Expirado"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Haga clic sobre el icono para cambiarlo"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Crear usuario nuevo"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Crear directorio personal"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Directorio personal: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Crear un grupo privado para el usuario"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Especificar ID de usuario manualmente"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr ""
 "El usuario ya existe en el sistema, por favor use otro nombre de usuario"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "No coincide la contraseña"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -332,12 +384,12 @@ msgstr ""
 "Esta contraseña es demasiado simple. \n"
 " Las contraseñas buenas deberían tener más de 6 caracteres"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "El UID del usuario es menor a 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -348,27 +400,27 @@ msgstr ""
 "¿Está seguro que desea hacer esto?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Poniendo %s en el grupo 'users'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Creando grupo nuevo: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Añadiendo usuario: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Asistente de migración"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -377,64 +429,64 @@ msgstr ""
 "¿Desea ejecutar el asistente de migración para importar los ajustes y "
 "documentos de Windows® en su sistema Mandriva Linux?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Aceptar"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Elegir un grupo"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Añadir al grupo existente"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Añadir al grupo 'users'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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é desearía hacer?"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Crear nuevo grupo"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Especificar ID de grupo manualmente"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "El grupo ya existe, por favor use otro nombre de grupo"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "El GID del grupo es menor a 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -445,22 +497,22 @@ msgstr ""
 "¿Está seguro que desea hacer esto?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Añadiendo grupo: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "¿Borrar o no archivos?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -469,27 +521,27 @@ msgstr ""
 "Borrando usuario %s\n"
 " Realizando también lo siguiente\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Borrar directorio personal: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Borrar casilla de correo: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Quitando usuario: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "¿Realmente desea borrar el grupo %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -498,201 +550,209 @@ msgstr ""
 "%s es un grupo primario para el usuario %s\n"
 "Quite primero al usuario"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Quitando grupo: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Nombre completo:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Confirmar contraseña:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell de login:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Nombre del grupo:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Editar Grupos/Usuarios"
+msgid "Please select at least one group for the user"
+msgstr "Por favor, seleccione al menos un grupo para el usuario"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Por favor, especifique el año, mes y día\n"
+"para la expiración de la cuenta"
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
+"Por favor, complete todos los campos para la caducación de la contraseña\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "No puede quitar al usuario '%s' de su grupo primario"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Directorio personal:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Datos del usuario"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Habilitar expiración de cuenta"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "La cuenta expira (AAAA-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Trabar cuenta de usuario"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Información de la cuenta"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "El usuario cambió la contraseña por última vez el : "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Habilitar expiración de contraseña"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Días antes que se permita el cambio :"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Días antes que se requiera el cambio :"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Días de advertencia antes del cambio :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Días antes que la cuenta se inactive :"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Información de contraseña"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Seleccione los grupos a los cuales pertenecerá el usuario:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Datos del grupo"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Seleccione los usuarios que formarán parte de este grupo:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Grupos de usuarios"
 
-#: ../userdrake:847
+#: ../userdrake:1127
 #, c-format
-msgid "Please select at least one group for the user"
-msgstr "Por favor, seleccione al menos un grupo para el usuario"
-
-#: ../userdrake:856
-#, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Por favor, especifique el año, mes y día\n"
-"para la expiración de la cuenta"
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr ""
-"Por favor, complete todos los campos para la caducación de la contraseña\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "No puede quitar al usuario '%s' de su grupo primario"
+msgid "Edit Groups / Users"
+msgstr "Editar Grupos/Usuarios"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright © %s por Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Administración de usuarios"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "José Manuel Pérez <jmprodu@hotmail.com>\n"
 "Pablo Saratxaga <pablo@mandriva.com>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "El campo de nombre está vacío, por favor proporcione un nombre"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "El nombre debe contener sólo letras minúsculas, números, `-' y `_'"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "El nombre es muy largo"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Error"
+
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "error desconocido"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Error al crear `%s': %s"
diff --git a/po/et.po b/po/et.po
index c38aaa3..d8df07e 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2009-10-19 13:02+0300\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -17,306 +17,358 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Viga '%s' lugemisel: %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Viga '%s' loomisel: %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Viga '%s' eemaldamisel: %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Viga kirjade puhvri loomisel.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Viga kirjade puhvri loomisel.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Viga kirjade puhvri loomisel.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "tundmatu viga"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Viga kirjade puhvri loomisel.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Viga kirjade puhvri kustutamisel.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Kasutajate ja gruppide laadimine... Palun oodake"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linuxi kasutajate haldur"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr "/Pa_igalda külalise (guest) konto"
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr "/_Eemalda külalise (guest) konto"
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Toimingud"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Muuda"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Kustuta"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Seadistused"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Filtreeri süsteemsed kasutajad"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Fail"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/Vä_rskenda"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Välju"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/Lis_a kasutaja"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Lisa _grupp"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Veateade"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Teave..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Otsing:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Rakenda filter"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Kasutajad"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Grupid"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Kasutajad ja grupid"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Kasutajanimi"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Kasutaja ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Esmane grupp"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Täisnimi"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Kasutatav shell"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Kodukataloog"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Staatus"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Grupi nimi"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Grupi ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Grupi liikmed"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Lisa kasutaja"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Lisab süsteemi kasutaja"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Lisa grupp"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Lisab süsteemi grupi"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Muuda"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Muudab valitud rida"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Kustuta"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Kustutab valitud rea"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Värskenda"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Värskendab nimekirja"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Lukustatud"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Aegunud"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Ikooni muutmiseks klõpsake sellel"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Uue kasutaja loomine"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Kodukataloogi loomine"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Kodukataloog: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Kasutajale luuakse privaatgrupp"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Kasutaja ID määratakse käsitsi"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Selline kasutaja on juba olemas, palun valige muu nimi"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Paroolid ei lange kokku"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -325,12 +377,12 @@ msgstr ""
 "See parool on liiga lihtne. \n"
 " Korralik parool peaks koosnema vähemalt 6 sümbolist"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Kasutaja UID on väiksem kui 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -341,27 +393,27 @@ msgstr ""
 " Kas soovite seda kindlasti teha?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "%s lisatakse gruppi 'users'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Uue grupi loomine: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Kasutaja lisamine: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Kolimisnõustaja"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -370,64 +422,64 @@ msgstr ""
 "Kas soovite käivitada kolimisnõustaja, et importida Windowsi dokumendid ja "
 "seadistused ka oma Mandriva Linuxi süsteemi?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Loobu"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Olgu"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Vali grupp"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Lisa olemasolevasse gruppi"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Lisa gruppi 'users'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Uue grupi loomine"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Grupi ID määratakse käsitsi"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Selline grupp on juba olemas, palun valige muu nimi"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " Grupi GID on väiksem kui 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -438,22 +490,22 @@ msgstr ""
 " Kas soovite seda kindlasti teha?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Grupi lisamine: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Kas kustutada failid?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -462,27 +514,27 @@ msgstr ""
 "Kasutaja %s kustutamine\n"
 " Ühtlasi võetakse ette järgmised tegevused\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Kustutatakse kodukataloog: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Kustutatakse postkast: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Kasutaja eemaldamine: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Kas tõesti kustutada grupp %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -491,198 +543,206 @@ msgstr ""
 "%s on kasutaja %s esmane grupp\n"
 " Eemaldage esmalt kasutaja"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Grupi eemaldamine: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Täisnimi:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Kasutajatunnus:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Parool:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Parool uuesti:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Kasutatav shell:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Grupi nimi:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Gruppide / kasutajate redigeerimine"
+msgid "Please select at least one group for the user"
+msgstr "Palun valige kasutajale vähemalt üks grupp"
+
+#: ../userdrake:904
+#, 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 "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Palun täitke kõik parooli aegumise väljad\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Kasutajat '%s' ei saa eemaldada tema esmasest grupist"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Kodukataloog:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Kasutaja andmed"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Konto aegumise lubamine"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Konto aegub (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Kasutaja konto lukustamine"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Konto info"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Kasutaja muutis viimati parooli: "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Parooli aegumise lubamine"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Päevi enne muutmise lubamist:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Päevi enne muutmise nõudmist:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Päevi enne muutmise hoiatuse andmist:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Päevi enne konto tühistamist:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Parooli info"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Grupid, millesse see kasutaja kuulub:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Grupi andmed"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Kasutajad, kes sellesse gruppi kuuluvad:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Grupikasutajad"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Palun valige kasutajale vähemalt üks grupp"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, 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 "
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Palun täitke kõik parooli aegumise väljad\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Kasutajat '%s' ei saa eemaldada tema esmasest grupist"
+msgid "Edit Groups / Users"
+msgstr "Gruppide / kasutajate redigeerimine"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Sulge"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Autoriõigus (C) %s: Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Kasutajate haldamine"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Marek Laane <bald@starman.ee>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Nimeväli on tühi. Palun määrake nimi"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Nimi on liiga pikk"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Viga"
+
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "tundmatu viga"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Viga '%s' loomisel: %s"
diff --git a/po/eu.po b/po/eu.po
index cfd4ed4..c4aace8 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2009-10-18 09:32+0200\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: Basque <kde-i18n-doc@kde.org>\n"
@@ -21,306 +21,358 @@ msgstr ""
 "X-Generator: Lokalize 0.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Akatsa '%s' irakurtzerakoan: %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Akatsa '%s' sortzerakoan: %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Akatsa '%s' ezabatzerakoan: %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Akatsa posta txirrita sortzerakoan.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Akatsa posta txirrita sortzerakoan.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Akatsa posta txirrita sortzerakoan.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "akats ezezakuna"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Akatsa posta txirrita sortzerakoan.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Akatsa posta txirrita ezabatzerakoan.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Erabiltzaile eta Taldeak zamatzen... mesedez itxoin"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux Erabiltzaileen Kudeaketa Tresna"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr "/_Instalatu gonbidatu kontua"
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr "/_Desinstalatu gonbidatu kontua"
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Ekintzak"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Editatu"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Ezabatu"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Aukerak"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Iragazi sistemaren erabiltzaileak"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Fitxategia"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Berritu"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Irten"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>I"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Erabiltzailea gehitu"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/_Taldea gehitu"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Laguntza"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/Akatsa _txostendu"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Honi buruz..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Bilatu:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Iragazkia aplikatu"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Erabiltzaileak"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Taldeak"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Erabiltzaileak eta taldeak"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Erabiltzaile Izena"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Erabiltzaile ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Talde Primarioa"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Izen Osoa"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Erregistro Maskorra"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Atariko Direktorioa"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Egoera"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Talde Izena"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Talde ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Taldeko Partadeak"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Erabiltzaileak Erantsi"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Sistemara erabiltzaile bat erantsi"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Taldea Erantsi"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Sistemara talde bat erantsi"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Editatu"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Editatu aukeratutako errenkada"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Ezabatu aukeratutako errenkada"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Berritu"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Zerrenda berritu"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Giltzatuta"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Balio Galduta"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Klikatu ikonoan berau aldatzeko"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Erabiltzaile berria sortu"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Sortu Atariko Direktorioa"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Atariko Direktorioa: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Erabiltzailearentzako talde pribatua sortu"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Zehaztu eskuz erabiltzaile ID"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Izen hori dagoeneko badago, aukeratu bestu erabiltzaile izen bat"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Pasahitza ez dator bat"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -329,12 +381,12 @@ msgstr ""
 "Pasahitza sinpleegia da.\n"
 "Pasahitz onak > 6 karatere behar lituzke"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Erabiltzaile UID < 500 da"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -345,27 +397,27 @@ msgstr ""
 "Ziur zaude hau egin nahi duzula?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "'users' taldeari %s jartzen"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Talde berria sortzen: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Erabiltzailea eransten: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Migrazio morroia"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -374,64 +426,64 @@ msgstr ""
 "Migrazio morroia exekutatu nahi duzu Windows dokumentu eta ezarpenak "
 "(documents and settings) zure Mandriva Linux banaketara inportatzeko?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Utzi"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Ados"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Aukeratu taldea"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Erantsi dagoen taldera"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Erantsi 'users' taldeari"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Talde berria sortu"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Zehaztu eskuz talde ID"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Taldea dagoeneko badago, mesedez aukeratu beste talde izen bat"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "Talde GID < 500 da"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -442,22 +494,22 @@ msgstr ""
 "Ziur zaude hau egin nahi duzula?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Taldea eransten: %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Fitxategiak ezabatu edo ez?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -466,27 +518,27 @@ msgstr ""
 "%s erabiltzailea ezabatzen\n"
 " Burutu ondorengo ekintzak ere\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Ezabatu Atariko Direktorioa: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Ezabatu Postakutxa: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Erabiltzailea ezabatzen: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Benetan ezabatu nahi duzu %s taldea?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -495,200 +547,207 @@ msgstr ""
 "%s, %s erabiltzailearentzako talde primarioa da\n"
 "Lehendabizi ezabatu erabiltzailea"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Taldea ezabatzen: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Izen Osoa:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Erregistroa:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Pasahitza berretsi:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Erregistro Maskorra:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Talde Izena:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Editatu Taldeak / Erabiltzaileak"
+msgid "Please select at least one group for the user"
+msgstr "Aukeratu talde bat gutxienez erabiltzailearentzako"
 
-#: ../userdrake:699
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Zehaztu kontuak balioa galduko duen \n"
+"urtea, hilabetea eta eguna"
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Mesedez, bete pasahitza galdu dadin eremu guztiak\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Ezin duzu '%s' erabiltzailea bere talde primariotik kendu"
+
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Ataria:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Erabiltzailearen datuak"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Kontuaren balio-galtzea gaitu"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Kontuak balioa galtzen du (UUUU-HH-EE): "
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Blokeatu Erabiltzaile Kontua"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Kontuaren Info"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Erabiltzaileak pasahitza azkenekoz aldatu zuen: "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Pasahitzaren balio-galtzea gaitu"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Egunak aldaketa baimendu aurretik: "
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Egunak aldaketa eskatu aurretik: "
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Egunak ohartarazten aldaketa aurretik: "
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Egunak kontua ezgaitu aurretik: "
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Pasahitzaren Info"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Hautatu erabiltzailea partaide izango duten taldeak: "
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Talde datuak"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Aukeratu talde honetara batuko diren erabiltzaileak: "
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Talde erabiltzaileak"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Aukeratu talde bat gutxienez erabiltzailearentzako"
-
-#: ../userdrake:856
-#, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Zehaztu kontuak balioa galduko duen \n"
-"urtea, hilabetea eta eguna"
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Mesedez, bete pasahitza galdu dadin eremu guztiak\n"
-
-#: ../userdrake:905
+#: ../userdrake:1127
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Ezin duzu '%s' erabiltzailea bere talde primariotik kendu"
+msgid "Edit Groups / Users"
+msgstr "Editatu Taldeak / Erabiltzaileak"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Itxi"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Erabiltzaileen Kudeaketa"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Izen eremua hutsik dago, mesedez eman izen bat"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, 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"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Izena luzeegia da"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Okerra"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "akats ezezakuna"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Akatsa '%s' sortzerakoan: %s"
diff --git a/po/fa.po b/po/fa.po
index df15a1a..b635d07 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2004-09-26 14:46+0330\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
 "Language-Team: Persian\n"
@@ -18,306 +18,358 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "خطا در خواندن `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "خطا در ایجاد کردن `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "خطا در برداشتن `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "خطا در ایجاد کردن چرخه‌ی پست.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "خطا در ایجاد کردن چرخه‌ی پست.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "خطا در ایجاد کردن چرخه‌ی پست.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "خطای ناشناخته"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "خطا در ایجاد کردن چرخه‌ی پست.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "خطا در حذف کردن چرخه‌ی پست.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "در حال بارگذاری کاربران و گروه‌ها... لطفاً صبر کنید"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "ابزار مدیریت اربران لینوکس ماندریبا"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_کنش‌ها"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_ویرایش"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_حذف"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_گزینه‌ها"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_فیلتر کردن کاربران سیستم"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_پرونده"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_نوسازی"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_ترک"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_افزودن کاربر"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/افزودن _گروه"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_راهنما"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_گزارش اشکال"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_درباره‌ی..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "جستجو:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "گذاردن فیلتر"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "کاربران"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "گروه‌ها"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "کاربرها و گروه‌ها"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "نام کاربر"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "شناسه‌ی کاربر"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "گروه اولیه"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "نام کامل"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "پوسته‌ی ثبت‌ورود"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "شاخه‌ی خانه"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "وضعیت"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "نام گروه"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "شناسه‌ی گروه"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "اعضای گروه"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "افزودن کاربر"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "افزودن یک کاربر به سیستم"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "افزودن گروه"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "افزودن یک گروه به سیستم"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "ویرایش"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "ویرایش ردیف انتخاب شده"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "حذف"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "حذف ردیف انتخاب شده"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "نوسازی"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "نوسازی لیست"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "قفل شده است"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "منقضی شده است"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "برای تغییر آن بر روی شمایل کلیک کنید"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "ایجاد کاربر جدید"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "ایجاد شاخه‌ی خانه"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "شاخه‌ی آغازه: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "ایجاد یک گروه خصوصی برای کاربر"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "مشخص کردن دستی شناسه‌ی کاربر"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "کاربر از قبل وجود دارد، لطفاً نام کاربری دیگری را انتخاب کنید"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "عدم تطابق گذرواژه"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -326,12 +378,12 @@ msgstr ""
 "این گذرواژه خیلی ساده است. \n"
 "گذرواژه‌ی خوب باید بیشتر از ۶ نویسه داشته باشد"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "شناسه کاربر کوچکتر از ۵۰۰ است"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -342,91 +394,91 @@ msgstr ""
 "آیا مطمئن هستید که می‌خواهید این کار را انجام دهید؟\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "گذاشتن %s به گروه کاربران"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "ایجاد گروه جدید: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "افزودن کاربر: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "لغو"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "تایید"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "انتخاب کردن گروه"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "افزودن به گروه موجود"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "افزودن به گروه 'کاربران'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "یک گروه با این نام از قبل وجود دارد. چکار دوست دارید بکنید؟"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "ایجاد گروه جدید"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "مشخص کردن دستی شناسه‌ی گروه"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "گروه از قبل وجود دارد، لطفاً نام دیگری برای گروه انتخاب کنید"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "شناسه گروه کوچکتر از ۵۰۰ است"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -437,22 +489,22 @@ msgstr ""
 "آیا مطمئن هستید که می‌خواهید این کار را انجام دهید؟\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "افزودن گروه: %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "حذف پرونده‌ها یا نه؟"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -461,27 +513,27 @@ msgstr ""
 "حذف کردن کاربر %s\n"
 " کنش‌های بدنبال آمده را نیز انجام دهید\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "حذف شاخه‌ی آغازه: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "حذف جعبه‌ی پست : /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "برداشتن کاربر: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "آیا واقعاً می‌خواهید گروه %s را حذف کنید؟"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -490,201 +542,209 @@ msgstr ""
 "%s یک گروه مقدم برای کاربر %s می‌باشد\n"
 " نخست کاربر را بردارید"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "برداشتن گروه: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "نام کامل:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "ثبت‌ورود:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "گذرواژه:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "تصدیق گذرواژه:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "پوسته‌ی ثبت‌ورود:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "نام گروه:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "ویرایش کاربرها / گروه‌ها"
+msgid "Please select at least one group for the user"
+msgstr "لطفاً حداقل یک گروه را برای کاربر انتخاب کنید"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"لطفاً سال، ماه و روز را برای انقضای \n"
+"حساب مشخص کنید "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "لطفاً تمام محوطه‌های در عمر گذرواژه را پُر کنید\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "شما نمی‌توانید کاربرهای '%s' را از گروه اولیه‌اشان بردارید"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "آغازه:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "اطلاعات کاربر"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "بکار انداختن انقضای حساب"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "پایان یافتن حساب (سال-ماه-روز):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "قفل کردن حساب کاربر"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "اطلاعات حساب"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "تغییر گذرواژه‌ی کاربر آخرین بار در :"
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "بکار انداختن انقضای گذرواژه"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "تعداد روزها قبل از آنکه تغییر اجازه داده شود:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "تعداد روزها قبل از آنکه تغییر لازم بشود:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "روزهای هشدار قبل از تغییر: "
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "تعداد روزها قبل از آنکه حساب غیر فعال شود:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "اطلاعات گذرواژه"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "انتخاب گروهی که کاربر عضو آن خواهد شد:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "داده‌های گروه"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "انتخاب کاربران برای پیوستن به این گروه:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "کاربران گروه"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "لطفاً حداقل یک گروه را برای کاربر انتخاب کنید"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"لطفاً سال، ماه و روز را برای انقضای \n"
-"حساب مشخص کنید "
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "لطفاً تمام محوطه‌های در عمر گذرواژه را پُر کنید\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "شما نمی‌توانید کاربرهای '%s' را از گروه اولیه‌اشان بردارید"
+msgid "Edit Groups / Users"
+msgstr "ویرایش کاربرها / گروه‌ها"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "بستن"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "مدیریت کاربران"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "ماندریبا لینوکس"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Abbas Izad <abbasizad@hotmail.com>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "محوطه‌ی نام خالی است لطفاً یک نام را عرضه کنید"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "نام باید فقط دارای حروف کوچک لاتین، اعداد، `-' و `_' باشد"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "نام خیلی طولانی است"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "خطا"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "خطای ناشناخته"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "خطا در ایجاد کردن `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "نگارندگان: "
diff --git a/po/fi.po b/po/fi.po
index 0bae541..370ab71 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2009-11-27 17:42+0200\n"
 "Last-Translator: Jani Välimaa <wally@mandriva.org>\n"
 "Language-Team: Finnish <cooker-i18n@mandrivalinux.org>\n"
@@ -24,306 +24,358 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Virhe luettaessa %s: %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Virhe luotaessa %s: %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Virhe poistettaessa %s: %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Virhe luotaessa postilaatikkoa.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Virhe luotaessa postilaatikkoa.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Virhe luotaessa postilaatikkoa.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "tuntematon virhe"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Virhe luotaessa postilaatikkoa.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Virhe poistettaessa postilaatikkoa.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Ladataan käyttäjät ja ryhmät... Odota hetki"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linuxin käyttäjienhallintatyökalu"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr "/Asenna _vierastili"
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr "/Poista _vierastili"
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/T_oiminnot"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Muokkaa"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Poista"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Asetukset"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Piilota järjestelmäkäyttäjät"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Tiedosto"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Päivitä"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Lopeta"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>L"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/Lisää _käyttäjä"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Lisää _ryhmä"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/O_hje"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Ilmoita virheestä"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Tietoja"
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Etsi:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Suodata"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Ryhmät"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Käyttäjät ja ryhmät"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Käyttäjätunnus"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "UID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Ensisijainen ryhmä"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Kirjautumistulkki"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Kotihakemisto"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Tila"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Nimi"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "GID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Jäsenet"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Lisää käyttäjä"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Lisää käyttäjä järjestelmään"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Lisää ryhmä"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Lisää ryhmä järjestelmään"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Muokkaa valittua riviä"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Poista"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Poista valittu rivi"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Päivitä"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Päivitä lista"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Lukittu"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Vanhentunut"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Vaihda kuvaketta napsauttamalla"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Luo uusi käyttäjä"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Luo kotihakemisto"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Kotihakemisto: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Luo käyttäjälle yksityinen ryhmä"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Määritä UID käsin"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, 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:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Salasana ei täsmää"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -332,12 +384,12 @@ msgstr ""
 "Salasana on liian yksinkertainen.\n"
 " Hyvä salasana on vähintään kuusi merkkiä pitkä."
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Käyttäjän UID on pienempi kuin 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -348,91 +400,91 @@ msgstr ""
 " Haluatko varmasti luoda käyttäjän?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Lisätään käyttäjä %s ryhmään \"users\"."
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Luodaan uusi ryhmä: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Lisätään käyttäjä: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Tietojen tuonti Windowsista"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr "Haluatko tuoda Windowsin dokumentit ja asetukset Mandriva Linuxiin?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Valitse ryhmä"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Lisää olemassa olevaan ryhmään"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Lisää ryhmään \"users\""
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Luo uusi ryhmä"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Määritä GID käsin"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Ryhmä on jo olemassa, valitse toinen nimi ryhmälle"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " Ryhmän GID on pienempi kuin 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -443,22 +495,22 @@ msgstr ""
 " Haluatko varmasti luoda ryhmän?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Lisätään ryhmä: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Poistetaanko tiedostot?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -467,27 +519,27 @@ msgstr ""
 "Poistetaan käyttäjä %s.\n"
 " Suorita myös seuraavat tehtävät:\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Poista kotihakemisto: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Poista sähköpostilaatikko: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Poistetaan käyttäjä: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Haluatko varmasti poistaa ryhmän %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -496,189 +548,189 @@ msgstr ""
 "%s on käyttäjän %s ensisijainen ryhmä\n"
 " Poista ensin käyttäjä"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Poistetaan ryhmä: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Koko nimi:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Käyttäjätunnus:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Varmista salasana:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Kirjautumistulkki:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Ryhmän nimi:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Muokkaa ryhmiä / käyttäjiä"
+msgid "Please select at least one group for the user"
+msgstr "Valitse käyttäjälle vähintään yksi ryhmä"
 
-#: ../userdrake:699
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Määrittele vuosi, kuukausi ja päivä\n"
+" jolloin käyttäjätili vanhenee "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Täytä kaikki kentät salasanan vanhenemiselle\n"
+
+#: ../userdrake:965
+#, 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:986
 #, c-format
 msgid "Home:"
 msgstr "Kotihakemisto:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Käyttäjän tiedot"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Ota käyttöön käyttäjätilin vanheneminen"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Käyttäjätili vanhenee (VVVV-KK-PP):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Lukitse käyttäjätili"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Käyttäjätili"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Käyttäjä vaihtoi salasanaa viimeksi:"
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Ota käyttöön salasanan vanheneminen"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Salasanan vaihtaminen sallitaan X päivän jälkeen:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Salasanan vaihtaminen vaaditaan X päivän jälkeen:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Varoita X päivää ennen vaihtamista:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, 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:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Salasana"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Valitse ryhmät, joihin käyttäjä kuuluu:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Ryhmän tiedot"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Valitse ryhmään kuuluvat käyttäjät:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Ryhmän käyttäjät"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Valitse käyttäjälle vähintään yksi ryhmä"
-
-#: ../userdrake:856
-#, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Määrittele vuosi, kuukausi ja päivä\n"
-" jolloin käyttäjätili vanhenee "
-
-#: ../userdrake:862
+#: ../userdrake:1127
 #, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Täytä kaikki kentät salasanan vanhenemiselle\n"
-
-#: ../userdrake:905
-#, 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"
+msgid "Edit Groups / Users"
+msgstr "Muokkaa ryhmiä / käyttäjiä"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Sulje"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s, Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Käyttäjienhallinta"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Thomas Backlund <tmb@mandrake.org>\n"
 "Jani Välimaa <jani.valimaa@gmail.com>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Käyttäjätunnus on pakollinen tieto"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
@@ -686,14 +738,20 @@ msgstr ""
 "Käyttäjätunnus voi muodostua vain pienistä kirjaimista, numeroista ja "
 "merkeistä \"-\" ja \"_\""
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Nimi on liian pitkä"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Virhe"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "tuntematon virhe"
 
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Virhe luotaessa %s: %s"
diff --git a/po/fr.po b/po/fr.po
index a9001ae..fc440fc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
-"PO-Revision-Date: 2009-10-17 19:08+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
+"PO-Revision-Date: 2010-02-02 02:50+0100\n"
 "Last-Translator: Lecureuil Nicolas <n1c0l4s.l3@wanadoo.fr>\n"
 "Language-Team: francais <fr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,310 +21,366 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Erreur lors de la lecture de `%s' : %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Erreur lors de la création de `%s' : %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Erreur lors de la suppression de `%s' : %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr ""
+"Erreur lors de la création du répertoire de stockage du courrier "
+"électronique.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr ""
 "Erreur lors de la création du répertoire de stockage du courrier "
 "électronique.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "L'utilisateur ne peut être modifé %s.\n"
+
+#: ../USER/USER.xs:592
+#, fuzzy, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr "L'utilisateur ne peut être modifé %s.\n"
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "Erreur inconnue"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr ""
+"Erreur lors de la création du répertoire de stockage du courrier "
+"électronique.\n"
+
+#: ../USER/USER.xs:695
+#, fuzzy, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr "L'utilisateur ne peut être modifé %s.\n"
+
+#: ../USER/USER.xs:705
+#, fuzzy, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr "L'utilisateur ne peut être modifé %s.\n"
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr ""
 "Erreur lors de la suppression du répertoire de stockage du courrier "
 "électronique.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Chargement des Utilisateurs et des Groupes... Veuillez patienter"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Outil de gestion des utilisateurs de Mandriva Linux"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr "/_Installer le compte invité"
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr "/_Désinstaller le compte invité"
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Actions"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Éditer"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Effacer"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Options"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Filtrer les utilisateurs du système"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Fichier"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Rafraîchir"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Quitter"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Ajouter Utilisateur"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Ajouter _Groupe"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Aide"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Rapporter un bogue"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_A propos..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Chercher : "
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Appliquer le filtre"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Groupes"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Utilisateurs et groupes"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Nom d'utilisateur"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID utilisateur"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Groupe primaire"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Nom complet"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Shell de démarrage"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Dossier personnel"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Statut"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Nom du groupe"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ID Groupe"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Membres du groupe"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Ajouter utilisateur"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Ajouter un utilisateur au système"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Ajouter un groupe"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Ajouter un groupe au système"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Éditer"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Éditer la ligne sélectionnée"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Retirer"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Retirer la ligne sélectionnée"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Rafraîchir la liste"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Verrouillé"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Expiré"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Cliquez sur l'icone afin de la modifier"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Créer un nouvel utilisateur"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Créer le dossier personnel"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Dossier personnel : "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Créer un groupe privé pour l'utilisateur"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Indiquer manuellement l'ID utilisateur"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "L'utilisateur existe déjà, veuillez choisir un autre nom"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Mot de passe incorrect"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -334,12 +390,12 @@ msgstr ""
 " Les bons mots de passe doivent \n"
 " comporter plus 6 caractères"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "L'identifiant utilisateur est inférieur à 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -349,27 +405,27 @@ msgstr ""
 "Créer un utilisateur avec un UID en-dessous de 500 est déconseillé.\n"
 " Êtes-vous sûr de vouloir le faire ?\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Ajouter %s au groupe « users »"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Création du nouveau groupe : %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Ajout de l'utilisateur : %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Assistant de migration"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -378,64 +434,64 @@ msgstr ""
 "Voulez-vous lancer l'assistant de migration afin d'importer les documents et "
 "réglages de Windows dans votre distribution Mandriva Linux ?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID : "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Choisir un groupe"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Ajouter au groupe existant"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Ajouter au groupe 'users'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Un groupe avec ce nom existe déjà. Que voulez-vous faire ?"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Créer un nouveau groupe"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Indiquer un ID de groupe manuellement"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, 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:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " L'identifiant de groupe est inférieur à 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -446,22 +502,22 @@ msgstr ""
 " Êtes-vous sûr de vouloir le faire ?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Ajout du groupe : %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID : "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Effacer les fichiers ou non ?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -470,27 +526,27 @@ msgstr ""
 "Destruction de l'utilisateur %s\n"
 " ainsi que la réalisation des actions suivantes\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Effacer le dossier personnel : %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Destruction de la boite de messages : /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Destruction de l'utilisateur : %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Voulez-vous réellement détruirer le groupe « %s » ?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -499,177 +555,177 @@ msgstr ""
 "%s est un groupe primaire pour l'utilisateur %s\n"
 " Enlever l'utilisateur d'abord"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Destruction du groupe : %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Nom complet :"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Utilisateur :"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Confirmation du mot de passe : "
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell de démarrage :"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Nom du groupe :"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Éditer les Groupes / les Utilisateurs"
+msgid "Please select at least one group for the user"
+msgstr "Veuillez choisir au moins un groupe pour l'utilisateur"
+
+#: ../userdrake:904
+#, 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 "
 
-#: ../userdrake:699
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Veuillez indiquer tous les champs pour l'expiration du mot de passe\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Vous ne pouvez pas supprimer l'utilisateur '%s' de son groupe primaire"
+
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Dossier perso. :"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Données utilisateur"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Activer l'expiration du compte"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Date d'expiration du compte  (AAAA-MM-JJ) : "
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Bloquer le compte utilisateur"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Info sur le compte"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "L'utilisateur a changé son mot de passe le : "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Activer l'expiration du mot de passe"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Nombre de jours avant qu'une modification soit permise : "
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Nombre de jours avant le changement : "
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Nombre de jours avant l'avertissement : "
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Nombre de jours avant de désactiver le compte : "
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Information sur le mot de passe"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Choisir les groupes dont l'utilisateur sera membre : "
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Données sur le groupe"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Choisir les utilisateurs de ce groupe : "
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Membres du groupe"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Veuillez choisir au moins un groupe pour l'utilisateur"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, 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 "
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Veuillez indiquer tous les champs pour l'expiration du mot de passe\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Vous ne pouvez pas supprimer l'utilisateur '%s' de son groupe primaire"
+msgid "Edit Groups / Users"
+msgstr "Éditer les Groupes / les Utilisateurs"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Fermer"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s par Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Gestion Utilisateurs"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
@@ -688,23 +744,23 @@ msgstr ""
 "Didier Hérisson <didier.herisson@angstrom.uu.se>\n"
 "Nicolas Lécureuil <neoclust@mandriva.org>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Le champ nom est vide veuillez fournir un nom"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Le nom ne peut contenir que lettres minuscules, nombres, `-' et `_'"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Le nom est trop long"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Erreur"
diff --git a/po/fur.po b/po/fur.po
index 99e8e24..65084ad 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\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"
@@ -17,306 +17,357 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, fuzzy, c-format
 msgid "Error removing `%s': %s"
 msgstr "Rimozion dal utent: %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr ""
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr ""
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+msgid "Group creation failed.\n"
+msgstr ""
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr ""
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Cjariant Utents e Grops... Par plasè, spiete"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Imprest par le gjestion dai utents di Mandriva Linux"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Azions"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Mude"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Scancele"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Opzions"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Filtre i utents dal sisteme"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_File"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Atualize"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Jessî"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Zonte Utent"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/_Zonte Grop"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Jutori"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Segnale un Bug"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Informazions su..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Cîr:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Apliche filtri"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Utents"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Grops"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Utents e grops"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Non utent"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID Utent"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Grop Primari"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Non complet"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Shell di login"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Cartele home"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Stât"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Non Grop"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ID Grop"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Membris dal Grop"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Zonte Utent"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Zonte un utent al sisteme"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Zonte Grop"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Zonte un grop al sisteme"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Mude"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Mude rie selezionade"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Scancele"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Scancele rie selezionade"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Atualize"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Atualize le liste"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Blocât"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Scjadût"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Frache su le icone par cambiâle"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Cree un gnûf utent"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Cree le cartele Home"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Cartele Home: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Cree un grop privât par l'utent"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Specifiche manualmentri il ID dal utent"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, 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:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Le password no corispuint"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -325,12 +376,12 @@ msgstr ""
 "Cheste password e je masse semplice. \n"
 " Buinis password e an di sedi > 6 letaris"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "UID dal utent inferiôr a 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -341,91 +392,91 @@ msgstr ""
 "Sêstu sigûr di volè fâlu?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Insedament di %s tal grop 'utents'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Creazion di un gnûf grop: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Zonte utent: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Scancele"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Va ben"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Sielç grop"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Zonte al grop esistint"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Zonte al grop 'utents'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Cree un gnûf grop"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Specificâ manualmentri un ID di grop"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, 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:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " GID dal grop inferiôr di 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -436,22 +487,22 @@ msgstr ""
 " Setu sigûr di ve voe di falu? \n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Zonte dal grop: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Scancele i file o no?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -460,27 +511,27 @@ msgstr ""
 "Scancelant utent %s\n"
 " E vignaran fatis ancje les azions seguentis\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Scancele le cartele Home: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Scancele le Mailbox :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Rimozion dal utent: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Âstu veramentri voie di scancelâ il grop %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -489,202 +540,206 @@ msgstr ""
 "%s al è il grop primari dal utent %s\n"
 " Tu âs prin di rimovi l'utent"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Rimozion dal grop: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Non complet:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Password:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Confirme Password:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell di login:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Non Grop:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Mude Grops / Utents"
+msgid "Please select at least one group for the user"
+msgstr "Par plasè sielç almancul un grop par l'utent"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Par plasè specifiche An, Mês e Dî \n"
+"di scjadince dal account"
+
+#: ../userdrake:914
+#, 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:965
+#, 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:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Home:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Dâts Utent"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Abilite le scjadince dal account"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "L'Account al scjât il (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Bloche l'account dal utent"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Informazions account"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "L'utent al à mudât le password il : "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Abilite le scjadince de password"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dìs prin che sedi permitude le modifiche :"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Dìs prin che sedi domandade le modifiche :"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dìs di avertence prin de modifiche :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dìs prin che l'account al sedi inatîf :"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Informazions password"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, 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:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Dâts Grop"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Sielç i utents di zontâ a chest grop :"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Utents dal grop"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Par plasè sielç almancul un grop par l'utent"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Par plasè specifiche An, Mês e Dî \n"
-"di scjadince dal account"
-
-#: ../userdrake:862
-#, 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:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "No tu puedis rimovi l'utent '%s' dal so grop primari"
+msgid "Edit Groups / Users"
+msgstr "Mude Grops / Utents"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Siere"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Gjestion Utents"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Andrea Gracco <graccoandrea@tin.it>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, 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:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Il non al è masse lunc"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Fal"
 
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Rimozion dal utent: %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Autôrs: "
 
diff --git a/po/ga.po b/po/ga.po
index d4f39a0..62dd4bf 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\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"
@@ -17,320 +17,372 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "Teíp ag lódáil comhad pixmap: %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Teíp ag lódáil comhad pixmap: %s"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 #, fuzzy
 msgid "Error creating mail spool.\n"
 msgstr "Teíp ag lódáil comhad pixmap: %s"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Teíp ag lódáil comhad pixmap: %s"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "earráid anaithnid"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Teíp ag lódáil comhad pixmap: %s"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 #, fuzzy
 msgid "Error deleting mail spool.\n"
 msgstr "Teíp ag lódáil comhad pixmap: %s"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr ""
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr ""
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Eagar"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Dealaigh"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Roghanna"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/C_omhad"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Ériggh"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>E"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr ""
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr ""
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/C_úidiú"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Tuairaisc Fabht"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Faoi..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Cuardaigh:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Úsáideoirí"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Grupaí"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Úsáideoirí agus grúpaí"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Ainm Úsáideora"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID Úsáideoir"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Ainm Iomlán"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Blaosc Logála Isteach"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Comhadlann bhaile"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Stádas"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Ainm Grúpa"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ID Grupa"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, fuzzy, c-format
 msgid "Group Members"
 msgstr "Grupaí"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Cuir Úsáideoir Leis"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Grúpa Nua"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr ""
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Eagar"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Scríos"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Nuashonraigh"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr ""
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Faoi Ghlas"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "As Dáta"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr ""
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr ""
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr ""
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr ""
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, fuzzy, c-format
 msgid "Password Mismatch"
 msgstr "Pasfhocal"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -338,91 +390,91 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr ""
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr ""
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr ""
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Cealaigh"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Ceart go Leor"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr ""
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Cruthaigh Grúpa Nua"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -430,249 +482,257 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr ""
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr ""
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
 " Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr ""
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr ""
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr ""
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr ""
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Ainm Iomlán:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Logann:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Pasfhocal:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Dearbhaigh an Focal Faire:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, fuzzy, c-format
 msgid "Login Shell:"
 msgstr "Logann:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, fuzzy, c-format
 msgid "Group Name:"
 msgstr "ID Grupa:"
 
-#: ../userdrake:679
-#, fuzzy, c-format
-msgid "Edit Groups / Users"
-msgstr "Eagar úsáideoir(í)"
+#: ../userdrake:894
+#, c-format
+msgid "Please select at least one group for the user"
+msgstr ""
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr ""
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Baile:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, fuzzy, c-format
 msgid "User Data"
 msgstr "ID Úsáideoir"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr ""
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr ""
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr ""
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr ""
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr ""
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, fuzzy, c-format
 msgid "Password Info"
 msgstr "Pasfhocal"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, fuzzy, c-format
 msgid "Group Data"
 msgstr "ID Grupa"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr ""
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, fuzzy, c-format
 msgid "Group Users"
 msgstr "Grupaí"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr ""
-
-#: ../userdrake:856
-#, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr ""
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr ""
+#: ../userdrake:1127
+#, fuzzy, c-format
+msgid "Edit Groups / Users"
+msgstr "Eagar úsáideoir(í)"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Dún"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, fuzzy, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Coípcheart © 2003 Mandriva."
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, fuzzy, c-format
 msgid "Users Management"
 msgstr "Ainm Úsáideora"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Earráid"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "earráid anaithnid"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Teíp ag lódáil comhad pixmap: %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Údáir: "
 
diff --git a/po/gl.po b/po/gl.po
index 6eaaad7..296b3be 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\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"
@@ -21,306 +21,358 @@ msgstr ""
 "X-Generator: KBabel 1.0.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Erro ó ler `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Erro ó crear `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Erro ó eliminar `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Erro ó crear a cola de correo.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Erro ó crear a cola de correo.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Erro ó crear a cola de correo.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "erro descoñecido"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Erro ó crear a cola de correo.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Erro ó eliminar a cola de correo.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Cargando Usuarios e Grupos... Por favor agarde"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Ferramenta de Xestión de Usuarios de Mandriva Linux"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Accións"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Borrar"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Opcións"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Filtrar usuarios do sistema"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Ficheiro"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Recargar"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Sair"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Engadir Usuario"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Engadir _Grupo"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Axuda"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Comunicar Erro"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Acerca de..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Buscar:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Aplica-lo filtro"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Grupos"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Usuarios e grupos"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Nome de Usuario"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID de Usuario"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Grupo Principal"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Nome Completo"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Shell deLogin"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Directorio Persoal"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Estado"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Nome do Grupo"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ID do Grupo"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Membros do Grupo"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Engadir Usuario"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Engadir un usuario ó sistema"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Engadir Grupo"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Engadir un grupo ó sistema"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Editar"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Edita-la fila seleccionada"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Borra-la fila seleccionada"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Recargar"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Recarga-la lista"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Caducado"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Clique na icona para cambialo"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Crear Novo Usuario"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Crear Directorio Persoal"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Directorio Persoal: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Crear un grupo privado para o usuario"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Especificar manualmente a ID do usuario"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Este usuario xa existe, por favor escolla outro Nome de Usuario"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Os Contrasinais Non Coinciden"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -329,12 +381,12 @@ msgstr ""
 "Este contrasinal é demasiado sinxelo. \n"
 " Os bos contrasinais deben ter máis de 6 caracteres"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "A Uid do usuario é menor de 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -345,27 +397,27 @@ msgstr ""
 " ¿Está seguro de querer facer isto?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Engadindo %s ó grupo 'usuarios'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Creando novo grupo: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Engadindo usuario: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Asistente de migración"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -374,64 +426,64 @@ msgstr ""
 "Desexa executar o asistente de migración para poder importar o documents and "
 "settings de Windows á súa distribución Mandriva Linux?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Aceptar"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Escolla un grupo"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Engadir ó grupo existente"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Engadir ó grupo 'usuarios'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Crear Novo Grupo"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Especificar manualmente a ID do grupo"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, 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:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " O Gid do grupo é menor de 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -442,22 +494,22 @@ msgstr ""
 " ¿Está seguro de querer facer isto?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Engadindo grupo: %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "¿Desexa elimina-los ficheiros?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -466,27 +518,27 @@ msgstr ""
 "Eliminando o usuario %s\n"
 " Realizar tamen esta accións\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Elimina-lo Directorio Persoal: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Elimina-lo Buzón :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Eliminando o usuario: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Desexa elimina-lo grupo %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -495,203 +547,211 @@ msgstr ""
 "%s é o grupo primario do usuario %s\n"
 " Borre o usuario primeiro"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Eliminando o grupo: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Nome Completo:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Contrasinal:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Confirme o Contrasinal:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell deLogin:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Nome do Grupo:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Editar Grupos / Usuarios"
+msgid "Please select at least one group for the user"
+msgstr "Por favor, seleccione como minimo un grupo para inclui-lo usuario nel"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Por favor, especifique o Dia, o Mes e o Ano \n"
+" para a Caducación da Conta "
+
+#: ../userdrake:914
+#, 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:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Non pode elimina-lo usuario '%s' do seu grupo principal"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Dir. Persoal:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Datos do Usuarios"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Habilita-la caducidade da conta"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "A conta caduca o (DD-MM-YYYY):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Bloquear Conta de Usuario"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Información da Conta"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Último troco de contrasinal do usuario:"
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Habilita-la Caducidade do Contrasinal"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dias que deben pasar antes de que se permita facer cambios: "
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Dias que deben pasar antes de que se requira facer cambios: "
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dias de aviso antes do cambio: "
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Días antes de que a conta se desactive:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Información do Contrasinal"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, 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:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Datos de Grupo"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Seleccione usuarios para unilos a este grupo: "
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Usuarios do Grupo"
 
-#: ../userdrake:847
-#, 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:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Por favor, especifique o Dia, o Mes e o Ano \n"
-" para a Caducación da Conta "
-
-#: ../userdrake:862
-#, 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:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Non pode elimina-lo usuario '%s' do seu grupo principal"
+msgid "Edit Groups / Users"
+msgstr "Editar Grupos / Usuarios"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Pechar"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s de Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Xestión de Usuarios"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, 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:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "O campo do nome está baleiro, por favor escriba un nome"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "O nome é moi longo"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Erro"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "erro descoñecido"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Erro ó crear `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Autores: "
diff --git a/po/he.po b/po/he.po
index 0550424..57fbc55 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\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"
@@ -23,306 +23,358 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "חלה שגיאה בעת קריאת `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "חלה תקלה ביצירת `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "חלה תקלה בעת הסרת `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "חלה תקלה בעת יצירת ספריית דואר.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "חלה תקלה בעת יצירת ספריית דואר.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "חלה תקלה בעת יצירת ספריית דואר.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "שגיאה לא ידועה"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "חלה תקלה בעת יצירת ספריית דואר.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "חלה תקלה בעת מחיקת ספריית הדואר.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "טוען משתמשים וקבוצות... נא להמתין"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "כלי ניהול משתמשים של Mandriva Linux"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_פעולות"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_עריכה"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_מחיקה"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/א_פשרויות"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/סינון משתמשי מערכת"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_קובץ"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_רענן"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_יציאה"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_הוספת משתמש"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/הוספת _קבוצה"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_עזרה"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_דווח על באג"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/אודות..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "חיפוש:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "החל מסנן"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "משתמשים"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "קבוצות"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "משתמשים וקבוצות"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "שם משתמש"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "קוד זיהוי משתמש"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "קבוצה ראשונית"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "שם מלא"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "מעטפת כניסה לחשבון"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "ספריית הבית"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "מצב"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "שם הקבוצה"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "קוד זיהוי קבוצה"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "חברים בקבוצה"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "הוספת משתמש"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "הוספת משתמש למערכת"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "הוספת קבוצה"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "הוספת קבוצה למערכת"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "עריכה"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "עריכת עמודה מסומנת"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "מחיקה"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "מחיקת שורה מסומנת"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "רענן"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "רענן רשימת משתמשים"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "נעול"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "פג"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "לחץ על הצלמית בכדי לערוך את זה"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "יצירת משתמש חדש"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "יצירת ספריית הבית של המשתמש"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "ספריית הבית של המשתמש: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "יצירת קבוצה פרטית עבור המשתמש"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "קבע את קוד זיהוי המשתמש באופן ידני"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "משתמש זה כבר קיים במערכת, נא לבחור שם משתמש אחר"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "סיסמאות לא תואמות"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -331,12 +383,12 @@ msgstr ""
 "סיסמה זו פשוטה מדי\n"
 "סיסמה טובה צריכה להכיל יותר מ-6 תווים."
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "קוד זיהוי המשתמש קטן מ-500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -347,27 +399,27 @@ msgstr ""
 "האם ברצונך לבצע פעולה זו?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "הוספת %s אל קבוצת 'משתמשים'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "יצירת קבוצה חדשה: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "הוספת משתמש: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "אשף הגירה"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -376,64 +428,64 @@ msgstr ""
 "האם להריץ את אשף ההגירה כדי לייבא מסמכי והגדרות וינדוז אל מערכת המנדריבה-"
 "לינוקס שלך?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "ביטול"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "אישור"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "קוד זיהוי המשתמש (UID): "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "יש לבחור קבוצה"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "הוסף לקבוצה קיימת"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "הוסף לקבוצת ה'משתמשים'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "קבוצה עם השם הזה כבר קיימת. מה רצונך לעשות?"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "יצירת קבוצה חדשה"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "קבע את קוד זיהוי הקבוצה באופן ידני"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "הקבוצה כבר קיימת, נא לבחור שם אחר לקבוצה"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "קוד זיהוי הקבוצה קטן מ-500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -444,22 +496,22 @@ msgstr ""
 "האם ברצונך לבצע פעולה זו?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "הוספת קבוצה: %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "קוד זיהוי הקבוצה (GID):"
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "האם למחוק את הקבצים או לא?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -468,27 +520,27 @@ msgstr ""
 "מחיקת משתמש %s\n"
 " תגרום גם לפעולות הבאות:\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "מחיקת ספריית הבית של משתמש: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "מחיקת חשבון הדואר /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "הסרת משתמש: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "האם באמת למחוק את קבוצה %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -497,202 +549,210 @@ msgstr ""
 "%s היא קבוצה ראשונית עבור משתמש %s\n"
 " נא למחוק את המשתמש קודם לכן"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "הסרת קבוצה: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "שם מלא:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "שם משתמש:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "יש לאשר את הסיסמה:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "מעטפת כניסה לחשבון:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "שם הקבוצה:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "עריכת קבוצות / משתמשים"
+msgid "Please select at least one group for the user"
+msgstr "נא לבחור לפחות קבוצה אחת לפחות עבור המשתמש"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"נא לקבוע שנה, חודש ויום\n"
+" עבור תפוגת החשבון "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "נא לספק את הסיסמה הישנה בכל השדות\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "אין אפשרות למחוק את המשתמש '%s' מהקבוצה הראשית שלו"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "ספריית הבית:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "נתוני משתמש"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "איפשור תפוגת חשבון"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "החשבון פג בתאריך (שנה-חודש-יום):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "נעל חשבון משתמש"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "מידע על החשבון"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "סיסמת החשבון שונתה לאחרונה בתאריך :"
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "איפשור תפוגת סיסמה"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "מספר ימים לפני שניתן לשנות את הסיסמה:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "מספר ימים שלאחריהם יש לשנות סיסמה :"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "מספר ימים לפני אזהרה על תפוגת הסיסמה :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "ימים לפני נעילת חשבון לא פעיל :"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "מידע על הסיסמה"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "יש לבחור את הקבוצות שהחשבון יהיה חבר בהן :"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "מידע על קבוצות"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "נא לבחור את המשתמשים שיצטרפו לקבוצה הזאת :"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "משתמשים בקבוצה"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "נא לבחור לפחות קבוצה אחת לפחות עבור המשתמש"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"נא לקבוע שנה, חודש ויום\n"
-" עבור תפוגת החשבון "
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "נא לספק את הסיסמה הישנה בכל השדות\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "אין אפשרות למחוק את המשתמש '%s' מהקבוצה הראשית שלו"
+msgid "Edit Groups / Users"
+msgstr "עריכת קבוצות / משתמשים"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "סגור"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "זכויות היוצרים (C) %s שייכות למנדריבה"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "ניהול משתמשים"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "מנדריבה לינוקס"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Dotan Kamber <kamberd@yahoo.com>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "שדה השם ריק, נא לספק שם"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "השם חייב להכיל רק אותיות לטיניות קטנות, מספרים, מקף וקו תחתי"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "השם ארוך מדי"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "שגיאה"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "שגיאה לא ידועה"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "חלה תקלה ביצירת `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "כותבים: "
 
diff --git a/po/hi.po b/po/hi.po
index d0053ad..fb2e9b3 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2004-08-08 18:46+0530\n"
 "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma)\n"
 "Language-Team: हिन्दी, भारत (Hindi, India)\n"
@@ -18,306 +18,358 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "'%s' को पढ़ने में त्रुटि: %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "`%s' का निर्माण करने में त्रुटि: %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "`%s' को हटाने में त्रुटि: %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "मेल स्पूल का निर्माण करने में त्रुटि।\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "मेल स्पूल का निर्माण करने में त्रुटि।\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "मेल स्पूल का निर्माण करने में त्रुटि।\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "अज्ञात त्रुटि"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "मेल स्पूल का निर्माण करने में त्रुटि।\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "मेल स्पूल का मिटाने में त्रुटि\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "यूज़र-ड्रैक"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "उपयोगकर्ताओं और समूहों को लाया जा रहा है... कृपया प्रतीक्षा करें"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "मैनड्रिव लिनक्स उपयोगकर्ता प्रबंधन टूल"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/कार्य-कलाप(_A)"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/सम्पादित करें(_E)"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/मिटायें(_D)"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/विकल्प(_O)"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/प्रणाली उपयोगकर्ताओं को अलग करें(_F)"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/संचिका (_F)"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/पुनः ताजा करें (_R)"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/निर्गम(_Q)"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/उपयोग-कर्ता जोड़े(_A)"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/समूह जोड़े(_G)"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/सहायता(_H)"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/दोष के बारे में बतायें(_R)"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/के बारे में(_A)..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "खोज:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "फ़िल्टर लगायें"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "उपयोग-कर्ता"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "समूह"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "उपयोगकर्ता और समूह"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "उपयोगकर्ता का नाम"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "उपयोग-कर्ता पहचान संख्या"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "प्रधान समूह"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "पूरा नाम"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "सत्र-आरंभ कोश"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "गृह स्थल निर्देशिका"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "स्थिति"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "समूह का नाम"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "समूह पहचान संख्या"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "समूह के सदस्य"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "उपयोग-कर्ता जोड़ना"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "एक उपयोग-कर्ता को प्रणाली में जोड़ना"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "समूह जोड़े"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "एक समूह को प्रणाली में जोड़ना"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "सम्पादन"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "चयन की हुई पंक्ति का संपादन"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "मिटाना"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "चयन की हुई पंक्ति को मिटाना"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "पुनः ताजा करना"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "उपयोग-कर्ता सूची को पुनः ताजा करना"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "ताला-बन्द"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "समाप्त हो चुका है"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "आइकॉन को परिवर्तित करने के लिए, इस पर क्लिक करें"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "नये उपयोगकर्ता का निर्माण"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "गृह स्थल निर्देशिका का निर्माण करें"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "गृह स्थल निर्देशिका: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "उपयोगकर्ता के लिए एक व्यक्तिगत समूह का निर्माण"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "उपयोगकर्ता पहचान संख्या को स्वमं निर्दिष्ट करना"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "उपयोगकर्ता पहिले से विद्यमान है, कृपया अन्य उपयोगकर्ता नाम चुनें।"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "कूट-शब्द बेमेल"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -326,12 +378,12 @@ msgstr ""
 "यह कूट-शब्द अति सरल है।\n"
 "अच्छे कूट-शब्द ६ अक्षरों से अधिक के होते है"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "उपयोगकर्ता की उपयोगकर्ता-पहचान-संख्या ५०० से कम है"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -343,91 +395,91 @@ msgstr ""
 "क्या आप वास्तव में ऐसा करना चाहते है?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "'users' समूह में %s डाला जा रहा है"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "%s : नये समूह का निर्माण हो रहा है"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "%s : उपयोगकर्ता को जोड़ा जा रहा है"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "निरस्त"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "ओ०के०"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "उपयोगकर्ता पहचान संख्या: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "समूह का चयन करें"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "विद्यमान समूह में जोड़ना"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "'users' समूह में जोड़ना"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "इस नाम का एक समूह पहिले से विद्यमान है। आप क्या करना चाहेगें? "
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "नये समूह का निर्माण करें"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "समूह पहचान संख्या स्वमं निर्दिष्ट करें"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "समूह पहिले से विद्यमान है, कृपया अन्य समूह नाम का चयन करें"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " समूह की समूह पहचान संख्या ५०० से कम है"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -438,22 +490,22 @@ msgstr ""
 "क्या आप वास्तव में ऐसा करना चाहते है?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "%s  : समूह को जोड़ा जा रहा है"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "समूह पहचान संख्या: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "संचिकाओं को मिटाया जायें कि नहीं?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -462,27 +514,27 @@ msgstr ""
 "%s उपयोगकर्ता को हटाया जा रहा है\n"
 "साथ ही, निम्नलिखित क्रियायें भी की जा रही है\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "गृह स्थल निर्देशिका को हटायें : %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "विपत्र-पेटी को हटायें :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "%s : उपयोगकर्ता को हटाया जा रहा है"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "क्या आप वास्तव में %s समूह को हटाना चाहते है"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -491,201 +543,209 @@ msgstr ""
 "%s , उपयोगकर्ता %s के लिए, एक प्रधान समूह है\n"
 " उपयोगकर्ता को पहिले हटायें"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "%s : समूह को हटाया जा रहा है"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "पूरा नाम:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "सत्र-आरंभ:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "कूट-शब्द:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "कूट-शब्द की पुष्टि:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "सत्र-आरंभ कोश:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "समूह का नाम:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "समूहों/उपयोगकर्ताओं का संपादन"
+msgid "Please select at least one group for the user"
+msgstr "कृपया इस उपयोगकर्ता के लिए कम-से-कम एक समूह का चयन करें"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"कृपया खाता समाप्ति के लिए \n"
+"वर्ष, माह और दिवस बतायें"
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "कृपया कूट-शब्द जीवनकाल में सभी प्रविष्टियों को भरें\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "आप, '%s' उपयोगकर्ता को उसके प्रधान समूह से नहीं हटा सकते है"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "गॄह-स्थल:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "उपयोग-कर्ता जानकारी"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "खाता समाप्ति प्रक्रिया को सक्रिय करें"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "खाता समाप्ति की तिथि (वर्ष-ंमाह-दिवस) (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "उपयोगकर्ता खाते को लॉक करें"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "खाते के बारे में जानकारी"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "उपयोगकर्ता ने कूट शब्द को अंतिम बार इस तिथि को परिवर्तित किया था: "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "कूट शब्द समाप्ति प्रक्रिया को सक्रिय करें"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "दिन संख्या, जिसके पहिले परिवर्तन की अनुमति है :"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "दिन संख्या, जिसके पहिले परिवर्तन आवश्यक है :"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "दिन संख्या, जिसके पहिले परिवर्तन की चेतावनी मिलेगी :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "दिन संख्या जिसके पहिले खाता निष्क्रिय होगा :"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "कूट-शब्द सूचना"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "उन समूहों का चयन करें जिनका यह उपयोगकर्ता एक सदस्य होगा:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "समूह जानकारी"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "एस समूह में शामिल होने के लिए उपयोगकर्ताओं का चयन करें"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "समूह उपयोगकर्ता"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "कृपया इस उपयोगकर्ता के लिए कम-से-कम एक समूह का चयन करें"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"कृपया खाता समाप्ति के लिए \n"
-"वर्ष, माह और दिवस बतायें"
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "कृपया कूट-शब्द जीवनकाल में सभी प्रविष्टियों को भरें\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "आप, '%s' उपयोगकर्ता को उसके प्रधान समूह से नहीं हटा सकते है"
+msgid "Edit Groups / Users"
+msgstr "समूहों/उपयोगकर्ताओं का संपादन"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "समाप्त"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "उपयोगकर्ता प्रबंधन"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "मैनड्रैकलिनक्स"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "धनञ्जय शर्मा (Dhananjaya Sharma)\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "नाम क्षेत्र खाली है, कृपया एक नाम प्रदान करें"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "नाम में सिर्फ़ लैटिन छोटे अक्षर, संख्याऐं, `-' और `_' शामिल होना चाहिए"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "नाम अत्याधिक लंबा है"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "त्रुटि"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "अज्ञात त्रुटि"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "`%s' का निर्माण करने में त्रुटि: %s"
+
 #~ msgid "Authors: "
 #~ msgstr "लेखकों के नाम: "
diff --git a/po/hr.po b/po/hr.po
index e5866a0..4ef7e98 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-hr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2005-08-23 11:37+0200\n"
 "Last-Translator: Vlatko Kosturjak\n"
 "Language-Team:  <en@li.org>\n"
@@ -22,306 +22,358 @@ 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"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Ne mogu učitati `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Ne mogu napraviti `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Greška kod uklanjanja `%s': %s "
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Ne mogu učitati mail spool.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Ne mogu učitati mail spool.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Ne mogu učitati mail spool.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "Nepoznata greška"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Ne mogu učitati mail spool.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Greška kod brisanja sandučića za poštu.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Učitavam korisnike i grupe... Molimo pričekajte"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux alat za upravljanje korisnicima"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Akcije"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Promjeni"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Ukloni"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Postavke"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Filter sistemskih korisnika"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Osvježi"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Izlaz"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/Dodaj _korisnika"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Dodaj _grupu"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Prijavi bug"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_O programu..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Traži:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Primjeni filter"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Korisnici"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Grupe"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Korisnici i grupe"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Korisničko ime"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Korisnički ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Primarna grupa"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Puno ime"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Login školjka"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Početni direktorij"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Stanje"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Ime grupe"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ID grupe"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Članovi grupe"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Dodaj korisnika"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Dodak korisnika u sistem"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Dodaj grupu"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Dodaj grupu u sistem"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Podesi"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Promjeni odabrani red"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Ukloni"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Obriši odabrani red"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Osvježi"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Osvježi listu korisnika"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Zaključano"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Isteklo"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Kliknite na ikonu da ju promjenite"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Napravi novog korisnika"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Napravi početni direktorij"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Početni direktorij:"
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Napravi privatnu grupu za korisnika"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Odredi korisnički ID ručno"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Ovaj korisnik već postoji, molimo odaberite drugo korisničko ime"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Lozinka se ne slaže"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -330,12 +382,12 @@ msgstr ""
 "Lozinka je previše jednostavna. \n"
 " Dobra lozinka mora imati > 6 znakova"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Korisnički Uid je < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -346,91 +398,91 @@ msgstr ""
 " Da li stvarno želite to učiniti?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Stavljam %s u 'korinsičku' grupu"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Stvaram novu grupu: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Dodajem korisnika: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "U redu"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Odaberi grupu"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Dodaj postojećoj grupi"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Dodaj 'korisničkoj' grupi"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Napravni novu grupu"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Odredi ID grupe ručno"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Grupa već postoji, molimo odaberite drugo ime grupe"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "Gid grupe je < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -441,22 +493,22 @@ msgstr ""
 " Da li stvarno to želite učiniti?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Dodajem grupu: %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Da obrišem datoteke?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -465,27 +517,27 @@ msgstr ""
 "Brišem korisnika %s\n"
 " Također izvodim slijedeće akcije\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Brišem početni direktorij: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Obriši Mailbox :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Uklanjam korisnika: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Da li stvarno želite izbrisate grupu %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -494,201 +546,209 @@ msgstr ""
 "%s je primarna grupa za korisnika %s\n"
 " Prvo uklonite korisnika"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Uklonjam grupu: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Puno ime:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Korisnička oznaka:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Potvrda lozinke:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Login školjka:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Ime grupe:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Mijenjaj grupe / korisnike"
+msgid "Please select at least one group for the user"
+msgstr "Molimo odaberite najmanje jednu grupu za ovog korisnika"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Molimo odaberite godinu, mjesec i dan \n"
+" za prestanak valjanosti računa "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Molimo popunite sva polja u lozinki ponovo\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Ne možete izbrisati korisnika '%s' iz njegove primarne grupe"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Početni direktorij:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Podaci o korisniku"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Uključi prestanak valjanosti računa"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Račun prestaje valjati (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Zaključaj korisnikov račun"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Informacije o računu"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Korisnik zadnji put promjenio lozinku:"
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Uključi prestanak valjanosti lozinke"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dani prije kada su promjene dozvoljene:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Dani prije potrebe promjena: "
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dani upozorenja prije promjena:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dani prije neaktivnosti računa:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Informacije o lozinki"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Odaberiter gurpe u kojima će korisnik biti član:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Podaci o grupama"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Odaberite korisnike koji se pridružuju ovoj grupi:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Članovi grupe"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Molimo odaberite najmanje jednu grupu za ovog korisnika"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Molimo odaberite godinu, mjesec i dan \n"
-" za prestanak valjanosti računa "
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Molimo popunite sva polja u lozinki ponovo\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Ne možete izbrisati korisnika '%s' iz njegove primarne grupe"
+msgid "Edit Groups / Users"
+msgstr "Mijenjaj grupe / korisnike"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Zatvori"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Upravljanje korisnicima"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Croatian <lokalizacija@linux.hr>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Polje imena je prazno, molimo upišite ime"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Ime je predugačko"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Greška"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "Nepoznata greška"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Ne mogu napraviti `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Autori: "
diff --git a/po/hu.po b/po/hu.po
index 0980eaa..48b131b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2009-10-19 22:56+0100\n"
 "Last-Translator: Gergely Lónyai <aleph@mandriva.org>\n"
 "Language-Team: Hungarian\n"
@@ -19,327 +19,358 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Hiba \"%s\" olvasásakor: %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Hiba \"%s\" létrehozásakor: %s"
 
-#: ../USER/USER.xs:203
-#: ../USER/USER.xs:232
-#: ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Hiba \"%s\" eltávolításakor: %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Hiba a levéltároló létrehozásakor.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Hiba a levéltároló létrehozásakor.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Hiba a levéltároló létrehozásakor.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "ismeretlen hiba"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Hiba a levéltároló létrehozásakor.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Hiba a levéltároló törlésekor.\n"
 
-#: ../userdrake:55
-#: ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "UserDrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Felhasználók és csoportok betöltése..."
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux felhasználókezelő eszköz"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr "/A vendég (guest) felhasználó _telepítése"
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr "/A vendég (guest) felhasználó _eltávolítása"
 
-#: ../userdrake:99
-#: ../userdrake:100
-#: ../userdrake:101
-#: ../userdrake:109
-#: ../userdrake:110
-#: ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/Mű_veletek"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/Mó_dosítás"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Törlés"
 
-#: ../userdrake:91
-#: ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/Beá_llítások"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/A r_endszerfelhasználók kiszűrése"
 
-#: ../userdrake:95
-#: ../userdrake:96
-#: ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Fájl"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/F_rissítés"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Kilépés"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/Új _felhasználó"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Új _csoport"
 
-#: ../userdrake:108
-#: ../userdrake:109
-#: ../userdrake:110
-#: ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Segítség"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Hibabejelentés"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/Név_jegy..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Keresés:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Szűrő alkalmazása"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Felhasználók"
 
-#: ../userdrake:133
-#: ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Csoportok"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Felhasználók és csoportok"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Felhasználónév"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Felh.-azonosító"
 
-#: ../userdrake:154
-#: ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Elsődleges csoport"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Teljes név"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Parancsértelmező"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Saját könyvtár"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Állapot"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Csoportnév"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Csoportazonosító"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "A csoport tagjai"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Új felhasználó"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Új felhasználó létrehozása"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Új csoport"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Új csoport létrehozása"
 
-#: ../userdrake:165
-#: ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Módosítás"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "A kijelölt sor szerkesztése"
 
-#: ../userdrake:166
-#: ../userdrake:552
-#: ../userdrake:584
-#: ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Törlés"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "A kijelölt sor törlése"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Frissítés"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "A lista frissítése"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Zárolt"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Lejárt"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Kattintson az ikonra annak megváltoztatásához"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Új felhasználó létrehozása"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Saját könyvtár létrehozása"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "A saját könyvtár: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Privát csoport létrehozása a felhasználóhoz"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "A felhasználóazonosító megadása"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, 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:329
-#: ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "A jelszavak nem egyeznek meg"
 
-#: ../userdrake:330
-#: ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -348,12 +379,12 @@ msgstr ""
 "A megadott jelszó túlságosan egyszerű. \n"
 " Legalább 7 karakter hosszú jelszót érdemes választani."
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "A felhasználó azonosítója kisebb 500-nál"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -364,96 +395,93 @@ msgstr ""
 " Biztosan ezt szeretné?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "%s hozzáadása a 'users' nevű csoporthoz"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Új csoport létrehozása: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "%s felhasználó felvétele"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Importálási varázsló"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
-msgid "Do you want to run the migration wizard in order to import Windows documents and settings in your Mandriva Linux distribution?"
-msgstr "Szeretné elindítani az importálási varázslót, amellyel áthozhatja windowsos dokumentumait és beállításait a Mandriva Linux rendszerbe?"
+msgid ""
+"Do you want to run the migration wizard in order to import Windows documents "
+"and settings in your Mandriva Linux distribution?"
+msgstr ""
+"Szeretné elindítani az importálási varázslót, amellyel áthozhatja windowsos "
+"dokumentumait és beállításait a Mandriva Linux rendszerbe?"
 
-#: ../userdrake:398
-#: ../userdrake:436
-#: ../userdrake:480
-#: ../userdrake:568
-#: ../userdrake:597
-#: ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: ../userdrake:383
-#: ../userdrake:417
-#: ../userdrake:466
-#: ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "Felhasználóazonosító: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Válasszon csoportot"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Hozzáadás a már létező csoporthoz"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Hozzáadás a 'users' nevű csoporthoz"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Új csoport létrehozása"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "A csoportazonosító megadása"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, 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:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " A csoportazonosító kisebb 500-nál"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -464,23 +492,22 @@ msgstr ""
 " Biztosan ezt szeretné?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "%s csoport felvétele"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "Csoportazonosító: "
 
-#: ../userdrake:516
-#: ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Törlésre kerüljenek a fájlok?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -489,27 +516,27 @@ msgstr ""
 "\"%s\" felhasználó törlése\n"
 "A következők is végre lesznek hajtva:\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Saját könyvtár törlése: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Postaláda törlése: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "%s felhasználó eltávolítása"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Valóban törölni kívánja a(z) %s csoportot?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -518,198 +545,208 @@ msgstr ""
 "A(z) %s csoport a(z) %s felhasználó elsődleges csoportja.\n"
 " Először a felhasználót kell törölni"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "%s csoport eltávolítása"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Teljes név:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Bejelentkezési név:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Jelszó (még egyszer):"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Parancsértelmező:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Csoportnév:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Csoportok / felhasználók szerkesztése"
+msgid "Please select at least one group for the user"
+msgstr "Legalább egy csoportot ki kell választani"
 
-#: ../userdrake:699
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Adja meg a felhasználónév lejárásának dátumát\n"
+" (év, hónap, nap) "
+
+#: ../userdrake:914
+#, 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:965
+#, 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:986
 #, c-format
 msgid "Home:"
 msgstr "Saját könyvtár:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Felhasználói adatok"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "A felhasználónevek lejárásának bekapcsolása"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "A lejárás dátuma (ÉÉÉÉ-HH-NN):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "A felhasználónév zárolása"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "A felhasználó jellemzői"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "A legutóbbi jelszóváltoztatás dátuma: "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "A jelszó lejárásának bekapcsolása"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Jelszómódosítás legkorábban ennyi nap múlva:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Jelszómódosítás legkésőbb ennyi nap múlva:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Figyelmeztetés a jelszómódosításra ennyi nappal korábban:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "A felhasználónév letiltása ennyi nap elteltével:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "A jelszó jellemzői"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, 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:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "A csoport adatai"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Válassza ki, mely felhasználókat szeretné a csoporthoz adni:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "A csoport felhasználói"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Legalább egy csoportot ki kell választani"
-
-#: ../userdrake:856
-#, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Adja meg a felhasználónév lejárásának dátumát\n"
-" (év, hónap, nap) "
-
-#: ../userdrake:862
+#: ../userdrake:1127
 #, 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:905
-#, 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"
+msgid "Edit Groups / Users"
+msgstr "Csoportok / felhasználók szerkesztése"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Bezárás"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s, Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Felhasználókezelés"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Arpad Biro <biro.arpad gmail>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "A 'név' mező nem lehet üres"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
-msgid "The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "A névben csak angol kisbetűk, számjegyek, a '-' és az '_' karakterek szerepelhetnek"
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr ""
+"A névben csak angol kisbetűk, számjegyek, a '-' és az '_' karakterek "
+"szerepelhetnek"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "A megadott név túl hosszú"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Hiba történt"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "ismeretlen hiba"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Hiba \"%s\" létrehozásakor: %s"
diff --git a/po/hy.po b/po/hy.po
index 8450712..9a02b57 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\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"
@@ -14,309 +14,360 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, fuzzy, c-format
 msgid "Error removing `%s': %s"
 msgstr "Հեռացնում եմ %s օգտագործողին"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr ""
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr ""
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+msgid "Group creation failed.\n"
+msgstr ""
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr ""
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Բեռնավորում եմ Գործածողների և Խմբերի ցանկը... Սպասեք"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux Գործածողների Կառավարման Գործիք"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Գործողություններ"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Խմբագրում"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Ջնջել"
 
 # ԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾ
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Օպցիաներ"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Ֆիլտրել համակարգի օգտագործողներին"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Ֆայլ"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Թարմացնել"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Անջատել"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Ավելացնել Օգտագործող"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Ավելացնել _Խումբ"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Օգնություն"
 
 # ԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾ
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Սխալի զեկուցում"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Ընդհանուր..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Փնտրել:"
 
 # :)
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Կիրառել զտիչ"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Օգտագործողներ"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "խմբեր"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr ""
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Օգտագործողի անուն"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Օգտագործողի ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Գլխավոր խումբ"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Անունը ամբողջությամբ"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Մուտքի միջավայր"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Տնային թղթապանակ"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Վիճակ"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Խմբի անուն"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Խմբի ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Անդամների խումբ"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Ավելացնել օգտագործող"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Ավելացնել օգտագործողին համակարգին"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Ավելացնել խումբ"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Ավելացնել խումբը համակարգին"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Խմբագրել"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Խմբագրել ընտրված տողը"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Ջնջել"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Ջնջել ընտրված տողը"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Թարմացնել"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Թարմացնել ցուցակը"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Փակված է"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Ժամկերը լրացել է"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Սեղմեք նկարի վրա այն փոփոխելու համար"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Ստեղծել նոր օգտագոծող"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Ստեղծել տնային թղթապանակ"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Տնային թղթապանակ:"
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Ստեղծել առանձին խումբ օգտագործողի համար"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Նշել օգտագործողի ID-ն ձեռքով"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Օգտագործողը գոյություն ունի, ընտրեք մեկ այլ օգտագործողի անուն"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Գաղտնագրի անհամապատասխանություն"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -326,13 +377,13 @@ msgstr ""
 " Լավ գաղտնագիրը պետք է պարունակի ավելի քան վեց նիշ"
 
 # ԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾ
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Օգտագործողի Uid-ը < 500"
 
 # ԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾ
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -343,93 +394,93 @@ msgstr ""
 "Դուք համոզվա՞ծ եք, որ ուզում եք անել այդ\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Տեղադրում եմ %s - ին 'օգտագործողներ' խմբում"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Ստեղծում եմ նոր խումբ: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Ավելագնում եմ %s օգտագործողին"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Հրաժարվել"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Լավ"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Ընտրեք խումբը"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Ավելագնել գոյություն ունեցող խմբին"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Ավելագնել  'օգտագործողներ' խմբին"
 
 # ԾԾԾԾԾԾԾԾԾԾ
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Խումբ այդպիսի անունով գոյություն ունի: Ին՞չ եք ուզում անել"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Ստեղծել նոր խումբ"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Նշել խմբի ID ձեռքով"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Խումբը գոյություն ունի, ընտրեք խմբի մեկ այլ անուն"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "Խմբի GID-ը < 500"
 
 # Նոր ջան մի հատ  նայի ես ինչ եմ արե :)
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -440,22 +491,22 @@ msgstr ""
 "Դուք համոզվա՞ծ եք, որ ուզում եք անել այդ\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Ավելացնում եմ %s խումբը"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Ջնջել ֆայլերը թե ոչ"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -464,27 +515,27 @@ msgstr ""
 "Ջնջում եմ %s օգտագործողին\n"
 " Նաև կատարվում եմ հետևյալ գործողությունները\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Ջնջել Տնային %s թղթապանակը"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Ջնջել փոստարկղը :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Հեռացնում եմ %s օգտագործողին"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Դուք իսկապես ուզում եք ջնջել %s խումբը"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -493,99 +544,119 @@ msgstr ""
 "%s-ը գլխավոր խումբ է %s օտագորողի համար\n"
 " Սկզբից հեռացրեք օգտագործողին"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Հեռացնում եմ %s խումբը"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Անունը ամբողջությամբ:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Մուտքանուն:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Գաղտնագիր:"
 
 # ԾԾԾԾԾԾԾԾԾԾԾԾԾԾ
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Գրեք կրկին գաղտնագիրը"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Մուտքի միջավայր:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Խմբի անուն:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Խմբագրել Խմերը/Օգտագործողներին"
+msgid "Please select at least one group for the user"
+msgstr "Ընտրեք գոնե մեկ խումբ օգտագործողի համար"
+
+# ԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾ
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Նշեք հաշիվը փակելու \n"
+"Տարին,Ամիսը և Օրը"
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Լրացրեք բոլոր դաշտերը գաղտնագրի ժամկետի համար\n"
 
-#: ../userdrake:699
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Դուք չեք կարող հեռացնել '%s' օգտագործողին նրա գլխավոր խմբից"
+
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Տուն:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Օգտագործողի տվյալներ"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Միացնել հաշվի ժամկետի լրացումը"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Հաշվի ժանմկետը լրանում է (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Փակել օգտագործողի հաշիվը"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Հաշվի տվյալներ"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Օգտագործողը վերջին անգամ գաղտնաբառը փոխել է:"
 
 # ԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾ
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Միացնել գաղտնագրի ժամկետի լրացումը"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Քանի օր հետո թույլատրել փոփոխությունները:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Քանի օր հետո պահանջել փոփոխություն:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr ""
@@ -593,93 +664,73 @@ msgstr ""
 " փոփոխությունների համար :"
 
 # ԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾ
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Օրերի քանակը մինչ հաշվի անջատումը:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Գաղտնաբառի Տվյալներ"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Ընտրեք խումբը, որի անդամ պետք է լինի օգտագործողը:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Խմբի Տվյալներ"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Ընտրեք օգտագործողներին, որոնք վայելելու են այս խումբը"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Խմբի օգտագործողներ"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Ընտրեք գոնե մեկ խումբ օգտագործողի համար"
-
-# ԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾԾ
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Նշեք հաշիվը փակելու \n"
-"Տարին,Ամիսը և Օրը"
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Լրացրեք բոլոր դաշտերը գաղտնագրի ժամկետի համար\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Դուք չեք կարող հեռացնել '%s' օգտագործողին նրա գլխավոր խմբից"
+msgid "Edit Groups / Users"
+msgstr "Խմբագրել Խմերը/Օգտագործողներին"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Փակել"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Օգտագործողների կառավարում"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr ""
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Անվան դաշտը դատարկ է, գրեք որևէ անուն"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
@@ -687,16 +738,20 @@ msgstr ""
 "Անունը կարող է պարունակի միայն փոքրատառ լատիներեն տառեր, թվեր, `-' և `_' "
 "նշաններ"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Անունը շատ երկար է"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Սխալ"
 
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Հեռացնում եմ %s օգտագործողին"
+
 #~ msgid "Authors: "
 #~ msgstr "Հեղինակներ."
 
diff --git a/po/id.po b/po/id.po
index 0b2f03a..1420ba9 100644
--- a/po/id.po
+++ b/po/id.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2006-03-21 18:36+0700\n"
 "Last-Translator: Willy Sudiarto Raharjo <willysr@gmail.com>\n"
 "Language-Team: Indonesia <mdk-id@yahoogroups.com>\n"
@@ -24,309 +24,361 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Kesalahan membaca `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Kesalahan menciptakan `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Kesalahan menghapus `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Kesalahan membuat spool mail.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Kesalahan membuat spool mail.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Kesalahan membuat spool mail.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "kesalahan yang tidak diketahui"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Kesalahan membuat spool mail.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Kesalahan menghapus spool mail.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Memuat Pengguna dan Grup... Harap tunggu"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Perkakas Manajemen Pengguna Mandriva Linux"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Aksi"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Edit"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Hapus"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Opsi"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Saring pengguna sistem"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_File"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Penyegaran"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Keluar"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>K"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/T_ambah Pengguna"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Tambah _Grup"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Bantuan"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Laporkan Kesalahan"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Tentang..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Cari:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Terapkan filter"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Pengguna"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Grup"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Pengguna dan grup"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Nama Pengguna"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID Pengguna"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Grup Utama"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Nama Lengkap"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Login Shell"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Direktori Rumah"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Status"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Nama Grup"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ID Grup"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Anggota Grup"
 
 # broken into two lines to avoid too large a button
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr ""
 "Tambah\n"
 "Pengguna"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Tambah pengguna ke sistem"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Tambah Grup"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Tambah grup ke sistem"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Edit"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Edit baris terpilih"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Hapus"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Hapus baris terpilih"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Pembaruan"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Pembaruan daftar"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Terkunci"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Kadaluarsa"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Klik ikon untuk mengubahnya"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Buat Pengguna Baru"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Buat Direktori Rumah"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Direktori Rumah:"
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Buat grup privat untuk pengguna"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Tentukan ID pengguna secara manual"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Nama ini sudah dipakai, pilihlah nama lain"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Katasandi Tidak Cocok"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -335,12 +387,12 @@ msgstr ""
 "Katasandi terlalu mudah.\n"
 " Katasandi yang baik harus lebih dari 6 karakter"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Uid pengguna < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -351,91 +403,91 @@ msgstr ""
 " Apakah Anda yakin ingin melakukannya?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Menambahkan %s pada grup 'pengguna'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Membuat grup baru: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Menambahkan pengguna: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Pilih Grup"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Tambahkan pada grup yang telah ada"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Tambahkan pada grup 'pengguna'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Buat Grup Baru"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Tentukan ID grup secara manual"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Grup sudah ada, pilihlah Nama Grup lain"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " Gid grup < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -446,22 +498,22 @@ msgstr ""
 " Apakah Anda yakin ingin melakukannya?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Menambahkan grup: %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Hapus file atau tidak?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -470,27 +522,27 @@ msgstr ""
 "Menghapus pengguna %s\n"
 " Juga melakukan aksi berikut\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Hapus Direktori rumah: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Hapus Kotaksurat: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Menghapus pengguna: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Apakah Anda ingin menghapus grup %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -499,202 +551,210 @@ msgstr ""
 "%s adalah grup utama pengguna %s\n"
 " Hapus dulu pengguna"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Menghapus grup: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Nama Lengkap:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Katasandi:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Konfirmasi Katasandi:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Login Shell:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Nama Grup:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Edit Grup / Pengguna"
+msgid "Please select at least one group for the user"
+msgstr "Pilihlah setidaknya satu grup untuk pengguna"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Tentukan Tahun, Bulan dan Hari\n"
+" untuk Kadaluarsa Account"
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Isi semua kolom pada umur katasandi\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Anda tidak dapat menghapus pengguna '%s' dari grup utama mereka"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Rumah:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Data Pengguna"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Aktifkan tanggal kadaluarsa account"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Account kadaluarsa (MM-DD-YYYY):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Kunci Account Pengguna"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Info Account"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Katasandi diubah terakhir pada : "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Aktifkan Kadaluarsa Katasandi"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Jumlah hari sebelum perubahan diizinkan:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Jumlah hari sebelum perubahan dibutuhkan:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Jumlah hari peringatan sebelum perubahan:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Jumlah hari sebelum account non-aktif:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Informasi Katasandi"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Pilihlah grup yang akan digunakan pengguna:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Grup Data"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Pilih pengguna untuk tergabung dengan grup ini :"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Grup Pengguna"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Pilihlah setidaknya satu grup untuk pengguna"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Tentukan Tahun, Bulan dan Hari\n"
-" untuk Kadaluarsa Account"
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Isi semua kolom pada umur katasandi\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Anda tidak dapat menghapus pengguna '%s' dari grup utama mereka"
+msgid "Edit Groups / Users"
+msgstr "Edit Grup / Pengguna"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Tutup"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Hak cipta (C) %s oleh Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Manajemen Pengguna"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Willy Sudiarto Raharjo <willysr@gmail.com>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Kolom nama kosong, silahkan tuliskan satu nama"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Nama harus berisi hanya huruf kecil, angka, `-' dan `_'"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Nama terlalu panjang"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Kesalahan"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "kesalahan yang tidak diketahui"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Kesalahan menciptakan `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Penulis: "
 
diff --git a/po/is.po b/po/is.po
index 6452bd9..13409e5 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\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"
@@ -18,306 +18,358 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Villa við lestur `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Villa við að búa til `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Villa við að eyða `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Villa við að búa til pósthólf.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Villa við að búa til pósthólf.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, 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:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "óþekkt villa"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Villa við að búa til pósthólf.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Villa við að eyða pósthólfi.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Hleð inn notendum og hópum... Augnablik... "
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux Notandastjórnun"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Aðgerðir"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Sýsl"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Eyða"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Valkostir"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Sía kerfisnotendur"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Skrá"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Endurnýja"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Hætta"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Bæta við notanda"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Bæta við _Hópi"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Hjálp"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Senda villutilkynningu"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Um..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Leita:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Beita síu"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Notendur"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Hópar"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Notendur og hópar"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Notandanafn"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Notanda-númer (UID)"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Aðalhópur"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Fullt nafn"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Skel"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Heimamappa"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Staða"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Nafn hóps"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Hópnúmer (GID)"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Meðlimir hóps"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Bæta við notanda"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Bæta notanda við kerfið"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Bæta við hópi"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Bæta við hópi í kerfið"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Sýsl"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Sýsla með valda línu"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Eyða"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Eyða valinni línu"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Endurnýja"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Uppfæra lista"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Læst"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Útrunninn"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Smelltu á táknmyndina til að breyta"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Búa til nýja notanda"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Búa til heimasvæði"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Heimamappa: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Búa til einkahóp fyrir notandann"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Ákvarða sjálfur númer notanda"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Notandi þegar til, veldu annað notandanafn"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Lykilorð eru ekki eins"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -326,12 +378,12 @@ msgstr ""
 "Þetta lykilorð er of einfalt. \n"
 " Góð lykilorð ættu að vera > 6 bókstafir"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Notandanúmer < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -342,27 +394,27 @@ msgstr ""
 "Ert þú viss um að þú viljir gera þetta?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Setja %s í 'notanda' hóp"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Búa til nýjan hóp: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Bæta við notanda: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Flutnings-ráðgjafi"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -371,64 +423,64 @@ msgstr ""
 "Vilt þú keyra flutnings-ráðgjafann til að flytja inn Windows skrár og "
 "uppsetningar yfir í Mandriva Linux dreifinguna þína?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Hætta við"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Í lagi"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Veldu hóp"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Bæta við hóp sem er til"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Bæta í 'notanda' hópinn"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Búa til nýjan hóp"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Ákvarða sjálfur númer hóps"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Hópur er þegar til, veldu annað hópnafn"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " Hópnúmer er < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -439,22 +491,22 @@ msgstr ""
 " Ert þú viss um að þú viljir gera þetta?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Bæta við hóp: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Eyða skrám eða ekki?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -463,27 +515,27 @@ msgstr ""
 "Eyði notanda %s\n"
 " Framkvæma einnig eftirfarandi aðgerðir\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Eyða heimasvæði: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Eyða Pósthólfi: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Fjarlægi notanda: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Viltu í alvöru eyða hópi %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -492,198 +544,206 @@ msgstr ""
 "%s er aðalhópur fyrir notanda %s\n"
 " Fjarlægðu notanda fyrst"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Fjarlægi hóp: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Fullt nafn:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Notandi:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Lykilorð:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Staðfestu lykilorð:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Skel:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Nafn hóps:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Sýsla með Hópa / Notendur"
+msgid "Please select at least one group for the user"
+msgstr "Veldu a.m.k. einn hóp fyrir notandann"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Tilgreindu Ár, mánuð og dag \n"
+" fyrir úreldingu aðkennis "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Fylltu í öll svæðin fyrir úreldingu lykilorðs\n"
+
+#: ../userdrake:965
+#, 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:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Heima:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Gögn notanda"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Virkja auðkennis-úreldingu"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Auðkenni úreldist (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Læsa auðkenni notanda"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Auðkennis-upplýsingar"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Notandi breytti lykilorði þann: "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Virkja lykilorðs-úreldingu"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dagar þar til breyting leyfð:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Dagar þar til breytingar krafist:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Aðvara um breytingu dögum áður:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dagar áður en auðkenni óvirkt:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Lykilorðs-upplýsingar"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, 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:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Hópupplýsingar"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Veljið notendur í þennan hóp:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Notendur í hóp"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Veldu a.m.k. einn hóp fyrir notandann"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Tilgreindu Ár, mánuð og dag \n"
-" fyrir úreldingu aðkennis "
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Fylltu í öll svæðin fyrir úreldingu lykilorðs\n"
-
-#: ../userdrake:905
-#, 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"
+msgid "Edit Groups / Users"
+msgstr "Sýsla með Hópa / Notendur"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Loka"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Höfundaréttur (C) %s Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Notandastjórnun"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Nafnsvæði er autt, gefðu upp nafn"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Nafn er of langt"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Villa"
+
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "óþekkt villa"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Villa við að búa til `%s': %s"
diff --git a/po/it.po b/po/it.po
index 4e30e88..c7a461a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2009-10-17 23:09+0200\n"
 "Last-Translator: Andrea Celli <andrea.celli@libero.it>\n"
 "Language-Team: Italian <timl@freelists.org>\n"
@@ -26,306 +26,358 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Errore nel leggere \"%s\": %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Errore nel creare \"%s\": %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Errore nel rimuovere \"%s\": %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Errore nella creazione della coda (spool) della posta.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Errore nella creazione della coda (spool) della posta.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Errore nella creazione della coda (spool) della posta.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "errore sconosciuto"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Errore nella creazione della coda (spool) della posta.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Errore nel cancellare la coda (spool) della posta.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Attendere, prego... si stanno caricando gli utenti e i gruppi"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Strumento per la gestione degli utenti di Mandriva Linux"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr "/_Attiva l'account guest"
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr "/_Rimuovi l'account guest"
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Azioni"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Modifica"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Elimina"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Opzioni"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Filtra gli utenti di sistema"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_File"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Aggiorna"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Esci"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Aggiungi utente"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Aggiungi _gruppo"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Aiuto"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Segnala bug"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Informazioni su..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Cerca:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Applica filtro"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Utenti"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Gruppi"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Utenti e gruppi"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Nome utente"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID utente"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Gruppo primario"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Nome completo"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Shell di login"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Directory home"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Stato"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Nome gruppo"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ID gruppo"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Membri del gruppo"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Aggiungi utente"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Aggiungi un utente al sistema"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Aggiungi gruppo"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Aggiungi un gruppo al sistema"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Modifica"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Modifica la riga selezionata"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Elimina"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Cancella la riga selezionata"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Aggiorna la lista"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Bloccato"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Scaduto"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Clicca sull'icona per cambiarla"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Crea nuovo utente"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Crea la directory home"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Directory home: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Crea un gruppo privato per l'utente"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Specifica manualmente l'ID utente"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Questo utente è già presente, scegli un altro nome"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "La password non corrisponde"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -334,12 +386,12 @@ msgstr ""
 "Questa password è troppo semplice.\n"
 "Una buona password dovrebbe essere lunga più di 6 caratteri."
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "UID dell'utente inferiore a 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -350,27 +402,27 @@ msgstr ""
 "Sei sicuro di volerlo fare?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Inserimento di %s nel gruppo \"users\""
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Creazione di un nuovo gruppo: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Aggiunta utente: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Procedura per le migrazioni"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -379,64 +431,64 @@ msgstr ""
 "Vuoi utilizzare la procedura guidata per trasferire i documenti e le "
 "impostazioni Windows sulla tua installazione Mandriva Linux?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Scegli gruppo"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Aggiungi al gruppo esistente"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Aggiungi al gruppo \"users\""
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Crea nuovo gruppo"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Specifica manualmente group ID"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Questo gruppo è già presente, scegli un altro nome"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "GID del gruppo inferiore a 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -447,22 +499,22 @@ msgstr ""
 "Sei sicuro di volerlo fare?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Aggiunta del gruppo: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Cancellare i file o no?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -471,27 +523,27 @@ msgstr ""
 "Cancellazione dell'utente %s.\n"
 "Saranno eseguite anche le seguenti azioni:\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Cancella la directory home: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Cancella la mailbox: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Rimozione dell'utente: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Vuoi davvero cancellare il gruppo %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -500,198 +552,207 @@ msgstr ""
 "%s è il gruppo primario dell'utente %s.\n"
 "Devi prima rimuovere l'utente."
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Rimozione del gruppo: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Nome completo:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Password:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Conferma password:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell di login:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Nome gruppo:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Modifica gruppi / utenti"
+msgid "Please select at least one group for the user"
+msgstr "Devi selezionare almeno un gruppo per l'utente"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Devi indicare l'anno, il mese e il giorno\n"
+"di scadenza dell'account."
+
+#: ../userdrake:914
+#, 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:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Non puoi rimuovere l'utente \"%s\" dal suo gruppo primario"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Home:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Dati utente"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Abilita la scadenza dell'account"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "L'account scade il (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Blocca l'account dell'utente"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Informazioni account"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "L'utente ha cambiato la password in data: "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Abilita la scadenza della password"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Giorni prima che sia permesso il cambio:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Giorni prima che sia richiesto il cambio:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Giorni di avvertimento prima del cambio:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Giorni prima che l'account diventi inattivo:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Informazioni password"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, 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:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Dati gruppo"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Seleziona gli utenti da inserire in questo gruppo:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Utenti del gruppo"
 
-#: ../userdrake:847
+#: ../userdrake:1127
 #, c-format
-msgid "Please select at least one group for the user"
-msgstr "Devi selezionare almeno un gruppo per l'utente"
-
-#: ../userdrake:856
-#, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Devi indicare l'anno, il mese e il giorno\n"
-"di scadenza dell'account."
-
-#: ../userdrake:862
-#, 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:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Non puoi rimuovere l'utente \"%s\" dal suo gruppo primario"
+msgid "Edit Groups / Users"
+msgstr "Modifica gruppi / utenti"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Chiudi"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s di Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Gestione utenti"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Andrea Celli <a.celli@caltanet.it>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Il campo del login è vuoto, devi inserire un nome."
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
-msgid "The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "Il nome può contenere soltanto lettere minuscole, numeri, \"-\" e \"_\""
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr ""
+"Il nome può contenere soltanto lettere minuscole, numeri, \"-\" e \"_\""
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Il nome è troppo lungo"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Errore"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "errore sconosciuto"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Errore nel creare \"%s\": %s"
diff --git a/po/ja.po b/po/ja.po
index 2ead064..899ddec 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2007-09-24 23:00+0900\n"
 "Last-Translator: BANDO Yukiko <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <cooker-i18n@mandrivalinux.org>\n"
@@ -22,306 +22,358 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "%s の読み込みエラー: %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "%s の作成エラー: %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "%s の削除エラー: %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "メールスプールの作成エラー\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "メールスプールの作成エラー\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "メールスプールの作成エラー\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "未知のエラー"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "メールスプールの作成エラー\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "メールスプールの削除エラー\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "ユーザとグループを読み込んでいます。お待ちください..."
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux ユーザ管理ツール"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/アクション(_A)"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/編集(_E)"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/削除(_D)"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/オプション(_O)"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/システムユーザをフィルタ(_F)"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/ファイル(_F)"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/更新(_R)"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/終了(_Q)"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/ユーザを追加(_A)"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/グループを追加(_G)"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/ヘルプ(_H)"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/バグを報告(_R)"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/情報(_A)"
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "検索:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "フィルタを適用"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "ユーザ"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "グループ"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "ユーザとグループ"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "ユーザ名"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ユーザ ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "プライマリグループ"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "フルネーム"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "ログインシェル"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "ホームディレクトリ"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "状態"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "グループ名"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "グループ ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "グループのメンバー"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "ユーザを追加"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "システムにユーザを追加"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "グループを追加"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "システムにグループを追加"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "編集"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "選択したユーザ/グループを編集"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "削除"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "選択したユーザ/グループを削除"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "更新"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "リストを更新"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "ロック中"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "期限切れ"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "変更するにはアイコンをクリック"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "新規ユーザを作成"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "ホームディレクトリを作成"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "ホームディレクトリ: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "ユーザのプライベートグループを作成"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "ユーザ ID を手動で指定"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "この名前は既に使われています。別のユーザ名を選んでください。"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "パスワードが合っていません"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -330,12 +382,12 @@ msgstr ""
 "パスワードが短すぎます。 \n"
 "パスワードは 7 文字以上にしてください。"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "ユーザの UID が 500 未満です"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -346,27 +398,27 @@ msgstr ""
 "本当に作成しますか？\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "%s をユーザグループに追加"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "新規グループを作成: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "ユーザを追加: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "移行ウィザード"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -375,64 +427,64 @@ msgstr ""
 "移行ウィザードを使って Windows のドキュメントと設定を Mandriva Linux にイン"
 "ポートしますか？"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "グループを選択"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "既存のグループに追加"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "ユーザグループに追加"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "このグループ名は既に存在します。どうしますか？"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "新規グループを作成"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "グループ ID を手動で指定"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "このグループは既に存在します。別のグループ名を選んでください。"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " グループの GID が 500 未満です"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -443,22 +495,22 @@ msgstr ""
 " 本当に作成しますか？\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "グループを追加: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "ファイルを削除しますか？"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -467,27 +519,27 @@ msgstr ""
 "ユーザ %s を削除\n"
 "さらに以下を実行\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "ホームディレクトリを削除: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "メールボックスを削除: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "ユーザを削除: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "グループ %s を削除しますか？"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -496,189 +548,189 @@ msgstr ""
 "%s はユーザ %s のプライマリグループです。\n"
 "まずユーザを削除してください。"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "グループを削除: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "フルネーム:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "ログイン:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "パスワード:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "パスワードを確認:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "ログインシェル:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "グループ名:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "グループ/ユーザを編集"
+msgid "Please select at least one group for the user"
+msgstr "ユーザ 1 人につき少なくとも 1 つのグループを選んでください"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"アカウントの期限に \n"
+"年・月・日を指定してください"
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "パスワード期限のすべての欄を埋めてください\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "ユーザ %s をプライマリグループから削除することはできません"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "ホーム:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "ユーザのデータ"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "アカウントの有効期限を設定する"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "アカウントの期限 (年-月-日):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "ユーザのアカウントをロック"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "アカウントの情報"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "ユーザパスワードの最終変更日 : "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "パスワードの有効期限を設定する"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "変更を許可するまでの日数:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "変更を要求するまでの日数:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "変更を要求する何日前に警告するか:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "アカウントを無効にするまでの日数:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "パスワードの情報"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "ユーザが所属するグループを選んでください:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "グループのデータ"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "このグループに加えるユーザを選んでください :"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "グループユーザ"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "ユーザ 1 人につき少なくとも 1 つのグループを選んでください"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"アカウントの期限に \n"
-"年・月・日を指定してください"
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "パスワード期限のすべての欄を埋めてください\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "ユーザ %s をプライマリグループから削除することはできません"
+msgid "Edit Groups / Users"
+msgstr "グループ/ユーザを編集"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "閉じる"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "ユーザの管理"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
 "Yukiko BANDO <ybando@k6.dion.ne.jp>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "名前が入力されていません。入力してください。"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
@@ -686,12 +738,20 @@ msgstr ""
 "名前にはアルファベットの小文字、数字、ハイフン (-)、アンダースコア (_) 以外は"
 "使えません"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "名前が長すぎます"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "エラー"
+
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "未知のエラー"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "%s の作成エラー: %s"
diff --git a/po/ka.po b/po/ka.po
index 531fa89..859bc71 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2004-09-26 04:45+0400\n"
 "Last-Translator: Aiet Kolkhi <aiet@qartuli.net>\n"
 "Language-Team: Georgian <aiet@qartuli.com>\n"
@@ -18,306 +18,358 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "შეცდომა `%s'-ის კითხვისას: %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "შეცდომა `%s'-ის შექმნისას: %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "შეცდომა `%s'-ის წაშლისას: %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "შეცდომა mail spool-ის შექმნისას.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "შეცდომა mail spool-ის შექმნისას.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "შეცდომა mail spool-ის შექმნისას.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "უცნობი შეცდომა"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "შეცდომა mail spool-ის შექმნისას.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "შეცდომა mail spool-ის შექმნისას.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "ვიძახებ მომხმარებლებს და ჯგუფებს... გთხოვთ მოითმინოთ"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux-ის მენეჯმენტის ხელსაწყო"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_მოქმედებები"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_შეცვლა"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_წაშლა"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_თვისებები"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_გაფილტრე სისტემური მომხმარებლები"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_ფაილი"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_განახლება"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_დამთავრება"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_მომხმარებლის დამატება"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/ჯ_გუფის დამატება"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_დახმარება"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_ხარვეზის შეტყობინება"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_შესახებ..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "მოძებნა:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "ფილტრის გააქტიურება"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "მომხმარებლები"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "ჯგუფ(ებ)ი"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "მომხმარებლები და ჯგუფები"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "მომხმარებლის სახელი"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "მომხმარებლის ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "ძირითადი ჯგუფი"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "სრული სახელი"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "შესასვლელი გარსი"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "პირადი (Home) დირექტორია"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "სტატუსი"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "ჯგუფის სახელი"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ჯგუფის ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "ჯგუფის წევრები"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "მომხმარებლის დამატება"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "მომხმარებლის სისტემაში დამატება"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "ჯგუფის დამატება"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "ჯგუფის სისტემაში დამატება"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "დამუშავება"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "ამორჩეული რიგის შეცვლა"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "წაშლა"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "ამორჩეული რიგის წაშლა"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "განახლება"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "სიის განახლება"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "ჩაკეტილია"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "ვადაგასულია"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "დააწკაპუნეტ სიმბოლოზე შესაცვლელად"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "ახალი მომხმარებლის შექმნა"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Home დირექტორიის შექმნა"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "პირადი (home) დირექტორია:"
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "შექმენი საკუთარი ჯგუფი მომხმარებელს"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "მომხმარებლის ID-ს ხელით მითითება"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "მომხმარებელი უკვე არსებობს, გთხოვთ ამოირჩიოთ სხვა მომხმარებლის სახელი"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "პაროლები არ ემთხვევა"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -326,12 +378,12 @@ msgstr ""
 "პაროლი მეტად მარტივია. \n"
 " კარგი პაროლები სულ ცოტა 6 სიმბოლოსგან უნდა შედგებოდეს"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "მომხმარებლის Uid ნაკლებია 500-ზე"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -342,91 +394,91 @@ msgstr ""
 " დარწმუნებული ხართ, რომ გნებავთ ეს?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "ვსვამ %s-ს „მომხმარებლების“ ჯგუფში"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "ახალი ჯგუფის შექმნა: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "ვამატებ მომხმარებელს: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "სტოპ!"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "ო-ქეი"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "ჯგუფის ამორჩევა"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "არსებულ ჯგუფში დამატება"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "«მომხმარებლების» ჯგუფში დამატება"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "ჯგუფი ამ სახელით უკვე არსებობს. რისი გაკეთება გსურთ?"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "ახალი ჯგუფის შექმნა"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "ჯგუფის ID-ს ხელით მითითება"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "ჯგუფის სახელი უკვე არსებობს, გთხოვთ ამოირჩიოთ სხვა ჯგუფის სახელი"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " ჯგუფის Gid ნაკლებია 500-ზე"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -437,22 +489,22 @@ msgstr ""
 " დარწმუნებული ხართ, რომ გნებავთ ეს?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "ვამატებ ჯგუფს: %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "წავშალო ფაილები თუ არა?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -461,27 +513,27 @@ msgstr ""
 "ვშლი მომხმარებელს %s\n"
 " ასევე შეასრულე შემდეგი მოქმედებები\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Home დირექტორიის წაშლა: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "საფოსტო ყუთის წაშლა :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "მომხმარებლის წაშლა: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "მართლა გნებავთ ჯგუფ „%s“-ის წაშლა?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -490,187 +542,187 @@ msgstr ""
 "%s გახლავთ ძირითადი ჯგუფი %s მომხმარებლისათვის\n"
 " ჯერ მომხმარებელი უნდა მოაშოროთ"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "ვაგდებ ჯგუფს: „%s“"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "სრული სახელი:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "მომხმარებელი:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "პაროლი:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "გაიმეორეთ პაროლი:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "შესასვლელი გარსი:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "ჯგუფის სახელი:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "ჯგუფების / მომხმარებლების შეცვლა"
+msgid "Please select at least one group for the user"
+msgstr "გთხოვთ მომხმარებლისათვის სულ ცოტა ერთი ჯგუფი მაინც ამოირჩიოთ"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"გთხოვთ მიუთითოთ წელი, თვე და რიცხვი \n"
+" ანგარიშის ვადის გასვლისათვის"
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "გთხოვთ პაროლის ხანგრძლივობასთან დაკავშირებული ყველა ველი შეავსოთ\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "«%s» მომხმარებელს მათი ძირითადი ჯგუფიდან ვერ მოაშორებთ"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "პირადი უჯრა:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "მომხმარებლის მონაცემები"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "ანგარიშის იმპორტირება ა&ნგარიშზე"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "ანგარიშს ვადა გაუვა (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "მომხმარებლის ანგარიშის ჩაკეტვა"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "ანგარიშის მონაცემები"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "მომხმარებელმა ბოლოს პაროლი შეცვალა:"
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "დააწესე პაროლის მოქმედების ვადა"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "ნებადართულ ცვლილებამდე დარჩენილი დღეები :"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "აუცილებელ ცვლილებამდე დარჩენილი დღეები :"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "ცვლილებამდე გაფრთხილების დღეები :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "დღეები, სანამ ანგარიში აქტიურობას დაკარგავს :"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "პაროლის მონაცემები"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "ამოირჩიეთ ჯგუფები, რომლის წევრიც მომხმარებელი იქნება:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "ჯგუფის მონაცემები"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "ამოირჩიეთ მომხმარებლები, რომლებიც ამ ჯგუფში გაწევრიანდებიან :"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "ჯგუფის მომხმარებლები"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "გთხოვთ მომხმარებლისათვის სულ ცოტა ერთი ჯგუფი მაინც ამოირჩიოთ"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"გთხოვთ მიუთითოთ წელი, თვე და რიცხვი \n"
-" ანგარიშის ვადის გასვლისათვის"
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "გთხოვთ პაროლის ხანგრძლივობასთან დაკავშირებული ყველა ველი შეავსოთ\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "«%s» მომხმარებელს მათი ძირითადი ჯგუფიდან ვერ მოაშორებთ"
+msgid "Edit Groups / Users"
+msgstr "ჯგუფების / მომხმარებლების შეცვლა"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "დახურვა"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "მომხმარებელთა მენეჯმენტი"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr ""
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "სახელი ველი თავისუფალია. გთხოვთ მიუთითოთ სახელი"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
@@ -678,15 +730,23 @@ msgstr ""
 "სახელი შეიძლება შეიცავდეს მხოლოდ პარატა ლათინურ ასოებს, ციფრებს და, „-“-ს და "
 "„_“-ს"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "სახელი ძალიან გრძელია"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "შეცდომა"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "უცნობი შეცდომა"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "შეცდომა `%s'-ის შექმნისას: %s"
+
 #~ msgid "Authors: "
 #~ msgstr "ავტორები:"
diff --git a/po/ko.po b/po/ko.po
index f1b5207..151b941 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2002-09-02 18:34+0900\n"
 "Last-Translator: Jaegeum Cze <baedaron@hanafos.com>\n"
 "Language-Team: Korean <baedaron@hananet.net>\n"
@@ -18,320 +18,372 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "'%s' 읽는 중 오류가 발생했습니다: %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, fuzzy, c-format
 msgid "Error removing `%s': %s"
 msgstr "사용자 제거"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "픽스맵 파일 적재 중 오류: %s"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 #, fuzzy
 msgid "Error creating mail spool.\n"
 msgstr "픽스맵 파일 적재 중 오류: %s"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "픽스맵 파일 적재 중 오류: %s"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "알 수 없는 오류"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "픽스맵 파일 적재 중 오류: %s"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 #, fuzzy
 msgid "Error deleting mail spool.\n"
 msgstr "픽스맵 파일 적재 중 오류: %s"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "사용자 드레이크"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr ""
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/동작(_A)"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/편집(_E)"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/삭제(_D)"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/옵션(_O)"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/파일(_F)"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/새로 고침 (_R)"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/종료(_Q)"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/사용자 더하기(_A)"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/그룹 더하기(_A)"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/도움말(_H)"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/버그 보고(_R)"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/정보(_A)..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "검색:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "거르게 적용"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "사용자"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "그룹"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, fuzzy, c-format
 msgid "Users and groups"
 msgstr "소속된 그룹들"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "사용자 이름"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "사용자 ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "전체 이름"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "로그인명"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "홈 디렉토리"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "상태"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "그룹 이름"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "그룹 ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "그룹 구성원"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "사용자 추가"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "그룹 추가"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, fuzzy, c-format
 msgid "Add a group to the system"
 msgstr "그룹 추가"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "편집"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "삭제"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "새로 고침"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, fuzzy, c-format
 msgid "Refresh the list"
 msgstr "사용자 목록"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "막힘"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr ""
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "새 사용자 생성"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "홈 디렉토리 생성"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "홈 디렉토리:"
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, fuzzy, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "이미 존재하는 이름입니다."
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "암호가 일치하지 않습니다"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -339,91 +391,91 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr ""
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, fuzzy, c-format
 msgid "Creating new group: %s"
 msgstr "그룹 보기"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, fuzzy, c-format
 msgid "Adding user: %s"
 msgstr "사용자 추가"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "취소"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "확인"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, fuzzy, c-format
 msgid "Choose group"
 msgstr "소속된 그룹들"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "새 그룹 생성"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -431,249 +483,257 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr ""
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr ""
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
 " Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, fuzzy, c-format
 msgid "Delete Home Directory: %s"
 msgstr "사용자 홈 디렉토리"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, fuzzy, c-format
 msgid "Removing user: %s"
 msgstr "사용자 제거"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr ""
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, fuzzy, c-format
 msgid "Removing group: %s"
 msgstr "그룹 제거"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "전체 이름:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "로그인명:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "암호:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "열쇠글 확인:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "로그인 쉘:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "그룹 이름:"
 
-#: ../userdrake:679
-#, fuzzy, c-format
-msgid "Edit Groups / Users"
-msgstr "그룹"
+#: ../userdrake:894
+#, c-format
+msgid "Please select at least one group for the user"
+msgstr ""
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr ""
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "홈 디렉토리:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, fuzzy, c-format
 msgid "User Data"
 msgstr "사용자 목록"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr ""
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr ""
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr ""
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr ""
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr ""
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, fuzzy, c-format
 msgid "Password Info"
 msgstr "암호"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, fuzzy, c-format
 msgid "Group Data"
 msgstr "그룹 목록"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr ""
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, fuzzy, c-format
 msgid "Group Users"
 msgstr "그룹"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr ""
-
-#: ../userdrake:856
-#, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr ""
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr ""
+#: ../userdrake:1127
+#, fuzzy, c-format
+msgid "Edit Groups / Users"
+msgstr "그룹"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "닫기"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, fuzzy, c-format
 msgid "Users Management"
 msgstr "사용자 이름"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "맨드리바 온라인"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "오류"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "알 수 없는 오류"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "'%s' 읽는 중 오류가 발생했습니다: %s"
+
 #~ msgid "Authors: "
 #~ msgstr "저자:"
 
diff --git a/po/ku.po b/po/ku.po
index 36f9506..42e579d 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\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"
@@ -21,307 +21,359 @@ msgstr ""
 "X-Generator: KBabel 1.10\n"
 "Plural-Forms: nplurals=2; plural= n != 1\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Çewte xwendine `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Çewte Afirandine `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Çewta Rêşkirin `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Çewta afirandina spool mail \n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Çewta afirandina spool mail \n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Çewta afirandina spool mail \n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "çewtek nezan"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Çewta afirandina spool mail \n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Çewta rêşkirina spool mail.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Dakişandina Bikarhener û Grup... Kerema xwe bisekinin"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux Amurata Rêvebiriya Bikarhenerên"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Çalakî"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Biguherîne"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Pakijkirin"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Bijartin"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/Bikarhênerên sîstemê _fîltre bike"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Dosya"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Taze bike"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Derkeve"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Bikarhêner Zêde bike"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/_Kom Zêde bike"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Alîkarî"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Rapor kirina çewtîyan"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Derheq..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Bigere:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Fîltre Bixwaze"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Bikarhêner"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Kom"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Bikarhêner û kom"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Nave bikarhêner"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID ya bikarhêner"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Koma Yekemîn"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Nav û paşnav"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Têketina Shell "
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Cîhe Malê"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Statu"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Nave kome"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ID ya kome"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Endamên Kom"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Bikarhêner qeyd bike"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Li sistema bikarhenerek biserve bike"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Kome qeyd bike"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Li sistema Kom biserve bike"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Biguhere"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Yên nîşandayî biguhere"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Pakij bike"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Yên nîşandayî pakij bike"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Rojanê bike"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Lîste rojanê bike"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Girtî"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Demborî bû"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Li îkonên bitikînin ji bo guhartina vî"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Bikarhênerêkî nû qeyd bike"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Cîhe Malê çebike"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Cîhe Malê"
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Ji bo bikarhenerên komek taybetî bafirinin"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Nasnameya bikarhener bi desti bikarbînin"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr ""
 "Bikarhener bi rastî heye, kerema xwe re Nave Bikarhenera din hilbijerin"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Şîfre Nelihev e"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -330,12 +382,12 @@ msgstr ""
 "Ev şîfre pir hêsani ye\n"
 "Şîfreya rast dive ku bibe mezintire 6 karekter "
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Bikarhenera Uid < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -346,91 +398,91 @@ msgstr ""
 "Hûn bi rastî dixwazin ev bikin?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Cihkırına %s re koma 'bikarhener'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Afirandina koma nû: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Biserkirina bikarhener: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Betal"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Dibe"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Kîjan kom?"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Li koma jêbûyî biserve bike"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Li koma 'bikarhener' biservebike"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Komeka nû çebike"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "ID ya kome bi xwe binivsînim"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, 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:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "Kom Gid < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -441,22 +493,22 @@ msgstr ""
 "Hûn bi rastî dixwazin ev bikin?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Biservekirina kom %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Dosyan jî pakij bikin û nekin?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -465,27 +517,27 @@ msgstr ""
 "Paqijkirina bikarhener %s\n"
 "Jê cihê xebata tevgeran paşê hene\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Pakijkirina Mala: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Pakijkirina posteya e-maila :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Pakijkirina bikarhênere: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Hûn bi rastî dixwazin vê kome pakij bikin? : %s"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -494,199 +546,207 @@ msgstr ""
 "%s ev komek yekemîn e ji bo bikarhenera  %s\n"
 "Bikarhenera pêşîn paqij bike"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Pakijkirina koma: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Nav û paşnav:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Nave bikarhêner:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "şîfre:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "şîfre dîsa binivsînê"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Têketina Shell :"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Nave kome:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Kom / Bikarhêner biguhêre"
+msgid "Please select at least one group for the user"
+msgstr ""
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr "Bikarhênerên kome"
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
+
+#: ../userdrake:965
+#, 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:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Mal:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Daneya Bikarhener"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Demboriya hesabe mumkin"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Demborî hesab (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Hesabê bikarhêner kîlît bike"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Agahderiya hesab"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Guherandina şîfreya bikarhênera dawî"
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Dîroka xelasbûna şîfre"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Guherandin rojan berê bi ser ve bûn "
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Dixwazina guherandina rojan berê:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr ""
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr ""
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Agahiya Şîfre"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Daneya Kom"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Ji bo teva kirina bikarheneren re kom hilbijerin :"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Bikarheneren Kom"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr ""
-
-#: ../userdrake:856
-#, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr "Bikarhênerên kome"
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr ""
-
-#: ../userdrake:905
+#: ../userdrake:1127
 #, 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"
+msgid "Edit Groups / Users"
+msgstr "Kom / Bikarhêner biguhêre"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Bigre"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Bikarhêner manajer"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr ""
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Nav pir dirêj e"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "çewt"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "çewtek nezan"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Çewte Afirandine `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Nîvîskar"
diff --git a/po/ky.po b/po/ky.po
index c661639..36ab066 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2009-12-25 23:18+0600\n"
 "Last-Translator: Ilyas Bakirov <just_ilyas@yahoo.com>\n"
 "Language-Team: Kyrgyz\n"
@@ -16,327 +16,358 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Окуу учурундагы ката `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Түзүү учурундагы ката `%s': %s"
 
-#: ../USER/USER.xs:203
-#: ../USER/USER.xs:232
-#: ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Жоготуу учурундагы ката `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Почта түзүүдөгү ката.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Почта түзүүдөгү ката.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Почта түзүүдөгү ката.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "белгисиз ката"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Почта түзүүдөгү ката.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Почтаны жоготуудагы ката.\n"
 
-#: ../userdrake:55
-#: ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Колдонуучулар жана группалар жүктөлүүдө... Күтө туруңуз"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux Колдонуучуларды башкаруу аспабы"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr "/_Конок колдонуучуну орнотуу"
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr "/_Конок колдонуучуну алып салуу"
 
-#: ../userdrake:99
-#: ../userdrake:100
-#: ../userdrake:101
-#: ../userdrake:109
-#: ../userdrake:110
-#: ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Аракеттер"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Оңдоо"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Өчүрүү"
 
-#: ../userdrake:91
-#: ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Параметрлер"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Системалык колдонуучуларды иргөө"
 
-#: ../userdrake:95
-#: ../userdrake:96
-#: ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Файл"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Жаңылоо"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Чыгуу"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/Колдонуучуну _кошуу"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/_Группаны кошуу"
 
-#: ../userdrake:108
-#: ../userdrake:109
-#: ../userdrake:110
-#: ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Жардам"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Баг жөнүндө отчет"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Программа жөнүндө..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Издөө:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Иргөөнү колдонуу"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Колдонуучулар"
 
-#: ../userdrake:133
-#: ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Группалар"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Колдонуучулар жана группалар"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Колдонуучунун аты"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Колдонуучунун IDси"
 
-#: ../userdrake:154
-#: ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Негизги группа"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Толук аты"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Кирүү чөйрөсү"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Өздүк каталог"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Статусу"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Группанын аты"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Группанын IDси"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Группанын мүчөлөрү"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Колдонуучуну кошуу"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Системага жаңы колдонуучуну кошуу"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Группаны кошуу"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Системага группаны кошуу"
 
-#: ../userdrake:165
-#: ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Оңдоо"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Тандалган сапты оңдоо"
 
-#: ../userdrake:166
-#: ../userdrake:552
-#: ../userdrake:584
-#: ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Өчүрүү"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Тандалган сапты өчүрүү"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Жаңылоо"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Тизмени жаңылоо"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Бекитилген"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Иштөө мөөнөтүнүн аягы"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Муну өзгөртүү үчүн иконканы басыңыз"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Жаңы колдонуучуну жаратуу"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Өздүк каталогду түзүү"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Өздүк каталог:"
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Колдонуучу үчүн өздүк группа түзүү"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Колдонуучунун IDсин өзүңүз көрсөтүңүз"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Колдонуучу агдагачан бар, башка колдонуучу атын тандаңыз"
 
-#: ../userdrake:329
-#: ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Пароль туура эмес"
 
-#: ../userdrake:330
-#: ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -345,12 +376,12 @@ msgstr ""
 "Бул пароль өтө эле жөнөкөй. \n"
 " Жакшы пароль 6 символдон көп болот"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Колдонуучунун Uidи 500 дөн кичине"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -361,96 +392,93 @@ msgstr ""
 " Ушундай кылууга макулсузбу?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "%s 'users' группасына кошулууда"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Жаңы группа жаратылууда: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Колдонуучу кошулууда: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Которуу устасы"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
-msgid "Do you want to run the migration wizard in order to import Windows documents and settings in your Mandriva Linux distribution?"
-msgstr "Сиз которуу устасы менен Windows ырастоолоруңузду жана документтериңизди Mandriva Linux системасына которуу каалайсызбы?"
+msgid ""
+"Do you want to run the migration wizard in order to import Windows documents "
+"and settings in your Mandriva Linux distribution?"
+msgstr ""
+"Сиз которуу устасы менен Windows ырастоолоруңузду жана документтериңизди "
+"Mandriva Linux системасына которуу каалайсызбы?"
 
-#: ../userdrake:398
-#: ../userdrake:436
-#: ../userdrake:480
-#: ../userdrake:568
-#: ../userdrake:597
-#: ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Калтыруу"
 
-#: ../userdrake:383
-#: ../userdrake:417
-#: ../userdrake:466
-#: ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Группа тандаңыз"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Бар группага кошуу"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "'users' группасына кошуу"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Мындай аттуу группа алдагачан бар.  Сиз эмне кылгыңыз келет?"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Жаңы группа жаратуу"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Группанын IDсин өзүңүз көрсөтүңүз"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Группа алдгачан бар, башка группа атын тандаңыз"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " Группанын Gidи < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -461,23 +489,22 @@ msgstr ""
 " Ушундай кылууга макулсузбу?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Группа кошулууда: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516
-#: ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Файлдарды өчүрөйүнбү же жокпу?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -486,27 +513,27 @@ msgstr ""
 "%s колдонуучусу өчүрүлүүдө\n"
 " Жана да төмөнкүдөй аракеттер жасалууда\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Өздүк каталогду өчүрүү: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Почта ящигин өчүрүү :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Колдонуучу алып салынууда: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Чынында эле %s группасын өчүргүңүз келеби?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -515,201 +542,210 @@ msgstr ""
 "%s, %s колдонуучусу үчүн негизги группа\n"
 " Адегенде колдонуучуну алып салыңыз"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Группа алынып салынууда: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Толук аты:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Логин:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Паролду тактоо:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Кирүү чөйрөсү:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Группанын аты:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Гурппаларды / Колдонуучуларды оңдоо"
+msgid "Please select at least one group for the user"
+msgstr "Колдонуучу үчүн жок дегенде бир группа тандаңыз"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Эсеп жазмасынын аяктоо мөөнөтүнүн\n"
+" Жылын, Айын жана Күнүн көрсөтүңүз "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Паролдун жашы үчүн бардык талааларды толтуруңуз\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "'%s' колдонуучусу негизги группасынан алып салынбайт"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Өздүк каталог:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Колдонуучунун даректери"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Эсеп жазылмасынын аяктоочулук мөөнөтүн иштетүү"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Эсеп жазылмасынын аякталышы (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Колдонуучунун эсеп жазылмасын жабуу"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Эсеп жазылмасы жөнүндө информация"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Колдонуучу акыркы жолу паролун алмаштырганы : "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Паролдун мөөнөтү аяктоочулугун киргизүү"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Канча күндөн соң өзгөртүүгө уруксат : "
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Канча күндөн соң өзгөртүүнү талап кылуу : "
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Канча күн мурда өзгөртүүнү эскертүү :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Эсеп жазмасын жабууга чейинки күн :"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Пароль жөнүндөгү информация"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Колдонуучу мүчө болуучу группаны тандаңыз:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Группанын даректери"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Бул группага бириктирүү үчүн колдонуучуну тандаңыз :"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Колдонуучулар группасы"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Колдонуучу үчүн жок дегенде бир группа тандаңыз"
-
-#: ../userdrake:856
-#, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Эсеп жазмасынын аяктоо мөөнөтүнүн\n"
-" Жылын, Айын жана Күнүн көрсөтүңүз "
-
-#: ../userdrake:862
+#: ../userdrake:1127
 #, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Паролдун жашы үчүн бардык талааларды толтуруңуз\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "'%s' колдонуучусу негизги группасынан алып салынбайт"
+msgid "Edit Groups / Users"
+msgstr "Гурппаларды / Колдонуучуларды оңдоо"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Жабуу"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Колдонуучуларды башкаруу"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Нурлан Бөрүбаев <nurlan@tamga.info>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Аты талаасы толтурулган эмес, ат бериңиз"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
-msgid "The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "Ат, жалаң гана кичине латын тамгалары, сандар, '-' жана '_' турушу керек"
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr ""
+"Ат, жалаң гана кичине латын тамгалары, сандар, '-' жана '_' турушу керек"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Ат өтө эле узун"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Ката"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "белгисиз ката"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Түзүү учурундагы ката `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Авторлор: "
-
diff --git a/po/lo.po b/po/lo.po
index 0105a61..6d57025 100644
--- a/po/lo.po
+++ b/po/lo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-lo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2005-01-13 14:57+0700\n"
 "Last-Translator: Thinnaphavong SIPHACHANH <laonuke@yahoo.com>\n"
 "Language-Team: lo <lo@li.org>\n"
@@ -14,306 +14,358 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "ເກີດການຜິດພາດເວລາອ່ານ `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "ເກີດການຜິດພາດເວລາສ້າງ `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "ເກີດການຜິດພາດເວລາລຶບ `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "ເກີດການຜິດພາດເວລາສ້າງ mail spool.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "ເກີດການຜິດພາດເວລາສ້າງ mail spool.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "ເກີດການຜິດພາດເວລາສ້າງ mail spool.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "ເກີດການຜິດພາດແບບບໍ່ຮູ້ສາເຫດ"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "ເກີດການຜິດພາດເວລາສ້າງ mail spool.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "ເກີດການຜິດພາດເວລາລຶບ mail spool.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "ກຳລັງອ່ານຄ່າ ຜູ້ໃຊ້ ແລະ ກຸ່ມ... ກະລຸນາຖ້າ"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "ເຄື່ອງມືຈັດການຜູ້ໃຊ້ສຳລັບ Mandriva Linux"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_ແບບການເຮັດວຽກ"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_ແກ້ໄຂ"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_ລຶບ"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_ທາງເລືອກ"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_ຕອງລະບົບຜູ້ໃຊ້"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_ໄຟລ໌"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_ອ່ານຄ່າໃຫມ່"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_ອອກ"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_ຕື່ມຜູ້ໃຊ້"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/_ຕື່ມກຸ່ມ"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_ຊ່ວຍເຫລືອ"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_ລາຍງານຂໍ້ຜິດພາດ"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_ກ່ຽວກັບ..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "ຊອກຫາ:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "ໃຊ້ລະບົບຕອງ"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "ຜູ້ໃຊ້"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "ກຸ່ມ"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr ""
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "ຊື່ຜູ້ໃຊ້"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ລະຫັດຜູ້ໃຊ້"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "ກຸ່ມທຳອິດ"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "ຊື່ແທ້"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "ລ໋ອກອິນແຊວ"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Home Directory"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "ສະຖານະ"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "ຊື່ກຸ່ມ"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ລະຫັດກຸ່ມ"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "ສະມາຊິກກຸ່ມ"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "ຕື່ມຜູ້ໃຊ້"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "ຕື່ມຜູ້ໃຊ້ເຂົ້າລະບົບ"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "ຕື່ມກຸ່ມ"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "ຕື່ມກຸ່ມເຂົ້າລະບບົ"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "ແກ້ໄຂ"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "ແກ້ໄຂແຖວທີ່ເລືອກ"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "ລຶບ"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "ລຶບແຖວທີ່ເລືອກ"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "ອ່ານຄ່າໃຫມ່"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "ອ່ານຄ່າລາຍການໃຫມ່"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "ລ໋ອກ"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "ຫມົດອາຍຸ"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "ກົດທີ່ຮູບເພື່ອປ່ຽນແປງ"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "ສ້າງຜູ້ໃຊ້ໃຫມ່"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "ສ້າງ Home Directory"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Home Directory: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "ສ້າງກຸ່ມສ່ວນໂຕສຳລັບຜູ້ໃຊ້"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "ໃສ່ລະຫັດຜຸ້ໃຊ້ເອົາເອງ"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "ຊື່ນີ້ມີແລ້ວ, ກະລຸນາໃຊ້ຊື່ອື່ນ"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "ລະຫັດຜ່ານບໍ່ຖືກຕ້ອງ"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -322,12 +374,12 @@ msgstr ""
 "ລະຫັດຜ່ານນີ້ງ່າຍເກີນໄປ. \n"
 " ລະຫັດຜ່ານທີ່ດີຕ້ອງມີຫລາຍກວ່າ 6 ໂຕອັກສອນ"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "ລະຫັດຜູ້ໃຊ້ຫນ້ອຍກວ່າ 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -338,91 +390,91 @@ msgstr ""
 "ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການສ້າງ?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "ຕື່ມ %s ໃສ່ກຸ່ມ 'users' "
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "ສ້າງກຸ່ມໃຫມ່: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "ຕື່ມຜູ້ໃຊ້: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "ຍົກເລີກ"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "ຕົກລົງ"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "ລະຫັດ: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "ເລືອກກຸ່ມ"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "ຕື່ມເຂົ້າກຸ່ມທີ່ມີຢູ່ແລ້ວ"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "ຕື່ມໃສ່ກຸ່ມ 'users'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "ຊື່ກຸ່ມນີ້ມີຢູ່ແລ້ວ. ເຈົ້າຈະເຮັດຈັ່ງໃດຕໍ່ໄປ?"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "ສ້າງກຸ່ມໃຫມ່"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "ໃສ່ລະຫັດກຸ່ມເອົາເອງ"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "ຊື່ກຸ່ມນີ້ມີຢູ່ແລ້ວ, ກະລຸນາເລືອກຊື່ອື່ນ"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "ລະຫັດກຸ່ມຫນ້ອຍກວ່າ 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -433,22 +485,22 @@ msgstr ""
 "ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການເຮັດແບບນັ້ນ?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "ຕື່ມກຸ່ມ: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "ລະຫັດກຸ່ມ: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "ລຶບໄຟລ໌ຫລືບໍ່?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -457,27 +509,27 @@ msgstr ""
 "ກຳລັງລຶບຜູ້ໃຊ້ %s\n"
 " ແລະກຳລັງເຮັດສິ່ງຕໍ່ໄປນີ້\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "ລຶບ Home Directory: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "ລຶບ ຕູ້ຈົດຫມາຍ :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "ລຶບຜູ້ໃຊ້: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "ເຈົ້າຫມັ້ນໃຈບໍ່ວ່າຈະລຶບກຸ່ມ %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -486,201 +538,209 @@ msgstr ""
 "%s ແມ່ນກຸ່ມທຳອິດຂອງ %s\n"
 " ລຶບຜູ້ໃຊ້ນີ້ກ່ອນ"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "ລຶບກຸ່ມ: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "ຊື່ແທ້:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "ລ໋ອກອິນ:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "ລະຫັດຜ່ານ:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "ຢືນຢັນລະຫັດຜ່ານ:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "ລ໋ອກອິນແຊວ:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "ຊື່ກຸ່ມ:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "ແກ້ໄຂກຸ່ມ / ຜູ້ໃຊ້"
+msgid "Please select at least one group for the user"
+msgstr "ກະລຸນາເລືອກຢ່າງຫນ້ອຍຫນຶ່ງກຸ່ມສຳລັບຜູ້ໃຊ້"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"ກະລຸນາກຳນົດປີ, ເດືອນ ແລະ ມື້ \n"
+"ທີ່ບັນຊີຈະຫມົດອາຍຸ"
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "ກະລຸນາຕື່ມໃສ່ທຸກຫ້ອງໃນອາຍຸຂອງລະຫັດລັບ\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "ເຈົ້າບໍ່ສາມາດລຶບຜຸ້ໃຊ້ '%s' ຈາກກຸ່ມທຳອິດຂອງເຂົາ"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "ເຮືອນ:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "ຂໍ້ມູນຜູ້ໃຊ້"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "ໃຊ້ການຈັບເວລາການຫມົດອາຍຸຂອງບັນຊີ"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "ບັນຊີຫມົດອາຍຸ (ປປປປ-ດດ-ທທ):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "ລ໋ອກບັນຊີຜູ້ໃຊ້"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "ຂໍ້ມູນບັນຊີ"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "ຜູ້ໃຊ້ປ່ຽນລະຫັດຜ່ານຄັ້ງຫລ້າສຸດຕອນ: "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "ໃຊ້ກຳນົດມື້ຫມົດອາຍຸຂອງລະຫັດຜ່ານ"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "ຈຳນວນມື້ກ່ອນທີ່ຈະປ່ຽນໄດ້:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "ຈຳນວນມື້ກ່ອນປ່ຽນທີ່ຕ້ອງການ:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "ຈຳນວນມື້ທີ່ຈະເຕືອນກ່ອນປ່ຽນ:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "ຈຳນວນມື້ກ່ອນທີ່ບັນຊີຈະບໍ່ເຮັດວຽກ"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "ຂໍ້ມູນລະຫັດຜ່ານ"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "ເລືອກກຸ່ມທີ່ຜູ້ໃຊ້ຈະເປັນສະມາຊິກ"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "ຂໍ້ມູນກຸ່ມ"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "ເລືອກຜູ້ໃຊ້ສຳລັບກຸ່ມນີ້:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "ກຸ່ມຜູ້ໃຊ້"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "ກະລຸນາເລືອກຢ່າງຫນ້ອຍຫນຶ່ງກຸ່ມສຳລັບຜູ້ໃຊ້"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"ກະລຸນາກຳນົດປີ, ເດືອນ ແລະ ມື້ \n"
-"ທີ່ບັນຊີຈະຫມົດອາຍຸ"
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "ກະລຸນາຕື່ມໃສ່ທຸກຫ້ອງໃນອາຍຸຂອງລະຫັດລັບ\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "ເຈົ້າບໍ່ສາມາດລຶບຜຸ້ໃຊ້ '%s' ຈາກກຸ່ມທຳອິດຂອງເຂົາ"
+msgid "Edit Groups / Users"
+msgstr "ແກ້ໄຂກຸ່ມ / ຜູ້ໃຊ້"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "ອອກ"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "ການບໍລິຫານຜູ້ໃຊ້"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr ""
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "ບໍ່ມີຊື່ ກະລຸນາໃສ່ຊື່ແນ່"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "ຊື່ຕ້ອງເປັນໂຕຫນັງສືລາຕິນແບບໂຕນ້ອຍ, ໂຕເລກ,  `-' ແລະ `_'"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "ຊື່ຍາວໂພດ"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "ເກີດການຜິດພາດ"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "ເກີດການຜິດພາດແບບບໍ່ຮູ້ສາເຫດ"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "ເກີດການຜິດພາດເວລາສ້າງ `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "ຜູ້ແຕ່ງ: "
diff --git a/po/lt.po b/po/lt.po
index 26232ee..6d27699 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-lt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2005-08-11 16:47+0200\n"
 "Last-Translator: Arvydas Svirka <arvydas@arvis.lt>\n"
 "Language-Team: \n"
@@ -21,306 +21,358 @@ 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"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Klaida skaitant `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Klaida sukuriant `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Klaida pašalinant `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Pašto sankaupos sukūrimo klaida.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Pašto sankaupos sukūrimo klaida.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Pašto sankaupos sukūrimo klaida.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "nežinoma klaida"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Pašto sankaupos sukūrimo klaida.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Pašto sankaupos ištrynimo klaida.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Įkraunami vartotojai ir grupės... Palaukite"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux vartotojų valdymo įrankis"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Veiksmai"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Taisyti"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Pašalinti"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Pasirinktys"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Filtruoti sistemos vartotojus"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Byla"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Atnaujinti"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/I_šeiti"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/Pridėti _vartotoją"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Pridėti _grupę"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Pagalba"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Pranešti apie klaidą"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Apie..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Ieškoti:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Pritaikyti filtrą"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Vartotojai"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Grupės"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Vartotojai ir grupės"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Vartotojo vardas"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Vartotojo ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Pirminė grupė"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Vardas, pavardė"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Prisijungimo apvalkalas"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Pradinis katalogas"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Būsena"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Grupės pavadinimas"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Grupės ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Grupės nariai"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Pridėti vartotoją"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Įtraukti sistemos vartotoją"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Pridėti grupę"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Į sistemą įtraukti grupę"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Taisyti"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Keisti išrinktą eilutę"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Ištrinti išrinktą eilutę"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Atnaujinti"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Atnaujinti sąrašą"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Užrakinta"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Pasibaigęs"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Pakeitimui spragtelėkite ant kriptogramos"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Sukurti naują vartotoją"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Sukurti pradinį katalogą"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Pradinis katalogas: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Vartotojui sukurti privačią grupę"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Vartotojo ID nurodyti rankiniu būdu"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Toks vartotojas jau yra, parinkite kitą vartotojo vardą"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Slaptažodžiai neatitinka"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -329,12 +381,12 @@ msgstr ""
 "Slaptažodis per daug paprastas. \n"
 " Tinkamas slaptažodis turėtų būti ne trumpesnis kaip 6 simbolių"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Vartotojo Uid yra < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -345,91 +397,91 @@ msgstr ""
 " Ar tikrai norite tai padaryti?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "%s įkeliamas į grupę 'vartotojai'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Sukuriama nauja grupė: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Įtraukiamas vartotojas: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Atšaukti"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Gerai"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Pasirinkite grupę"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Įtraukti į esančią grupę"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Įtraukti į grupę 'vartotojai'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Sukurti naują grupę"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Grupės ID nurodyti rankiniu būdu"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Tokia grupė jau yra, pasirinkite kitą grupės vardą"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " Grupės Gid yra < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -440,22 +492,22 @@ msgstr ""
 " Ar tikrai norite tai padaryti?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Įtraukiama grupė: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Ištrinti bylas ar ne?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -464,27 +516,27 @@ msgstr ""
 "Ištrinams vartotojas %s\n"
 " Taip pat įvykdyti sekančius veiksmus\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Ištrinti pradinį katalogą: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Ištrinti pašto dėžutę: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Pašalinamas vartotojas: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Ar tikrai norite ištrinti grupę %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -493,203 +545,211 @@ msgstr ""
 "%s yra pirminė %s vartotojo grupė\n"
 " Pirmiausia pašalinkite vartotoją"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Pašalinama grupė: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Vardas, pavardė:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Pasijungimas:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Slaptažodis:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Patvirtinkite slaptažodį:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Prisijungimo apvalkalas:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Grupės pavadinimas:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Tvarkyti grupes / vartotojus"
+msgid "Please select at least one group for the user"
+msgstr "Vartotojui parinkite nors vieną grupę"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Nurodykite metus, mėnesį ir dieną, \n"
+" kada baigsis abonento galiojimas"
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Užpildykite visus slaptažodžio laiko laukelius\n"
+
+#: ../userdrake:965
+#, 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:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Pradinis:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Vartotojo duomenys"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Įgalinti ribotą abonento galiojimo laiką"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Abonentas galioja iki (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Užrakinti vartotojo abonentą"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Abonento informacija"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Paskutinis vartotojo pakeistas slaptažodis čia: "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Įgalinti ribotą slaptažodžio galiojimo laiką"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Po kiek dienų leidžiami pakeitimai:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Po kiek dienų reikalaujama pakeitimų:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Prieš kiek dienų įspėjama iki pakeitimo:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Po keik dienų abonentas nebegalios:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Slaptažodžio informacija"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Parinkite grupę, kurios nariu bus vartotojas:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Grupės duomenys"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Išrinkite vartotojus šiai grupei:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Grupės vartoptojai"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Vartotojui parinkite nors vieną grupę"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Nurodykite metus, mėnesį ir dieną, \n"
-" kada baigsis abonento galiojimas"
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Užpildykite visus slaptažodžio laiko laukelius\n"
-
-#: ../userdrake:905
-#, 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"
+msgid "Edit Groups / Users"
+msgstr "Tvarkyti grupes / vartotojus"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Uždaryti"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Vartotojų valdymas"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Vardo laukelis yra tuščias, įrašykite vardą"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Vardas per ilgas"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Klaida"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "nežinoma klaida"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Klaida sukuriant `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Autoriai: "
 
diff --git a/po/ltg.po b/po/ltg.po
index 5e3e465..d7da0a0 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\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"
@@ -16,306 +16,358 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Kliuda nūlosūt `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Kliuda izveidojūt `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Kliuda dziešūt `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Kliuda izveidojūt posta spūli (buferi).\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Kliuda izveidojūt posta spūli (buferi).\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Kliuda izveidojūt posta spūli (buferi).\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "nazynoma kliuda"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Kliuda izveidojūt posta spūli (buferi).\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Kliuda dziešūt posta spūli (buferi).\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Īsaluodej lītuotuoji i grupys... Lyudzu pagaidit"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Maņdryva Linuks Lītuotuoju Puorvaļdeibys reiks"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Darbeibys"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Redigēt"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Dzēst"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Opcejis"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Filtrēt sistemys lītuotuojus"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Fails"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Atjaunynuot"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Izīt"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Davīnuot lītuotuoju"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Davīnuot _grupu"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Paleidzeiba"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Ziņuot par kliudu"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Par..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Meklēt:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Pīlītuot filtru"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Lītuotuoji"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Grupys"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Lītuotuoji i grupys"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Lītuotuojvuords"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Lītuotuoja ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Primaruo grupa"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Pylns vuords"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Dasasliegšonuos čaula"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Sātys katalogs"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Statuss"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Grupys nūsaukums"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Grupys ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Grupys daleibnīki"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Davīnuot lītuotuoju"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Davīnuot lītuotuoju sistemai"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Davīnuot grupu"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Davīnuot grupu sistemai"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Redigēt"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Redigēt izvālātū ryndu"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Dzēst"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Dzēst izvālatū ryndu"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Atjaunuot"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Atjaunuot sarokstu"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Blokeits"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Nūvacuojs"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Uzklikškinojit iz ikonys, lai tū nūmaineitu"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Izveiduot jaunu lītuotuoju"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Izveiduot sātys katalogu"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Sātys katalogs:"
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Izveiduot lītuotuojam privātu grupu"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Manuali nūruodeit lītuotuoja ID"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Itaids lītuotuojs jau eksistej, izavielejit cytu lītuotuojvuordu"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Parolis nasakreit"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -324,12 +376,12 @@ msgstr ""
 "Itei parole ir puoruok vīnkuorša. \n"
 "Lobom parolem juobyun vairuok kai 6 simbolim"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Lītuotuoja Uid ir < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -340,27 +392,27 @@ msgstr ""
 "Voi teišom jius gribit tū dareit?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Pīvīnoj %s grupai 'users'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Teik radeita jauna grupa: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Teik davīnuots lītuotuojs: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Migrācejis paleigs"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -369,64 +421,64 @@ msgstr ""
 "Voi jius gribit palaist migrācejis paleigu, lai importēt Windows dokumentus "
 "i īstatiejumus jiusu Maņdryva Linuks disribucejā?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Atceļt"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Labi"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID:"
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Izavielejit grupu"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Davīnuot asūšai grupai"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Davīnuot grupai 'users'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Izveiduot jaunu grupu"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Manuali nūruodeit grupys ID"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Itaida grupa jau eksistej, izavielejit cytu grupys nūsaukumu"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "Grupys Gid ir < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -437,22 +489,22 @@ msgstr ""
 "Voi tīšom gribit tū dareit?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Teik davīnuota grupa: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID:"
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Dzēst failus voi nā?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -461,27 +513,27 @@ msgstr ""
 "Dziešūt lītuotuoju %s\n"
 " tiks veiktys ari šaidys darbeibys\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Dzēst sātys katalogu: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Izdzēst postkasti: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Teik dzāsts lītuotuojs: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Voi teišom gribit dzēst grupu %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -490,202 +542,210 @@ msgstr ""
 "%s ir lītuotuoja %s primaruo grupa\n"
 " Vyspyrms izdziesit lītuotuoju"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Teik nūdzāsta grupa: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Pylns vuords:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Slāgvuords:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Parole:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Apstyprynuot paroli:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Dasasliegšonuos čaula:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Grupys nūsaukums:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Redigēt Grupys / Lītuotuoji"
+msgid "Please select at least one group for the user"
+msgstr "Izavielejit vysmoz vīnu grupu lītuotuojam"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Nūruodit godu, mienesi i dīnu \n"
+" konta nūvacuošonai"
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Lyudzu aizpiļdit vysus laukumus deļ parolis vacuma\n"
+
+#: ../userdrake:965
+#, 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:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Sāta:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Lītuotuoja dati"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Īslēgt konta nūvacuošonu"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Konts nūvacoj (GGGG-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Blokēt lītuotuoja kontu"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Konta informaceja"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Lītuotuojs pādejū reizi mainēja paroli:"
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Īslēgt parolis nūvacuošonu"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Pyrms cik dīnom teik atļauta nūmaiņa:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Pyrms cik dīnom teik pīpraseita nūmaiņa:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Pyrms cik dīnom teik breidynuots par nūmaini:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dīnu skaits da konta atsliegšonai:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Parolis informaceja"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Izavielejit grupys, kurom pīderēs lītuotuojs:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Grupys dati"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Izavielejit lītuotuojus, kū davīnuot itai grupai:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Grupys lītuotuoji"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Izavielejit vysmoz vīnu grupu lītuotuojam"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Nūruodit godu, mienesi i dīnu \n"
-" konta nūvacuošonai"
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Lyudzu aizpiļdit vysus laukumus deļ parolis vacuma\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Jius navarit izdzēst lītuotuoju '%s' nu juo primaruos grupys"
+msgid "Edit Groups / Users"
+msgstr "Redigēt Grupys / Lītuotuoji"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Aizvērt"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Autortīseibys (C) %s Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Lītuotuoju Puorvaļdeiba"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Maņdryva Linuks"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Māris Laureckis <marisl@e-no.lv>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Vuorda lauks ir tukšs, lyudzu īvodit vuordu"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Vuords ir puoruok garš"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Kliuda"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "nazynoma kliuda"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Kliuda izveidojūt `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Autori:"
 
diff --git a/po/lv.po b/po/lv.po
index 5ac628b..0986e8e 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\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"
@@ -20,306 +20,358 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Kļūda, nolasot `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Kļūda, izveidojot `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Kļūda, novācot `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Kļūda, izveidojot pasta buferi.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Kļūda, izveidojot pasta buferi.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Kļūda, izveidojot pasta buferi.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "nezināma kļūda"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Kļūda, izveidojot pasta buferi.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Kļūda, dzēšot pasta buferi,\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Ielādēju lietotājus un grupas... Lūdzu, uzgaidiet"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux Lietotāju Pārvaldības Rīks"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Darbības"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Rediģēt"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Dzēst"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Opcijas"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Filtrēt sistēmas lietotājus"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Fails"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Atjaunot"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Iziet"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Pievienot lietotāju"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Pievienot _grupu"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Palīdzība"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Ziņot par kļūdu"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Par..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Meklēt:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Noteikt filtru"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Lietotāji"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Grupas"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr ""
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Lietotājvārds"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Lietotāja ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Primārā grupa"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Pilns vārds"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Čaula"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Sākumkatalogs"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Statuss"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Grupas nosaukums"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Grupas ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Grupas dalībnieki"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Pievienot lietotāju"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Pievienot sistēmai lietotāju"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Pievienot grupu"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Pievienot sistēmai grupu"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Rediģēt"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Rediģēt izvēlēto rindu"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Dzēst"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Dzēst izvēlēto rindu"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Atjaunot"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Atjaunot sarakstu"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Bloķēts"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Novecojis"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Uzklikšķiniet uz ikonas, lai to nomainītu"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Izveidot jaunu lietotāju"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Izveidot sākumkatalogu"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Sākumkatalogs:"
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Izveidot lietotājam privātu grupu"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Manuāli norādīt lietotāja ID"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Šāds lietotājs jau eksistē, izvēlieties citu lietotājvārdu"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Paroles nesakrīt"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -328,12 +380,12 @@ msgstr ""
 "Šī parole ir pārāk vienkārša. \n"
 "Labā parolē jābūt vairāk nekā 6 simboliem"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Lietotāja Uid < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -344,91 +396,91 @@ msgstr ""
 "Vai tiešām jūs vēlaties to darīt?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Pievienoju %s grupai 'users'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Izveidoju jaunu grupu: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Pievienoju lietotāju: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Atsaukt"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Labi"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID:"
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Izvēlieties grupu"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Pievienot eksistējošai grupai"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Pievienot grupai 'users'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Izveidot Jaunu Grupu"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Manuāli norādīt grupas ID"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Šāda grupa jau eksistē, izvēlieties citu grupas nosaukumu"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "Grupas Gid ir < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -439,22 +491,22 @@ msgstr ""
 "Vai tiešām vēlaties to darīt?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Pievienoju grupu: %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID:"
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Dzēst failus vai nē?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -463,27 +515,27 @@ msgstr ""
 "Dzēšot lietotāju %s\n"
 "tiks veiktas arī šādas darbības\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Dzēst sākumkatalogu: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Dzēst pastkasti: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Novācu lietotāju: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Vai tiešām vēlaties dzēst grupu %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -492,202 +544,210 @@ msgstr ""
 "%s ir lietotāja %s primārā grupa\n"
 "Vispirms izdzēsiet lietotāju"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Novācu grupu: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Pilns vārds:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Vārds:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Parole:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Apstiprināt paroli:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Čaula:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Grupas nosaukums:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Rediģēt grupas / lietotājus"
+msgid "Please select at least one group for the user"
+msgstr "Lūdzu, izvēlieties vismaz vienu grupu lietotājam"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Lūdzu norādiet gadu, mēnesi un dienu\n"
+"konta novecošanai"
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Lūdzu, norādiet visus laukus paroles novecošanai\n"
+
+#: ../userdrake:965
+#, 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:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Sākums:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Lietotāja dati"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Atļaut konta novecošanu"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Konts noveco (GGGG-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Bloķēt lietotāja kontu"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Konta informācija"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Lietotājs pēdējo reizi mainīja paroli:"
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Atļaut paroles novecošanu"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dienas, līdz tiek atļauta nomaiņa:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Dienas līdz nomaiņas pieprasīšanai:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dienas, cik brīdināt pirms nomaiņas:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dienas, pirms konts kļūst neaktīvs:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Paroles informācija"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, 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:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Grupas dati"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Izvēlieties lietotājus, ko pievienot šai grupai:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Grupas lietotāji"
 
-#: ../userdrake:847
+#: ../userdrake:1127
 #, c-format
-msgid "Please select at least one group for the user"
-msgstr "Lūdzu, izvēlieties vismaz vienu grupu lietotājam"
-
-#: ../userdrake:856
-#, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Lūdzu norādiet gadu, mēnesi un dienu\n"
-"konta novecošanai"
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Lūdzu, norādiet visus laukus paroles novecošanai\n"
-
-#: ../userdrake:905
-#, 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"
+msgid "Edit Groups / Users"
+msgstr "Rediģēt grupas / lietotājus"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Aizvērt"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, fuzzy, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Autortiesības © 2003 Mandriva."
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Lietotāju pārvaldība"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Vārda lauks ir tukšs, lūdzu ievadiet vārdu"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Vārds ir pārāk garš"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Kļūda"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "nezināma kļūda"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Kļūda, izveidojot `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Autori:"
 
diff --git a/po/mk.po b/po/mk.po
index 10a13b5..0926507 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\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"
@@ -21,306 +21,358 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms: nplurals=2; plural= n==1 || n%10==1 ? 0 : 1\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Грешка при вчитување на `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Грешка при создавање `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Грешка при отстранување `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Грешка при содавање spool на поштата.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Грешка при содавање spool на поштата.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Грешка при содавање spool на поштата.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "непозната грешка"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Грешка при содавање spool на поштата.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Грешка при бришење на spool на поштата.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Зе вчитуваат Корисниците и Групите... Ве молиме почекајте"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux Алатка за раководење со корисници"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Акции"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Уреди"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Бриши"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Опции"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Филтрирај ги системските корисници"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Датотека"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Освежи"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Напушти"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Додади корисник"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Додади _група"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Помош"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Пријави грешка"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_За..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Барај:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Примени филтер"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Корисници"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Групи"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Корисници и групи"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Корисничко име"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Кориснички ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Основна група"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Цело име"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Школка за логирање"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Домашен директориум"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Статус"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Име на групата"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Групна ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Членови на групата"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Додади корисник"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Додади корисник на системот"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Додади група"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Додади група на системот"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Уреди"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Уреди го избраниот ред"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Отстрани"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Отстрани го избраниот ред"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Освежи"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Освежи ја листата"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Заклучено"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Изминато"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Притиснете на иконата за да ја смените"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Создади нов корисник"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Создади домашен директориум"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Домашен директориум: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Созадади приватна група за корисникот"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Рачно специфицирајте кориснички ID"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Корисникот веќе постои, ве молиме изберете друго корисничко име"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Лозинките не се совпаѓаат"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -329,12 +381,12 @@ msgstr ""
 "Оваа лозинка е премногу едноставна. \n"
 " Добрите лозинки треба да се повеќе од 6 карактери"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Корисничкиот Uid е помал од 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -345,91 +397,91 @@ msgstr ""
 "Дали сигурно сакате да го сторите ова?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Сместувам %s во 'корисничка' група"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Создавам нова група: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Додавам корисник: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Откажи"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Во ред"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Избери група"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Додади на постоечката група"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Додади на 'корисничката' група"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Веќе постои група со ова име. Што сакате да направите?"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Создади нова група"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Рачно специфицирај ја групната ID"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Групата веќе постои, ве молиме изберете друго име за групата"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " Групното Gid е помало од 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -440,22 +492,22 @@ msgstr ""
 " Дали сигурно сакате да го сторите ова?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Додавам група: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Дали да се избришат датотеките?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -464,27 +516,27 @@ msgstr ""
 "Отстранувам корисник %s\n"
 " Истотака, изврши ги следниве акции\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Избриши го домашниот директориум: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Избриши го поштенското сандаче >/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Отстранувам корисник: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Дали навистина сакате да ја избришете групата %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -493,201 +545,209 @@ msgstr ""
 "%s е основна група за корисникот %s\n"
 " Најпрво отстранете го корисникот"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Ја отстранувам групата: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Цело име:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Логин:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Потврди ја лозинката:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Школка за логирање:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Име на групата:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Уреди Групи / Корисници"
+msgid "Please select at least one group for the user"
+msgstr "Ве молиме изберете најмалку една група за корисникот"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Ве молиме специфицирајте Година, месец и ден \n"
+" за истекување на сметката "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Ве молиме повторно пополнете ги сите полина во лозинката\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Не можете да го отстраните корисникот '%s' од неговата основна група"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Дома:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Кориснички податоци"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Овозможи истекување на сметката"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Сметката истекува (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Заклучи ја корисничката сметка"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Информации за сметката"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Корисникот последен пат ја сменил лозинката на : "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Овозможи истекување на лозинката"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Денови пред дозвола за изменување :"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Денови пред потреба за измена :"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Предупредувачки денови пред измена :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Денови пред деактивирање на сметката :"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Информации за лозинката"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Изберете на кои групи корисникот ќе биде член:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Податоци за групата"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Изберете ѓи корисниците кои ќе се приклучат на групата:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Корисници на групата"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Ве молиме изберете најмалку една група за корисникот"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Ве молиме специфицирајте Година, месец и ден \n"
-" за истекување на сметката "
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Ве молиме повторно пополнете ги сите полина во лозинката\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Не можете да го отстраните корисникот '%s' од неговата основна група"
+msgid "Edit Groups / Users"
+msgstr "Уреди Групи / Корисници"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Затвори"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Авторски права (C) %s од „Mandriva“"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Раководење со корисници"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Зоран Димовски - zoki.dimovski@gmail.com\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Полето за име е празно. Ве молиме внесете име"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Името мора да содржи само мали латински букви, бројки, `-' и `_'"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Името е предолго"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Грешка"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "непозната грешка"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Грешка при создавање `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Автори: "
diff --git a/po/mn.po b/po/mn.po
index 8b5310c..195b49b 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\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"
@@ -19,320 +19,372 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "pixmap файлыг ачаалж байхад алдаа: %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, fuzzy, c-format
 msgid "Error removing `%s': %s"
 msgstr "Хэрэглэгч (дийг) устгах"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "pixmap файлыг ачаалж байхад алдаа: %s"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 #, fuzzy
 msgid "Error creating mail spool.\n"
 msgstr "pixmap файлыг ачаалж байхад алдаа: %s"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "pixmap файлыг ачаалж байхад алдаа: %s"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "тодорхойгүй алдаа"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "pixmap файлыг ачаалж байхад алдаа: %s"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 #, fuzzy
 msgid "Error deleting mail spool.\n"
 msgstr "pixmap файлыг ачаалж байхад алдаа: %s"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Хэрэглэгчийн драке"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr ""
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Үйлдлүүл"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Зарах"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Устгах"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Сонголтууд"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Файл"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/Сэргээх"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Гарах"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Хэрэглэгч нэмэх"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/_Бүлэг нэмэх"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Тусламж"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Гажигийг мэдээлэх"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/Т_ухай..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Хайлт:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Хэрэглэгчид"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Бүлгүүд"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, fuzzy, c-format
 msgid "Users and groups"
 msgstr "Бүлгүүдэд"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Хэрэглэгчийн нэр"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Хэрэглэгчийн ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Бүтэн нэр"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, fuzzy, c-format
 msgid "Login Shell"
 msgstr "Нэвтрэх"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Гэр лавлах"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Төлөв"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, fuzzy, c-format
 msgid "Group Name"
 msgstr "Бүлэг"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Группын ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, fuzzy, c-format
 msgid "Group Members"
 msgstr "Бүлгүүд"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Хэрэглэгч нэмэх"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Бүлэг нэмэх"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, fuzzy, c-format
 msgid "Add a group to the system"
 msgstr "Шинэ бүлэг нэмэх"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Засах"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Устгах"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Сэргээх"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, fuzzy, c-format
 msgid "Refresh the list"
 msgstr "Хэрэглэгчдийн жагсаалт"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Түгжээтэй санах ой"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr ""
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Гэр лавлах үүсгэх"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Гэр лавлах: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, fuzzy, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Энэ нэр хэдийн системд орсон байна"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Нууц үгс ижил биш байна"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -340,91 +392,91 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr ""
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, fuzzy, c-format
 msgid "Creating new group: %s"
 msgstr "Бүлгүүдийг харах"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, fuzzy, c-format
 msgid "Adding user: %s"
 msgstr "Хэрэглэгч нэмэх"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Хүчингүй"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Ок"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, fuzzy, c-format
 msgid "Choose group"
 msgstr "Бүлгүүдийг харах"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, fuzzy, c-format
 msgid "Create New Group"
 msgstr "Үндсэн бүлэг"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -432,249 +484,257 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, fuzzy, c-format
 msgid "Adding group: %s "
 msgstr "Бүлэг нэмэх"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr ""
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
 " Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, fuzzy, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Ldap хавтас сонгох"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, fuzzy, c-format
 msgid "Removing user: %s"
 msgstr "Хэрэглэгч (дийг) устгах"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr ""
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, fuzzy, c-format
 msgid "Removing group: %s"
 msgstr "Бүлэг (үүд)-ийг устгах"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Бүтэн нэр:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Нэвтрэх нэр:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Нууц үг:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Нууц үгээ бататгах:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Нэвтрэх тушаалын мөр:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, fuzzy, c-format
 msgid "Group Name:"
 msgstr "Бүлэг:"
 
-#: ../userdrake:679
-#, fuzzy, c-format
-msgid "Edit Groups / Users"
-msgstr "Хэрэглэгч (дийг) засах"
+#: ../userdrake:894
+#, c-format
+msgid "Please select at least one group for the user"
+msgstr ""
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr ""
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Эзний гэр:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, fuzzy, c-format
 msgid "User Data"
 msgstr "Хэрэглэгчдийн жагсаалт"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr ""
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr ""
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr ""
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr ""
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr ""
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, fuzzy, c-format
 msgid "Password Info"
 msgstr "Нууц үг"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, fuzzy, c-format
 msgid "Group Data"
 msgstr "Бүлгийн жагсаалт"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr ""
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, fuzzy, c-format
 msgid "Group Users"
 msgstr "Бүлгүүд"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr ""
-
-#: ../userdrake:856
-#, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr ""
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr ""
+#: ../userdrake:1127
+#, fuzzy, c-format
+msgid "Edit Groups / Users"
+msgstr "Хэрэглэгч (дийг) засах"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Хаах"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, fuzzy, c-format
 msgid "Users Management"
 msgstr "Хэрэглэгчийн нэр"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Мандрива Линукс"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Алдаа"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "тодорхойгүй алдаа"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "pixmap файлыг ачаалж байхад алдаа: %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Зохиогчид: "
 
diff --git a/po/ms.po b/po/ms.po
index 997b057..1af3be5 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\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"
@@ -22,306 +22,358 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=1;\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Ralat membaca `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Ralat mencipta `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Ralat membuang `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Ralat mencipta gulungan mel.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Ralat mencipta gulungan mel.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Ralat mencipta gulungan mel.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "ralat tidak diketahui"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Ralat mencipta gulungan mel.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Ralat memadam gulungan mel.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Memuatkan Pengguna dan Kumpulan... Sila tunggu"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Alatan Mengurus Pengguna Mandriva Linux"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Aksi"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Edit"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/Pa_dam"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Pilihan"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Tapis pengguna sistem"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Fail"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Baru"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Keluar"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Tambah user"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Tambah _kumpulan"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Bantuan"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Lapor Pepijat"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Keterangan"
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Cari:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Terap tapisan"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "User"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Kumpulan"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Pengguna dan kumpulan"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Nama Pengguna"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID Pengguna"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Kumpulan Utama"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Nama Penuh"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Shell Logmasuk"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Direktori rumah"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Status"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Nama Kumpulan"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ID kumpulan"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Ahli Kumpulan"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Tambah pengguna"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Tambah pengguna kepada sistem"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Tambah kumpulan"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Tambah kumpulan kepada sistem"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Edit"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Edit baris dipilih"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Hapus"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Padam baris dipilih"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Segarkan"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Segarkan senarai"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Terkunci"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Tamat tempoh"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Klik pada ikon untuk mengubahnya"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Cipta user baru"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Cipta direktori rumah"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Direktori rumah: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Cipta kumpulan peribadi bagi pengguna"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Nyatakan ID pengguna secara manual"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Pengguna telah wujud, sila pilih Nama Pengguna lain"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Katalaluan tidak sama"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -330,12 +382,12 @@ msgstr ""
 "Katalaluan ini terlalu mudah. \n"
 " Katalaluan yang baik seharusnya > 6 aksara"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Uid pengguna adalah < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -346,27 +398,27 @@ msgstr ""
 " Anda pasti anda mahu melakukannya?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Meletakkan %s ke kumpulan 'users'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Mencipta kumpulan baru: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Menambah pengguna: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Wizard pemindahan"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -375,64 +427,64 @@ msgstr ""
 "Adakah anda hendak melaksanakan wizard pemindahan untuk mengimport dokumen "
 "dan tetapan Windows dalam edaran Mandriva Linux anda?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Pilih kumpulan"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Tambah ke kumpulan yang ada"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Tambah ke kumpulan 'users'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Cipta Kumpulan baru"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Nyatakan ID kumpulan secara manual"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Kumpulan telah wujud, sila pilih Nama Kumpulan lain"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " Gid kumpulan adalah < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -443,22 +495,22 @@ msgstr ""
 "  Adakah anda pasti anda hendak melakukannya?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Menambah kumpulan: %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Padam fail atau tidak?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -467,27 +519,27 @@ msgstr ""
 "Memadam pengguna %s\n"
 " Juga melaksanakan tindkan berikut\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Padam direktori rumah: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Padam Kotakmel: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Membuang pengguna: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Adakah anda pasti untuk memadam kumpulan %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -496,199 +548,207 @@ msgstr ""
 "%s adalah kumpulan utama untuk pengguna %s\n"
 " Buang pengguna dahulu"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Membuang kumpulan: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Nama Penuh:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Katalaluan:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Sahkan Katalaluan:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell Logmasuk:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Nama kumpulan:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Sunting Kumpulan / Pengguna"
+msgid "Please select at least one group for the user"
+msgstr "Sila pilih sekurang-kurangnya satu kumpulan bagi pengguna"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Sila nyatakan Tahun, Bulan dan Hari \n"
+" untuk Tempoh Tamat Akaun"
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Sila penuhkan semua medan dalam penuaan katalaluan\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Anda tidak boleh membuang pengguna '%s' dari kumpulan utamanya"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Rumah:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Data Pengguna"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Hidupkan peluputan akaun"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Akaun luput (TTTT-BB-HH):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Kunci Akaun Pengguna"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Maklumat Akaun"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Pengguna terakhir menukar katalaluan pada:"
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Hidupkan Peluputan Katalaluan"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Hari sebelum perubahan diizinkan:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Hari sebelum penukaran diperlukan:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Hari amaran sebelum tukar:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Hari sebelum akaun tidak aktif:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Maklumat Katalaluan"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Pilih kumpulan dimana pengguna akan menjadi ahli:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Data Kumpulan"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Pilih pengguna untuk menyertai kumpulan ini:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Kumpul Pengguna"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Sila pilih sekurang-kurangnya satu kumpulan bagi pengguna"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Sila nyatakan Tahun, Bulan dan Hari \n"
-" untuk Tempoh Tamat Akaun"
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Sila penuhkan semua medan dalam penuaan katalaluan\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Anda tidak boleh membuang pengguna '%s' dari kumpulan utamanya"
+msgid "Edit Groups / Users"
+msgstr "Sunting Kumpulan / Pengguna"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Tutup"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Hakcipta (C) %s oleh Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Pengurusan Pengguna"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Medan nama kosong, sila nyatakan nama"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Nama terlalu panjang"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Ralat"
+
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "ralat tidak diketahui"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Ralat mencipta `%s': %s"
diff --git a/po/mt.po b/po/mt.po
index 78dc3ac..43bf3cc 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\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"
@@ -21,306 +21,358 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Problema fil-qari ta' \"%s\": %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Problema biex jinħoloq \"%s\": %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Problema biex jitħassar \"%s\": %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Problema biex jinħoloq spool tal-imejl.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Problema biex jinħoloq spool tal-imejl.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Problema biex jinħoloq spool tal-imejl.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "problema mhux magħrufa"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Problema biex jinħoloq spool tal-imejl.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Problema biex jitħassar spool tal-imejl.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Qed jittellgħu utenti u gruppi... stenna ftit"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Għodda tal-Mandriva Linux għall-Immaniġġjar tal-Utenti"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Azzjonijiet"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Editja"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Ħassar"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/Għaż_liet"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/I_ffiltra l-utenti tas-sistema"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Fajl"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/E_rġa' tella'"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/O_ħroġ"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Żid utent"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Żid _Grupp"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Għajnuna"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/I_rrapporta problema"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Dwar..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Fittex:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Applika filtru"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Utenti"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Gruppi"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Utenti u gruppi"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Isem il-utent"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID tal-utent"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Grupp ewlieni"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Isem sħiħ"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Shell tal-login"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Direttorju personali"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Status"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Isem il-grupp"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ID tal-Grupp"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Membri tal-grupp"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Żid utent"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Żid utent mas-sistema"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Żid grupp"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Żid grupp mas-sistema"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Ibdel"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Ibdel il-linja magħżula"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Ħassar"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Ħassar il-linja magħżula"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Erġa' tella'"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Erġa' tella' l-lista"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Imsakkar"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Skadut"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Klikkja fuq l-ikona biex tibdilha"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Oħloq utent ġdid"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Oħloq direttorju personali"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Direttorju personali:"
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Oħloq grupp privat għall-utent"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Speċifika ID tal-utent manwalment"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, 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:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Passwords ma jaqblux"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -329,12 +381,12 @@ msgstr ""
 "Dan il-password sempliċi wisq.\n"
 "Passwords tajbin iridu jkunu twal >6 ittri."
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "ID tal-utent < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -345,91 +397,91 @@ msgstr ""
 "Żgur li trid tagħmel dan?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Qed jiġi miżjud %s mal-grupp \"users\""
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Qed jinħoloq grupp: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Qed jiġi miżjud utent: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Ikkanċella"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Agħżel grupp"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Żid ma' grupp eżistenti"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Żid mal-grupp \"users\""
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Oħloq grupp ġdid"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Speċifika l-ID tal-grupp manwalment"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, 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:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "ID tal-grupp < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -440,22 +492,22 @@ msgstr ""
 "Żgur li trid tagħmel dan?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Qed jiġi miżjud grupp: %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Trid tħassar il-fajls jew le?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -464,27 +516,27 @@ msgstr ""
 "Qed jitħassar utent %s\n"
 " Agħmel ukoll dan li ġej\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Ħassar id-direttorju personali: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Ħassar il-kaxxa tal-ittri: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Qed jitneħħa utent: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Żgur trid tneħħi l-grupp %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -493,187 +545,187 @@ msgstr ""
 "%s huwa l-grupp ewlieni tal-utent %s\n"
 " L-ewwel ħassar lill-utent"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Qed jitneħħa grupp: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Isem sħiħ:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Password:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Ikkonferma password:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell tal-login:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Isem il-grupp:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Editja gruppi u utenti"
+msgid "Please select at least one group for the user"
+msgstr "Agħżel ta' l-inqas grupp wieħed għall-utent"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Jekk jogħġbok speċifika s-sena, xahar u ġurnata\n"
+"meta jiskadi l-kont "
+
+#: ../userdrake:914
+#, 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:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Ma tistax tneħħi l-utent \"%s\" mill-grupp ewlieni"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Direttorju personali:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Informazzjoni tal-utent"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Kont jiskadi"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Kont jiskadi (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Sakkar il-kont tal-utent"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Info. dwar Kont"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Il-utent l-aħħar li bidel il-password f':"
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Password tiskadi"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Ġranet qabel tħalli tibdil :"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Ġranet qabel jiġi mġiegħel tibdil :"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Ġranet ta' twissija qabel jiskadi :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Ġranet qabel jiġi inattivat il-kont :"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Info. Password"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, 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:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Info. grupp"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Agħżel liema utenti se jkunu membri tal-grupp :"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Utenti tal-grupp"
 
-#: ../userdrake:847
-#, 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:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Jekk jogħġbok speċifika s-sena, xahar u ġurnata\n"
-"meta jiskadi l-kont "
-
-#: ../userdrake:862
-#, 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:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Ma tistax tneħħi l-utent \"%s\" mill-grupp ewlieni"
+msgid "Edit Groups / Users"
+msgstr "Editja gruppi u utenti"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Agħlaq"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Maniġġjar tal-utenti"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Ramon Casha <ramon.casha@linux.org.mt>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "L-isem huwa vojt. Jekk jogħġbok ipprovdi isem"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
@@ -681,15 +733,23 @@ msgstr ""
 "L-isem jista' jinkludi biss ittri żgħar bl-alfabett Infliż, numri, \"-\" u "
 "\"_\""
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Isem twil wisq"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Problema"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "problema mhux magħrufa"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Problema biex jinħoloq \"%s\": %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Awturi: "
diff --git a/po/nb.po b/po/nb.po
index 3cea670..d06cffd 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2009-10-19 14:42+0200\n"
 "Last-Translator: Olav Dahlum <odahlum@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <cooker-i18n@mandrivalinux.org>\n"
@@ -25,306 +25,358 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Feil under lesing av «%s»: %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Feil under opprettelse av «%s»: %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Feil ved fjerning av «%s»: %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Feil under opprettelse av epostkø.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Feil under opprettelse av epostkø.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Feil under opprettelse av epostkø.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "ukjent feil"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Feil under opprettelse av epostkø.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Feil ved sletting av epostboks\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Vent litt … laster brukere og grupper"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Brukeradministreringsverktøy for Mandriva Linux "
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr "/_Sett opp gjestkonto"
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr "/_Fjern gjestkonto"
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Handlinger"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Rediger"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Slett"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Valg"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Filtrer systembrukere"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Fil"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Oppdater"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Avslutt"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>A"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Legg til bruker"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Legg til _gruppe"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Hjelp"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Rapporter feil"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Om …"
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Søk:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Legg til filter"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Brukere"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Grupper"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Brukere og grupper"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Brukernavn"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "BrukerID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Primærgruppe"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Fullt navn"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Innloggingsskall"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Hjemmeområde"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Status"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Gruppenavn"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "GruppeID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Gruppemedlemmer"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Legg til bruker"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Legg en bruker til systemet"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Legg til gruppe"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Legg en gruppe til systemet"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Rediger"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Rediger valgt rad"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Slett"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Slett valgt rad"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Oppdater listen"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Stengt"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Utløpt"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Klikk på ikonet for å endre det"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Lag ny bruker"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Lag hjemmeområde"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Hjemmekatalog: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Opprett en privat gruppe for brukeren"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Angi brukerID manuelt"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Brukeren finnes allerede, vennligst velg et annet brukernavn"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Passordene stemmer ikke"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -333,12 +385,12 @@ msgstr ""
 "Passordet er for enkelt. \n"
 "Gode passord bør være lengre enn seks tegn"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "BrukerID er lavere enn 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -349,27 +401,27 @@ msgstr ""
 " Er du sikker på at du vil gjøre dette?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Legger til %s i gruppa «users»"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Oppretter ny gruppe: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Legger til bruker: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Migrasjonsveiviser"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -378,64 +430,64 @@ msgstr ""
 "Ønsker du å kjøre migrasjonsveiviseren for å importere dokumenter og oppsett "
 "fra Windows til Mandriva Linux?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Velg gruppe"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Legg til eksisterende gruppe"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Legg til i gruppa «users»"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Lag ny gruppe"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Angi gruppeID manuelt"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Gruppene finnes allerede, vennligst velg et annet gruppenavn"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "GruppeID er lavere enn 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -446,22 +498,22 @@ msgstr ""
 " Er du sikker på at du vil dette?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Legger til gruppe: %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Slette filer?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -470,27 +522,27 @@ msgstr ""
 "Sletter bruker %s\n"
 " Utfør også følgende handlinger\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Slett hjemmekatalog: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Slett e-postboks: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Fjerner bruker: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Vil du virkelig slette gruppa %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -499,177 +551,177 @@ msgstr ""
 "%s er en primær gruppe for bruker %s\n"
 " Fjern brukeren først"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Fjerner gruppe: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Fullt navn:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Brukernavn:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Bekreft passord:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Innloggingsskall:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Gruppenavn:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Rediger grupper/brukere"
+msgid "Please select at least one group for the user"
+msgstr "Vennligst velg minst en gruppe for brukeren"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Vennligst angi dato, måned og dag \n"
+" for kontoens utløpsdato "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Vennligst fyll inn alle feltene for passordelding\n"
+
+#: ../userdrake:965
+#, 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:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Hjem:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Brukerdata"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Slå på utløpsdato for konto"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Konto utløper (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Lås brukerkonto"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Kontoinfo"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Bruker skiftet passord den :"
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Slå på utløpsdato for passord"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dager før skifte er tillatt :"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Dager før skifte kreves :"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Antall dager med varsel før skifte :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dager før konto blir stengt:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Passordinfo"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Velg gruppene som brukeren skal bli medlem av:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Gruppedata"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Velg brukere som skal være med i denne gruppa:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Gruppebrukere"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Vennligst velg minst en gruppe for brukeren"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Vennligst angi dato, måned og dag \n"
-" for kontoens utløpsdato "
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Vennligst fyll inn alle feltene for passordelding\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Du kan ikke fjerne bruker «%s» fra den primære gruppa"
+msgid "Edit Groups / Users"
+msgstr "Rediger grupper/brukere"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Lukk"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Alle rettigheter (C) %s Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Håndtering av brukere"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
@@ -682,23 +734,31 @@ msgstr ""
 "Terje Bjerkelia <terje@bjerkelia.com>, 1999-2000.\n"
 "Andreas Bergstrøm <abergstr@halden.net>, 2000.\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Feltet Navn er tomt, vennligst oppgi et navn"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
-msgid "The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Navnet kan bare innholde små bokstaver, numre, «-» og «_»"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Navnet er for langt"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Feil"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "ukjent feil"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Feil under opprettelse av «%s»: %s"
diff --git a/po/nl.po b/po/nl.po
index 5cb31fe..cc44d2a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2007-09-25 00:36+0200\n"
 "Last-Translator: Reinout van Schouwen <reinouts@gnome.org>\n"
 "Language-Team: Nederlands\n"
@@ -22,312 +22,364 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Fout bij lezen `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Fout bij aanmaken `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Fout bij verwijderen `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Fout bij het aanmaken van de e-mail-wachtrij.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Fout bij het aanmaken van de e-mail-wachtrij.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Fout bij het aanmaken van de e-mail-wachtrij.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "Onbekende fout"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Fout bij het aanmaken van de e-mail-wachtrij.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Fout bij het verwijderen van de e-mail-wachtrij.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Laden van gebruikers en groepen... Even geduld"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux gebruikersbeheer"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Acties"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/Be_werken"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Verwijderen"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Opties"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Systeemgebruikers weglaten"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Bestand"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Vernieuwen"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/A_fsluiten"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/Ge_bruiker toevoegen"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/_Groep toevoegen"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/P_rogrammafout rapporteren"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Info..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Zoeken:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Filter toepassen"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Gebruikers"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Groepen"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Gebruikers en groepen"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Gebruikersnaam"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Gebruikers-ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Primaire groep"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Volledige naam"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Aanmeldshell"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Persoonlijke map"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Status"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Groepsnaam"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Groep-ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Groepsleden"
 
 # broken into two lines to avoid too large a button
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr ""
 "Gebruiker\n"
 "toevoegen"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Gebruiker toevoegen aan het systeem"
 
 # broken into two lines to avoid too large a button
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr ""
 "Groep\n"
 "toevoegen"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Groep toevoegen aan het systeem"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Bewerken"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Geselecteerde rij bewerken"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Geselecteerde rij verwijderen"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Verversen"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "De lijst verversen"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Afgesloten"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Verlopen"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Klik op het pictogram om het te veranderen"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Nieuwe gebruiker aanmaken"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Persoonlijke map aanmaken"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Persoonlijke map: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Privé-groep aanmaken voor de gebruiker"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Handmatig gebruikers-ID opgeven"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "De gebruiker bestaat al, kies een andere gebruikersnaam"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Wachtwoord komt niet overeen"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -336,12 +388,12 @@ msgstr ""
 "Dit wachtwoord is te eenvoudig. \n"
 "Een goed wachtwoord bevat tenminste 6 karakters"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Gebruikers UID is < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -352,27 +404,27 @@ msgstr ""
 " Weet u zeker dat u dit wilt doen?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Bezig met toevoegen %s aan de groep 'users'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Bezig met aanmaken nieuwe groep: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Bezig met toevoegen gebruiker: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Migratiewizard"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -381,64 +433,64 @@ msgstr ""
 "Wilt u de migratiewizard uitvoeren om uw Windows-documenten en -instellingen "
 "te importeren in uw Mandriva Linux-installatie?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Kies een groep"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Toevoegen aan de bestaande groep"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Toevoegen aan de groep 'users'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Nieuwe groep aanmaken"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Handmatig groeps-ID opgeven"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "De groep bestaat al, kies een andere groepsnaam"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " De groep GID is < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -449,22 +501,22 @@ msgstr ""
 " Weet u zeker dat u dit wilt doen?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Bezig met toevoegen groep: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Bestanden verwijderen?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -473,27 +525,27 @@ msgstr ""
 "Verwijderen van gebruiker %s\n"
 " Voer ook de volgende acties uit\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Persoonlijke map verwijderen: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Verwijder Mailbox :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Bezig met verwijderen gebruiker: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Weet u zeker dat u de groep %s wilt verwijderen?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -502,177 +554,177 @@ msgstr ""
 "%s is een primaire groep voor gebruiker %s\n"
 " Verwijder eerst de gebruiker"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Bezig met verwijderen groep: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Volledige naam:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Aanmeldnaam:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Bevestig wachtwoord:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Aanmeldshell:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Groepsnaam:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Groepen / gebruikers bewerken"
+msgid "Please select at least one group for the user"
+msgstr "Selecteer tenminste één groep voor de gebruiker"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Geef een jaar, maand en dag op \n"
+" waarop de account verloopt "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Vul alle velden in voor wachtwoord-verloop\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "U kunt gebruiker ‘%s’ niet verwijderen uit zijn primaire groep"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Persoonlijke map:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Gebruikersgegevens"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Verlopen van account inschakelen"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Account verloopt op (JJJJ-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Gebruikersaccount op slot zetten"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Account-informatie"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "De gebruiker heeft het wachtwoord voor het laatst veranderd op: "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Verlopen van wachtwoord inschakelen"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dagen voor verandering wordt toegestaan: "
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Dagen voor verandering noodzakelijk is:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dagen voordat veranderwaarschuwing wordt gegeven:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dagen voordat de account wordt gedeactiveerd:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Wachtwoord-informatie"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, 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:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Groepsgegevens"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Selecteer de gebruikers die lid moeten zijn van deze groep:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Gebruikers groeperen"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Selecteer tenminste één groep voor de gebruiker"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Geef een jaar, maand en dag op \n"
-" waarop de account verloopt "
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Vul alle velden in voor wachtwoord-verloop\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "U kunt gebruiker ‘%s’ niet verwijderen uit zijn primaire groep"
+msgid "Edit Groups / Users"
+msgstr "Groepen / gebruikers bewerken"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Sluiten"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright © %s door Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Gebruikersbeheer"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
@@ -682,27 +734,35 @@ msgstr ""
 "Peter Bosch <peter.bosch@hccnet.nl>\n"
 "Hendrik-Jan Heins <hjh@passys.nl>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Naam-veld is leeg, geef een naam op"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "De naam is te lang"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Fout"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "Onbekende fout"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Fout bij aanmaken `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Auteurs: "
diff --git a/po/nn.po b/po/nn.po
index ecc2fa8..2eddb64 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2009-10-18 12:12+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -15,306 +15,358 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Feil ved lesing av «%s»: %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Feil ved oppretting av «%s»: %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Feil ved fjerning av «%s»: %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Feil ved oppretting av e-postkø.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Feil ved oppretting av e-postkø.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Feil ved oppretting av e-postkø.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "Ukjend feil"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Feil ved oppretting av e-postkø.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Feil ved sletting av e-postkø.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Lastar brukarar og grupper … Vent litt"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Brukaradministrering for Mandriva Linux"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr "/_Installer gjestekonto"
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr "/_Avinstaller gjestekonto"
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Handlingar"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Rediger"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Slett"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Oppsett"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Gøym systembrukarar"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Fil"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Oppdater"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Avslutt"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Legg til brukar"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Legg til _gruppe"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Hjelp"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Meld frå om feil"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Om …"
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Søk:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Bruk filter"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Brukarar"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Grupper"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Brukarar og grupper"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Brukarnamn"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Brukar-ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Hovudgruppe"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Fullt namn"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Innloggingsskal"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Heimemappe"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Status"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Gruppenamn"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Gruppe-ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Gruppemedlemmar"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Legg til brukar"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Legg ein brukar til systemet."
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Legg til gruppe"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Legg ei gruppe til systemet."
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Rediger"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Rediger merkt rad."
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Slett"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Slett merkt rad."
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Oppdater lista."
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Låst"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Utgått"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Trykk på ikonet for å endra det"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Lag ny brukar"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Lag heimemappe"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Heimemappe: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Lag ei privat gruppe for brukaren"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Vel gruppe-ID manuelt"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Brukaren finst alt. Vel eit anna brukarnamn."
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Passord er ikkje like"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -323,12 +375,12 @@ msgstr ""
 "Passordet er for enkelt.\n"
 "Eit godt passord på vera på minst 6 teikn."
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Brukar-ID-en er under 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -339,27 +391,27 @@ msgstr ""
 " Er du sikker på at du likevel vil gjera det?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Legg «%s» i «users»-gruppa"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Oppretter ny gruppe: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Legg til brukar: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Dataoverføringsvegvisar"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -368,64 +420,64 @@ msgstr ""
 "Ønskjer du å køyra dataoverføringsvegvisaren, slik at du kan henta inn "
 "Windows-dokumenta og -innstillingane dine til Mandriva Linux?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Vel gruppe"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Legg til gammal gruppe"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Legg til «users»-gruppa"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Lag ny gruppe"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Vel gruppe-ID manuelt"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Gruppa finst alt. Vel eit anna gruppenamn."
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " Gruppe-ID-en er under 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -436,22 +488,22 @@ msgstr ""
 " Er du sikker på at du likevel vil gjera det?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Legg til gruppe: %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Vil du sletta filene?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -460,27 +512,27 @@ msgstr ""
 "Fjernar brukaren «%s»\n"
 " Utfør òg følgjande handlingar\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Slett heimemappe: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Slett e-postboks: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Fjern brukar: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Er du sikker på at du vil sletta gruppa «%s»?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -489,198 +541,205 @@ msgstr ""
 "«%s» er ei hovudgruppe fro brukaren «%s».\n"
 " Fjern frukaren først."
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Fjernar gruppa: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Fullt namn:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Brukarnamn:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Stadfest passord:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Innloggingsskal:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Gruppenamn:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Rediger grupper/brukarar"
+msgid "Please select at least one group for the user"
+msgstr "Du må velja minst éi gruppe for brukaren"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr "Vel år, månad og dag for kontoutløp."
 
-#: ../userdrake:699
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Fyll ut alle felta for passordutløp.\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Du kan ikkje fjerna brukaren «%s» frå hovudgruppa hans/hennar."
+
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Heime:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Brukardata"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Bruk utløpsdato for konto"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Kontoen går ut (ÅÅÅÅ-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Lås brukarkonto"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Kontoinformasjon"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Brukaren bytte seinast passord den: "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Bruk utløpsdato for passord"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dagar før byte er lov:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Dagar før byte er påkravd:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dagar med varsel før endring:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dagar før kontoen vert inaktiv:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Passordinformasjon"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Vel gruppene som brukaren skal vera medlem av:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Gruppedata"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Vel brukaren som skal vera med i gruppa:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Gruppebrukarar"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Du må velja minst éi gruppe for brukaren"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr "Vel år, månad og dag for kontoutløp."
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Fyll ut alle felta for passordutløp.\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Du kan ikkje fjerna brukaren «%s» frå hovudgruppa hans/hennar."
+msgid "Edit Groups / Users"
+msgstr "Rediger grupper/brukarar"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Lukk"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright © %s Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Brukaradministrering"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Karl Ove Hufthammer <karl@huftis.org>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Namnefeltet er tomt. Skriv inn namnet på brukaren."
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Namnet er for langt."
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Feil"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "Ukjend feil"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Feil ved oppretting av «%s»: %s"
diff --git a/po/pa_IN.po b/po/pa_IN.po
index c028441..8f3829d 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\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"
@@ -17,306 +17,358 @@ msgstr ""
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "`%s' ਪੜਨ ਦੌਰਾਨ ਗਲਤੀ: %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "`%s' ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ: %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "`%s' ਹਟਾਉਣ ਦੌਰਾਨ ਗਲਤੀ: %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "ਪੱਤਰ ਸਪੂਲ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ।\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "ਪੱਤਰ ਸਪੂਲ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ।\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "ਪੱਤਰ ਸਪੂਲ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ।\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "ਅਣਜਾਣੀ ਗਲਤੀ"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "ਪੱਤਰ ਸਪੂਲ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ।\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "ਪੱਤਰ ਸਪੂਲ ਹਟਾਉਣ ਦੌਰਾਨ ਗਲਤੀ\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "ਉਪਭੋਗੀ ਤੇ ਗਰੁੱਪ ਲੋਡ ਕੀਤੇ ਜਾਦੇ ਹਨ... ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "ਮੈਂਡਰਿਵ ਲੀਨਕਸ ਉਪਭੋਗੀ ਪ੍ਰਬੰਧਨ ਸੰਦ"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/ਕਾਰਵਾਈ(_A)"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/ਸੋਧ(_E)"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/ਹਟਾਓ(_D)"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/ਚੋਣ(_O)"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/ਸਿਸਟਮ ਉਪਭੋਗੀ ਫਿਲਟਰ(_F)"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/ਫਾਇਲ(_F)"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/ਤਾਜ਼ਾ(_R)"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/ਬਾਹਰ(_Q)"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/ਉਪਭੋਗੀ ਸ਼ਾਮਲ(_A)"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/ਗਰੁੱਪ ਸ਼ਾਮਲ(_G)"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/ਸਹਾਇਤਾ(_H)"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/ਬੱਗ ਰਿਪੋਰਟ(_R)"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/ਬਾਰੇ(_A)..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "ਖੋਜ:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "ਫਿਲਟਰ ਲਾਗੂ ਕਰੋ"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "ਉਪਭੋਗੀ"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "ਸਮੂਹ"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "ਉਪਭੋਗੀ ਅਤੇ ਸਮੂਹ"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "ਉਪਭੋਗੀ ਨਾਂ"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ਉਪਭੋਗੀ ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "ਮੁੱਢਲਾ ਗਰੁੱਪ"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "ਪੂਰਾ ਨਾਂ"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "ਲਾਗਿੰਨ ਸ਼ੈਲ"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "ਘਰ ਡਾਇਰੈਕਟਰੀ"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "ਸਥਿਤੀ"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "ਗਰੁੱਪ ਨਾਂ"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ਗਰੁੱਪ ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "ਗਰੁੱਪ ਮੈਂਬਰ"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "ਉਪਭੋਗੀ ਸ਼ਾਮਲ"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "ਆਪਣੇ ਸਿਸਟਮ ਤੇ ਉਪਭੋਗੀ ਸ਼ਾਮਲ ਕਰੋ"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "ਗਰੁੱਪ ਸ਼ਾਮਲ"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "ਸਿਸਟਮ ਤੇ ਗਰੁੱਪ ਸ਼ਾਮਲ ਕਰੋ"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "ਸੋਧ"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "ਚੁਣੀ ਕਤਾਰ ਵਿੱਚ ਸੋਧ"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "ਹਟਾਓ"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "ਚੁਣੀ ਕਤਾਰ ਹਟਾਓ"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "ਤਾਜ਼ਾ"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "ਸੂਚੀ ਤਾਜ਼ਾ ਕਰੋ"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "ਤਾਲਾਬੰਦ"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "ਮਿਆਦ ਖਤਮ"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "ਆਈਕਾਨ ਨੂੰ ਤਬਦੀਲ ਕਰਨ ਲਈ ਦਬਾਓ"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "ਨਵਾਂ ਉਪਭੋਗੀ ਬਣਾਓ"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "ਘਰ ਡਾਇਰੈਕਟਰੀ ਬਣਾਓ"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "ਘਰ ਡਾਇਰੈਕਟਰੀ: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "ਉਪਭੋਗੀ ਲਈ ਨਿੱਜੀ ਗਰੁੱਪ ਬਣਾਓ"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "ਉਪਭੋਗੀ ਲਈ ID ਖੁਦ ਦਿਓ"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "ਉਪਭੋਗੀ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਵੱਖਰਾ ਨਾਂ ਦਿਓ"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "ਗੁਪਤ-ਕੋਡ ਮੇਲ ਨਹੀ ਖਾ ਰਿਹਾ"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -325,12 +377,12 @@ msgstr ""
 "ਇਹ ਗੁਪਤ-ਕੋਡ ਬਹੁਤ ਸੌਖਾ ਹੈ।\n"
 " ਚੰਗ ਗੁਪਤ-ਕੋਡ > 6 ਅੱਖਰ ਤੋਂ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "ਉਪਭੋਗੀ Uid < 500 ਹੈ"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -341,91 +393,91 @@ msgstr ""
 " ਕਿ ਤੁਸੀ ਇਹ ਕਰਨ ਲਈ ਸਹਿਮਤ ਹੋ?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "%s ਨੂੰ 'users' ਗਰੁੱਪ ਲਈ ਰੱਖਿਆ ਜਾਦਾ ਹੈ"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "ਨਵਾਂ ਗਰੁੱਪ ਬਣਾਇਆ ਜਾਦਾ ਹੈ: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "ਉਪਭੋਗੀ ਸ਼ਾਮਲ : %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "ਰੱਦ ਕਰੋ"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "ਠੀਕ ਹੈ"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "ਗਰੁੱਪ ਚੁਣੋ"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "ਮੌਜੂਦਾ ਗਰੁੱਪ ਵਿੱਚ ਸ਼ਾਮਲ"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "'users' ਗਰੁੱਪ ਵਿੱਚ ਸ਼ਾਮਲ"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "ਸਮੂਹ ਨਾਂ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਤੁਸੀਂ ਕੀ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "ਨਵਾਂ ਗਰੁੱਪ ਬਣਾਓ"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "ਗਰੁੱਪ ID ਖੁਦ ਦਿਓ"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "ਗਰੁੱਪ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਵੱਖਰਾ ਨਾਂ ਚੁਣੋ"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " ਗਰੁੱਪ Gid < 500 ਹੈ"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -436,22 +488,22 @@ msgstr ""
 " ਕੀ ਤੁਸੀਂ ਏਦਾਂ ਕਰਨ ਲਈ ਸਹਿਮਤ ਹੋ?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "ਗਰੁੱਪ ਸ਼ਾਮਲ : %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "ਫਾਇਲਾਂ ਹਟਾਉਣੀਆਂ ਹਨ ਜਾਂ ਨਹੀਂ?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -460,27 +512,27 @@ msgstr ""
 "ਉਪਭੋਗੀ %s ਹਟਾਉਣਾ\n"
 " ਹੇਠ ਦਿੱਤੀਆਂ ਕਾਰਵਾਈਆਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "ਘਰ ਡਾਇਰੈਕਟਰੀ ਹਟਾਓ :%s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "ਪੱਤਰ ਬਕਸਾ ਹਟਾਓ :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "ਉਪਭੋਗੀ ਹਟਾਉਣਾ: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "ਕੀ ਤੁਸੀਂ ਗਰੁੱਪ %s ਨੂੰ ਹਟਾਉਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰਦੇ ਹੋ"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -489,201 +541,209 @@ msgstr ""
 "%s ਉਪਭੋਗੀ %s ਦਾ ਮੁੱਢਲਾ ਗਰੁੱਪ ਹੈ\n"
 " ਪਹਿਲਾਂ ਉਪਭੋਗੀ ਨੂੰ ਹਟਾਓ"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "ਗਰੁੱਪ ਹਟਾਇਆ: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "ਪੂਰਾ ਨਾਂ:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "ਲਾਗਆਨ:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "ਗੁਪਤ-ਕੋਡ:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "ਗੁਪਤ-ਕੋਡ ਪ੍ਰਮਾਣਿਕਤਾ:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "ਲਾਗਿੰਨ ਸ਼ੈਲ:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "ਗਰੁੱਪ ਨਾਂ:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "ਗਰੁੱਪ / ਉਪਭੋਗੀ ਸੋਧ"
+msgid "Please select at least one group for the user"
+msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਪਭੋਗੀ ਲਈ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਗਰੁੱਪ ਚੁਣੋ"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"ਕਿਰਪਾ ਕਰਕੇ ਖਾਤਾ ਮਿਆਦ, ਸਾਲ, ਮਹੀਨਾ ਅਤੇ ਦਿਨ\n"
+" ਦੇ ਅਨੁਸਾਰ ਦਿਓ"
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "ਕਿਰਪਾ ਕਰਕੇ ਗੁਪਤ-ਕੋਡ ਉਮਰ ਵਿੱਚ ਸਭ ਖੇਤਰ ਭਰੋ\n"
 
-#: ../userdrake:699
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "ਤੁਸੀਂ ਉਪਭੋਗੀ '%s' ਨੂੰ ਇਸ ਦੇ ਮੁੱਢਲੇ ਗਰੁੱਪ ਤੋਂ ਨਹੀਂ ਹਟਾ ਸਕਦੇ ਹੋ"
+
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "ਘਰ:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "ਉਪਭੋਗੀ ਡਾਟਾ"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "ਖਾਤਾ ਮਿਆਦ ਚਾਲੂ"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "ਖਾਤਾ ਮਿਆਦ (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "ਉਪਭੋਗੀ ਖਾਤਾ ਤਾਲਾਬੰਦ"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "ਖਾਤਾ ਜਾਣਕਾਰੀ"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "ਉਪਭੋਗੀ ਨੇ ਆਖਰੀ ਵਾਰ ਗੁਪਤ-ਕੋਡ ਬਦਲਿਆ : "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "ਗੁਪਤ-ਕੋਡ ਮਿਆਦ ਯੋਗ"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "ਤਬਦੀਲੀ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਸਵੀਕਾਰ ਦਿਨਾਂ ਦੀ ਗਿਣਤੀ : "
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "ਤਬਦੀਲੀ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਲੋੜੀਦੇ ਦਿਨ :"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "ਤਬਦੀਲੀ ਤੋਂ ਪਹਿਲਾਂ ਚੇਤਾਵਨੀ ਦਿਨ :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "ਖਾਤਾ ਬੰਦ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਦਿਨ :"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "ਗੁਪਤ-ਕੋਡ ਜਾਣਕਾਰੀ"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "ਗਰੁੱਪ ਚੁਣੋ, ਜਿਸ ਦਾ ਉਪਭੋਗੀ ਮੈਂਬਰ ਹੈ :"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "ਗਰੁੱਪ ਡਾਟਾ"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "ਇਸ ਗਰੁੱਪ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਉਪਭੋਗੀ ਚੁਣੋ :"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "ਗਰੁੱਪ ਉਪਭੋਗੀ"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਪਭੋਗੀ ਲਈ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਗਰੁੱਪ ਚੁਣੋ"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"ਕਿਰਪਾ ਕਰਕੇ ਖਾਤਾ ਮਿਆਦ, ਸਾਲ, ਮਹੀਨਾ ਅਤੇ ਦਿਨ\n"
-" ਦੇ ਅਨੁਸਾਰ ਦਿਓ"
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "ਕਿਰਪਾ ਕਰਕੇ ਗੁਪਤ-ਕੋਡ ਉਮਰ ਵਿੱਚ ਸਭ ਖੇਤਰ ਭਰੋ\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "ਤੁਸੀਂ ਉਪਭੋਗੀ '%s' ਨੂੰ ਇਸ ਦੇ ਮੁੱਢਲੇ ਗਰੁੱਪ ਤੋਂ ਨਹੀਂ ਹਟਾ ਸਕਦੇ ਹੋ"
+msgid "Edit Groups / Users"
+msgstr "ਗਰੁੱਪ / ਉਪਭੋਗੀ ਸੋਧ"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "ਬੰਦ ਕਰੋ"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "ਉਪਭੋਗੀ ਪ੍ਰਬੰਧਕ"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "ਮੈਂਡਰਿਵ-ਆਨਲਾਈਨ"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "ਨਾਂ ਖੇਤਰ ਖਾਲੀ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਨਾਂ ਦਿਓ"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "ਨਾਂ ਵਿੱਚ ਛੋਟੇ ਅੰਗਰੇਜ਼ੀ ਅੱਖਰ, ਅੰਕ, `-' ਅਤੇ `_' ਹੀ ਹੋ ਸਕਦੇ ਹਨ"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "ਨਾਂ ਲੰਮਾ ਹੈ"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "ਗਲਤੀ"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "ਅਣਜਾਣੀ ਗਲਤੀ"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "`%s' ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ: %s"
+
 #~ msgid "Authors: "
 #~ msgstr "ਸੰਪਾਦਕ:"
diff --git a/po/pl.po b/po/pl.po
index 80b6413..9c82ca3 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,340 +12,372 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2010-01-11 16:48+0100\n"
 "Last-Translator: Marek Walczak <kubdat@poczta.fm>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Błąd przy czytaniu \"%s\": %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Błąd przy tworzeniu \"%s\": %s"
 
-#: ../USER/USER.xs:203
-#: ../USER/USER.xs:232
-#: ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Błąd przy usuwaniu \"%s\": %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Błąd przy tworzeniu kolejki poczty.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Błąd przy tworzeniu kolejki poczty.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Błąd przy tworzeniu kolejki poczty.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "nieznany błąd"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Błąd przy tworzeniu kolejki poczty.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Błąd przy usuwaniu kolejki poczty.\n"
 
-#: ../userdrake:55
-#: ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Wczytywanie użytkowników i grup... proszę czekać"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Narzędzie do zarządzania użytkownikami dla Mandriva Linuksa"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr "/_Instaluj konto gościa"
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr "/_Usuń konto gościa"
 
-#: ../userdrake:99
-#: ../userdrake:100
-#: ../userdrake:101
-#: ../userdrake:109
-#: ../userdrake:110
-#: ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Czynności"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Edycja"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Usuń"
 
-#: ../userdrake:91
-#: ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Opcje"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Filtruj użytkowników systemowych"
 
-#: ../userdrake:95
-#: ../userdrake:96
-#: ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Plik"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/O_dśwież"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Zakończ"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Dodaj użytkownika"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Dodaj g_rupę"
 
-#: ../userdrake:108
-#: ../userdrake:109
-#: ../userdrake:110
-#: ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Pomoc"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Zgłoś błąd"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_O programie"
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Wyszukaj:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Zastosuj filtr"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: ../userdrake:133
-#: ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Grupy"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Użytkownicy i grupy"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Nazwa użytkownika"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID użytkownika"
 
-#: ../userdrake:154
-#: ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Podstawowa grupa"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Pełna nazwa"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Powłoka logowania"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Katalog domowy"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Stan"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Nazwa grupy"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ID grupy"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Członkowie grupy"
 
 # broken into two lines to avoid too large a button
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr ""
 "Dodaj\n"
 "użytkownika"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Dodaje użytkownika do systemu"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Dodaj grupę"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Dodaje grupę do systemu"
 
-#: ../userdrake:165
-#: ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Edytuj"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Modyfikuje wybrany wiersz"
 
-#: ../userdrake:166
-#: ../userdrake:552
-#: ../userdrake:584
-#: ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Usuń"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Usuwa wybrany wiersz"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Odśwież"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Odświeża listę"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Zablokowane"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Wygasło"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Kliknij na ikonę aby ją zmienić"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Utwórz nowego użytkownika"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Utwórz katalog domowy"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Katalog domowy: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Tworzy prywatną grupę dla użytkownika"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Określ ręcznie ID użytkownika"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Użytkownik już istnieje, wybierz inną nazwę użytkownika"
 
-#: ../userdrake:329
-#: ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Hasła się nie zgadzają"
 
-#: ../userdrake:330
-#: ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -354,12 +386,12 @@ msgstr ""
 "Hasło jest za proste.\n"
 " Dobre hasła powinny posiadać więcej niż 6 znaków"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "ID Użytkownika jest < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -370,96 +402,93 @@ msgstr ""
 " Czy na pewno chcesz to zrobić?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Wrzucanie użytkownika %s do grupy \"users\""
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Tworzenie nowej grupy: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Dodawanie użytkownika: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Druid migracji"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
-msgid "Do you want to run the migration wizard in order to import Windows documents and settings in your Mandriva Linux distribution?"
-msgstr "Czy chcesz uruchomić druida migracji, aby zaimportować z systemu Windows dokumenty i ustawienia do systemu Mandriva Linux?"
+msgid ""
+"Do you want to run the migration wizard in order to import Windows documents "
+"and settings in your Mandriva Linux distribution?"
+msgstr ""
+"Czy chcesz uruchomić druida migracji, aby zaimportować z systemu Windows "
+"dokumenty i ustawienia do systemu Mandriva Linux?"
 
-#: ../userdrake:398
-#: ../userdrake:436
-#: ../userdrake:480
-#: ../userdrake:568
-#: ../userdrake:597
-#: ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ../userdrake:383
-#: ../userdrake:417
-#: ../userdrake:466
-#: ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Wybierz grupę"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Dodaj do istniejącej grupy"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Dodaj do grupy \"users\""
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Utwórz nową grupę"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Określ ręcznie ID grupy"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Grupa już istnieje, wybierz inną nazwę grupy"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " ID grupy jest < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -470,23 +499,22 @@ msgstr ""
 " Czy naprawdę chcesz to zrobić?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Dodawanie grupy: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516
-#: ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Usunąć pliki czy nie?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -495,27 +523,27 @@ msgstr ""
 "Usuwanie użytkownika %s\n"
 " uruchamia także poniższe operacje\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Usuń katalog domowy: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Usuń skrzynkę pocztową :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Usuwanie użytkownika: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Czy na pewno chcesz usunąć grupę %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -524,198 +552,206 @@ msgstr ""
 "%s jest podstawową grupą dla użytkownika %s\n"
 " Usuń najpierw użytkownika"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Usuwanie grupy: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Pełna nazwa:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Użytkownik:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Hasło:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Potwierdź hasło:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Powłoka logowania:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Nazwa grupy:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Edycja grup / użytkowników"
+msgid "Please select at least one group for the user"
+msgstr "Wybierz co najmniej jedną grupę dla użytkownika"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Podaj rok, miesiąc i dzień\n"
+" terminu ważności konta "
+
+#: ../userdrake:914
+#, 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:699
+#: ../userdrake:965
+#, 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:986
 #, c-format
 msgid "Home:"
 msgstr "Katalog domowy:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Dane użytkownika"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Włączone wygasanie haseł"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Konto wygasa    (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Zablokuj konto użytkownika"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Informacje o koncie"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Użytkownik ostatnio zmieniał hasło : "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Włącz wygasanie hasła"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dni przed dozwoloną zmianą :"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Dni przed wymaganą zmianą :"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dni ostrzeżenia przed zmianą :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dni przed wyłączeniem konta :"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Informacje o haśle"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, 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:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Dane grupy"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Wybierz użytkownika dołączanego do grupy :"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Użytkownikcy grupowi"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Wybierz co najmniej jedną grupę dla użytkownika"
-
-#: ../userdrake:856
-#, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Podaj rok, miesiąc i dzień\n"
-" terminu ważności konta "
-
-#: ../userdrake:862
-#, 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:905
+#: ../userdrake:1127
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Nie można usunąć użytkownika \"%s\" z głównej grupy"
+msgid "Edit Groups / Users"
+msgstr "Edycja grup / użytkowników"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Zamknij"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Zarządzanie użytkownikami"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "_: Translator(s) name(s) & email(s)\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Pole nazwy jest puste, podaj inną nazwę"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
-msgid "The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Nazwa musi zawierać tylko małe litery, liczby, \"-\" lub \"_\""
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Nazwa jest za długa"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Błąd"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "nieznany błąd"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Błąd przy tworzeniu \"%s\": %s"
diff --git a/po/pt.po b/po/pt.po
index ec00b32..748c079 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2007-09-24 19:45+0100\n"
 "Last-Translator: Zé <mmodem00@gmail.com>\n"
 "Language-Team: Português <pt@li.org>\n"
@@ -28,310 +28,362 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Erro ao ler `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Erro ao criar `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Erro ao remover `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Erro ao criar a fila de correio.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Erro ao criar a fila de correio.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Erro ao criar a fila de correio.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "erro desconhecido"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Erro ao criar a fila de correio.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Erro ao apagar a fila de correio.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "A carregar Utilizadores e Grupos... Por favor aguarde"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Ferramenta de Gestão de Utilizadores Mandriva Linux"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Acções"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Apagar"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Opções"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Filtrar utilizadores do sistema"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Ficheiro"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Refrescar"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Sair"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>S"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Adicionar Utilizador"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Adicionar _Grupo"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Comunicar Erro"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Acerca..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Procurar:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Aplicar filtro"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Utilizadores"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Grupos"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Utilizadores e grupos"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Nome de Utilizador"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID de Utilizador"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Grupo Primário"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Nome Completo"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Comando de Autenticação"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Directório Pessoal"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Estado"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Nome de Grupo"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ID de Grupo"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Membros do Grupo"
 
 # broken into two lines to avoid too large a button
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Adicionar Utilizador"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Adiciona um utilizador ao sistema"
 
 # broken into two lines to avoid too large a button
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Adicionar Grupo"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Adiciona um grupo ao sistema"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Editar"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Edita a linha seleccionada"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Apagar"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Apaga a linha seleccionada"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Refresca a lista"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Trancado"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Expirado"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Clique no ícone para o alterar"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Criar Novo Utilizador"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Criar Directório Pessoal"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Directório Pessoal: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Cria um grupo privado para o utilizador"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Indicar manualmente ID de utilizador"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr ""
 "Este utilizador já existe no sistema, por favor escolha outro Nome de "
 "Utilizador"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Senhas Diferentes"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -340,12 +392,12 @@ msgstr ""
 "Esta senha é demasiado simples. \n"
 " As boas senhas devem ter mais de 6 caracteres"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "O Uid de utilizador é < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -356,27 +408,27 @@ msgstr ""
 "Tem certeza que o deseja fazer?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "A colocar %s no grupo 'users'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "A criar novo grupo: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "A adicionar utilizador: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Assistente para migração"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -385,64 +437,64 @@ msgstr ""
 "Deseja correr o assistente de migração para importar documentos e definições "
 "Windows para a sua distribuição Mandriva Linux?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Escolher grupo"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Adicionar ao grupo existente"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Adicionar ao grupo 'users'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Criar Novo Grupo"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Indicar ID de grupo manualmente"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "O grupo já existe, por favor escolha outro Nome de Grupo"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "O Gid de Grupo é < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -453,22 +505,22 @@ msgstr ""
 "Tem certeza que o deseja fazer?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "A adicionar grupo: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Apagar ficheiros ou não?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -477,27 +529,27 @@ msgstr ""
 "A apagar utilizador %s\n"
 " Executar também as seguintes acções\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Apagar Directório Pessoal: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Apagar Caixa de Correio: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "A remover utilizador: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Deseja realmente apagar o grupo %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -506,198 +558,206 @@ msgstr ""
 "%s é um grupo primário para o utilizador %s\n"
 " Remova o utilizador primeiro"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "A remover grupo: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Nome Completo:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Utilizador:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Confirmar Senha:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Comando de Autenticação:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Nome do Grupo:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Editar Grupos/Utilizadores"
+msgid "Please select at least one group for the user"
+msgstr "Por favor escolha pelo menos um grupo para o utilizador"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Por favor indique o Ano, Mês e Dia\n"
+"para a Expiração da Conta "
+
+#: ../userdrake:914
+#, 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:965
+#, 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:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Pasta Pessoal:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Dados do Utilizador"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Activar expiração da conta"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "A conta expira em (AAAA-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Trancar Conta de Utilizador"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Informações da Conta"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "O utilizador mudou a senha pela última vez em: "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Activar Expiração da Senha"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dias antes da mudança permitida:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Dias antes da mudança pedida:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dias de aviso antes da mudança:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dias antes da desactivação da conta:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Informação da Senha"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Escolha os grupos de que o utilizador irá ser membro:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Dados do Grupo"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Escolha os utilizadores a juntar a este grupo:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Utilizadores do Grupo"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Por favor escolha pelo menos um grupo para o utilizador"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Por favor indique o Ano, Mês e Dia\n"
-"para a Expiração da Conta "
-
-#: ../userdrake:862
-#, 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:905
-#, 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"
+msgid "Edit Groups / Users"
+msgstr "Editar Grupos/Utilizadores"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Fechar"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Direitos de Autor (C) %s Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Gestão de Utilizadores"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "José Melo <mmodem00@gmail.com>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "O campo do nome está vazio, por favor indique um nome"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Nome demasiado comprido"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Erro"
+
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "erro desconhecido"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Erro ao criar `%s': %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2f1267e..1025568 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2009-10-19 01:46-0200\n"
 "Last-Translator: Sergio Rafael Lemke <sergio@mandriva.com.br>\n"
 "Language-Team: Brazilian Portuguese <cooker-i18n@mandrivalinux.org>\n"
@@ -29,308 +29,360 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Erro ao ler `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Erro ao criar `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Erro ao remover `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Erro ao criar mail spool.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Erro ao criar mail spool.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Erro ao criar mail spool.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "erro desconhecido"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Erro ao criar mail spool.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Erro ao remover o mail spool.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Carregando Usuários e Grupos... Aguarde por favor"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Ferramenta Mandriva Linux de Gerenciamento de Usuários"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr "/_Instalar conta para convidado"
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr "/_Remover conta para convidado"
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Ações"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Apagar"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Opções"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Filtrar usuários do sistema"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Arquivo"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Atualizar"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Encerrar"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Adicionar usuário"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/_Adicionar grupo"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Relatório bugs"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Sobre..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Procurar:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Aplicar filtro"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Usuários"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Grupos"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Usuários e Grupos"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Nome do usuário"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID do Usuário"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Grupo primário"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Nome completo"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Login"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Diretório do usuário"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Estado"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Nome do grupo"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ID do Grupo"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Membros do Grupo"
 
 # broken into two lines to avoid too large a button
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Adicionar Usuário"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Adiciona um usuário ao sistema"
 
 # broken into two lines to avoid too large a button
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Adicionar Grupo"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Adicionar um grupo ao sistema"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Editar"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Editar linha selecionada"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Apagar"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Apagar linha selecionada"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Atualizar a lista de usuários"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Expirada"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Clique no ícone para mudá-lo"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Criar novo usuário"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Criar diretório principal do usuário"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Diretório principal"
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Criar grupo privado para este usuário"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Informe manualmente o ID deste usuário"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Esse usuário já existe. Por favor escolha outro nome."
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Senha diferente"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -339,12 +391,12 @@ msgstr ""
 "Esta senha é muito simples. \n"
 "Senhas seguras devem ter mais de 6 caracteres."
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "UID do usuário < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -355,27 +407,27 @@ msgstr ""
 "Você tem certeza que quer isso?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Adicionando %s ao grupo 'users'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Criando novo grupo: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Adicionando usuário: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Assistente de migração"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -384,64 +436,64 @@ msgstr ""
 "Você deseja executar o assistente de migração para importar documentos e "
 "configurações do Windows para a sua distribuição Mandriva Linux?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID:"
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Escolha um grupo"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Adicione a um grupo existente"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Adicione usuário ao grupo"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Criar Novo Grupo"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Informe manualmente o ID do grupo"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Este grupo já existe. Por favor, escolha outro nome"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "Identificação do Grupo é < de 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -452,22 +504,22 @@ msgstr ""
 "Você tem certeza que quer isso?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Adicionando grupo: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Apagar arquivos ou não"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -476,27 +528,27 @@ msgstr ""
 "Apagando usuário %s\n"
 "Fazendo também as seguintes ações\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Apagar Diretório principal do usuário: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Apagar Caixa de Correio: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Removendo usuário(s): %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Você deseja realmente excluir o grupo %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -505,177 +557,177 @@ msgstr ""
 "%s é o grupo principal do usuário %s\n"
 "Primeiro apague o usuário"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Removendo grupo(s): %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Nome completo:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Confirme a senha:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Login:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Nome do grupo:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Editar Grupos / Usuários"
+msgid "Please select at least one group for the user"
+msgstr "Por favor, selecione ao menos um grupo para este usuário"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Favor informe Ano, Mês e Dia\n"
+"do vencimento desta conta"
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Favor preencher todos os campos da senha\n"
+
+#: ../userdrake:965
+#, 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:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Início:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Dados do usuário"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Permite vencimento da conta"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Conta expira em (AAA-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Bloquear a conta do usuário"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Informações da conta"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Última mudança de senha em: "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Permite vencimento da senha"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dias antes do vencimento:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Dias depois do vencimento:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dias para avisar antes do vencimento:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dias antes de conta inativa:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Informações de Senha"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, 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:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Lista de grupos"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Selecione os usuários para juntar-se a este grupo:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Grupo de Usuários"
 
-#: ../userdrake:847
-#, 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:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Favor informe Ano, Mês e Dia\n"
-"do vencimento desta conta"
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Favor preencher todos os campos da senha\n"
-
-#: ../userdrake:905
-#, 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"
+msgid "Edit Groups / Users"
+msgstr "Editar Grupos / Usuários"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Fechar"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s por Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Gerenciamento de Usuários"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
@@ -683,26 +735,34 @@ msgstr ""
 "Arthur Renato Mello <renato@conectiva.com.br>\n"
 "Felipe Arruda <felipemiguel@gmail.com>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "O campo do nome está vazio! Coloque um nome"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Nome muito grande"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Erro"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "erro desconhecido"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Erro ao criar `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Autores:"
diff --git a/po/ro.po b/po/ro.po
index a682160..16d6ca5 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-ro\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2009-10-18 15:48+0200\n"
 "Last-Translator: Florin Cătălin RUSSEN <cfrussen@yahoo.co.uk>\n"
 "Language-Team: Romanian <cooker-i18n@mandrivalinux.org>\n"
@@ -54,312 +54,364 @@ msgstr ""
 "2:1))\n"
 "X-Generator: Lokalize 1.0\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Eroare la citirea `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Eroare la crearea `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Eroare la înlăturarea `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Eroare la crearea cozii de mesaje.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Eroare la crearea cozii de mesaje.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Eroare la crearea cozii de mesaje.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "eroare necunoscută"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Eroare la crearea cozii de mesaje.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Eroare la ștergerea cozii de mesaje.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Se încarcă utilizatorii și grupurile... Aașteptați vă rog"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Unealta de administrare a utilizatorilor Mandriva Linux"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr "/_Instalează cont invitat"
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr "/_Dezinstalează cont invitat"
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Acțiuni"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Editează"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Șterge"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Opțiuni"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Filtrare utilizatori sistem"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Fișier"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/Împrospăta_re"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Terminare"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Adaugă utilizator"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Adaugă _grup"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Ajutor"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Raportare eroare"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Despre..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Căutare: "
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Aplică filtru"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Utilizatori"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Grupuri"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Utilizatori și grupuri"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Nume utilizator"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID utilizator"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Grup principal"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Nume complet"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Interpretor de comenzi"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Directorul personal al utilizatorului"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Stare"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Nume grup"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ID Grup"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Membrii din grup"
 
 # broken into two lines to avoid too large a button
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr ""
 "Adaugă\n"
 "utilizator"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Adaugă un utilizator la sistem"
 
 # broken into two lines to avoid too large a button
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr ""
 "Adaugă\n"
 "grup"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Adaugă un grup la sistem"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Editează"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Editează rîndul selectat"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Șterge"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Șterge rîndul selectat"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Împrospătare"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Împrospătare listă utilizatori"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Blocat"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Expirat"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Faceți clic pe pictogramă pentru a-l schimba"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Creează un utilizator nou"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Creează directorul personal"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Directorul personal al utilizatorului: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Creează un grup privat pentru utilizator"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Specificare manuală de ID utilizator"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Acest utilizator exista deja, folosiți un alt nume de utilizator"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Nepotrivire de parolă"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -368,12 +420,12 @@ msgstr ""
 "Această parolă este prea simplă. \n"
 " Parolele  bune ar trebui să fie > de 6 caractere"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Identificatorul utilizatorului este < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -385,27 +437,27 @@ msgstr ""
 "Chiar doriți acest lucru?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Se adaugă %s în grupul „users”"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Se creează un nou grup: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Se adaugă utilizatorul: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Asistent de transfer"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -414,64 +466,64 @@ msgstr ""
 "Doriți să rulați asistentul de transfer pentru a prelua documente și "
 "preferințe din Windows în distribuția Mandriva Linux?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Anulează"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Alegeți grupul"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Adaugă la un grup existent"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Adaugă la grupul „users”"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Creează un grup nou"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Specificare manuală de ID grup"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, 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:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "Identificatorul grupului este < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -482,22 +534,22 @@ msgstr ""
 "Chiar doriți acest lucru?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Se adaugă grupul: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Ștergeți sau nu fișierele?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -506,27 +558,27 @@ msgstr ""
 "Se șterge utilizatorul %s\n"
 " Se mai efectuează și următoarele acțiuni\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Ștergeți directorul personal: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Ștergere căsuță poștală: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Se șterge utilizatorul: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Doriți într-adevăr să ștergeți grupul %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -535,177 +587,177 @@ msgstr ""
 "%s este grup principal pentru utilizatorul %s\n"
 " Ștergeți mai întîi utilizatorul"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Se înlătură grupul: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Nume complet: "
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Autentificare: "
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Parolă: "
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Confirmare parolă: "
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Interpretor de comenzi: "
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Nume grup: "
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Editare grupuri / utilizatori"
+msgid "Please select at least one group for the user"
+msgstr "Selectați cel putin un grup pentru utilizator"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Specificați anul, luna și ziua\n"
+"de expirare a contului "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Completați toate cîmpurile de la expirarea parolei\n"
+
+#: ../userdrake:965
+#, 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:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Acasă: "
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Date utilizatori"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Activare expirare cont"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Contul expiră (YYYY-MM-DD): "
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Blocare cont utilizator"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Informații despre cont"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Utilizatorul a modificat parola ultima dată în: "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Activare expirare parolă"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Zile înainte de permiterea modificării: "
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Zile înainte de cererea modificării: "
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Zile de avertizare inaintea termenului modificării: "
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Zile înaintea dezactivării contului: "
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Informații despre parolă"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, 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:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Date despre grupuri"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Selectați utilizatorii ce vor aparține acestui grup: "
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Grupuri de utilizatori"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Selectați cel putin un grup pentru utilizator"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Specificați anul, luna și ziua\n"
-"de expirare a contului "
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Completați toate cîmpurile de la expirarea parolei\n"
-
-#: ../userdrake:905
-#, 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"
+msgid "Edit Groups / Users"
+msgstr "Editare grupuri / utilizatori"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Închide"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Drepturi de autor (C) %s Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Gestionare utilizatori"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
@@ -716,23 +768,31 @@ msgstr ""
 "Cristian Ionuț PÎRÎU <piriu.cristian@rdslink.ro>, 2008\n"
 "Florin Cătălin RUSSEN <cfrussen@yahoo.co.uk>, 2009\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Cîmpul „Nume” nu poate fi gol"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Numele este prea lung"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Eroare"
+
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "eroare necunoscută"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Eroare la crearea `%s': %s"
diff --git a/po/ru.po b/po/ru.po
index bf49db0..347acc8 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2009-10-18 11:15+0500\n"
 "Last-Translator: akdengi <kazancas@mandriva.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -20,314 +20,367 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n!=1);\n\n"
+"Plural-Forms:  nplurals=2; plural=(n!=1);\n"
+"\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Ошибка чтения `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Ошибка создания `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Ошибка удаления `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Ошибка создания почтового спула.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Ошибка создания почтового спула.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Ошибка создания почтового спула.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "неизвестная ошибка"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Ошибка создания почтового спула.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Ошибка удаления почтового спула.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Загружаются пользователи и группы... Подождите, пожалуйста"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Утилита для управления пользователями Mandriva Linux"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr "/_Установка гостевого доступа"
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr "/_Удаление гостевого доступа"
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Действия"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Редактировать"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Удалить"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Опции"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Отфильтровать системных пользователей"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Файл"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Обновить"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Выход"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/Добавить _пользователя"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Добавить _группу"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Справка"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Сообщить об ошибке"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_О программе..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Поиск:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Применить фильтр"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Пользователи"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Группы"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Пользователи и группы"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Имя пользователя"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID пользователя"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Главная группа"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Полное имя"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Оболочка входа"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Домашний каталог"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Статус"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Имя группы"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ID группы"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Члены группы"
 
 # broken into two lines to avoid too large a button
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr ""
 "Добавить\n"
 "пользователя"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Добавить пользователя в систему"
 
 # broken into two lines to avoid too large a button
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr ""
 "Добавить\n"
 "группу"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Добавить группу в систему"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Редактировать"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Редактировать выбранную строку"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Удалить"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Удалить выбранную строку"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Обновить"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Обновить список"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Заблокирован"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Срок действия истёк"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Щёлкните по значку, чтобы сменить его"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Создать нового пользователя"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Создать домашний каталог"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Домашний каталог:"
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Создать личную группу для пользователя"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Указать ID пользователя вручную"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Пользователь уже существует, выберите другое Имя пользователя"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Пароли не совпадают"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -336,12 +389,12 @@ msgstr ""
 "Этот пароль слишком прост. \n"
 "Хорошие пароли должны быть > 6 символов"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "UID пользователя < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -352,27 +405,27 @@ msgstr ""
 "Вы уверены, что хотите сделать это?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "%s добавляется в группу 'users'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Создается новая группа: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Добавляется пользователь: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Мастер миграции"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -381,64 +434,64 @@ msgstr ""
 "Запустить мастер миграции, чтобы импортировать документы и настройки Windows "
 "в данный дистрибутив Mandriva Linux?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Отмена"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Ок"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Выбрать группу"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Добавить в существующую группу"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Добавить в группу 'users'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Группа с таким именем уже существует. Что вы хотите сделать?"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Создать новую группу"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Указать ID группы вручную"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Группа уже существует, выберите другое Имя группы"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "GID группы < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -449,22 +502,22 @@ msgstr ""
 "Вы уверены, что хотите сделать это?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Добавляется группа: %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Удалить файлы или нет?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -473,27 +526,27 @@ msgstr ""
 "Удаляется пользователь %s\n"
 " Также выполняются следующие действия\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Удалить домашний каталог: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Удалить почтовый ящик :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Удаляется пользователь: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Удалить группу %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -502,200 +555,208 @@ msgstr ""
 "%s является главной группой для пользователя %s\n"
 "Сначала удалите пользователя"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Удаляется группа: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Полное имя:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Логин:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Подтверждение пароля:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Оболочка входа:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Имя группы:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Редактировать Группы / Пользователей"
+msgid "Please select at least one group for the user"
+msgstr "Пожалуйста, выберите для пользователя по крайней мере одну группу"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Укажите год, месяц и день\n"
+"окончания срока действия учётной записи"
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Заполните все поля для возраста пароля\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Нельзя удалить пользователя '%s' из его главной группы"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Домашний каталог:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Данные пользователя"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Включить срок действия учётной записи"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Срок действия учётной записи истекает (ГГГГ-ММ-ДД):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Заблокировать учётную запись пользователя"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Информация об учётной записи"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Последний раз пользователь сменил пароль:"
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Включить срок действия пароля"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Через сколько дней разрешить изменение:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Через сколько дней потребовать изменение:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "За сколько дней предупреждать об изменении:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Количество дней до отключения учётной записи:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Информация о пароле"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Выберите группы, членом которых будет пользователь:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Данные группы"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Выберите пользователей для присоединения к этой группе:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Группы пользователей"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Пожалуйста, выберите для пользователя по крайней мере одну группу"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Укажите год, месяц и день\n"
-"окончания срока действия учётной записи"
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Заполните все поля для возраста пароля\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Нельзя удалить пользователя '%s' из его главной группы"
+msgid "Edit Groups / Users"
+msgstr "Редактировать Группы / Пользователей"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Закрыть"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Управление пользователями"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Pavel Maryanov <acid_jack@ukr.net>, 2002, 2003, 2005, 2006, 2008.\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Поле имени не заполнено. Укажите имя."
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
-msgid "The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 "Имя должно содержать только латинские символы нижнего регистра, цифры, `-' и "
 "`_'"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Имя слишком длинное"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Ошибка"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "неизвестная ошибка"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Ошибка создания `%s': %s"
diff --git a/po/sc.po b/po/sc.po
index 77864c9..7f46276 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2005-01-29 12:56+0100\n"
 "Last-Translator: Antoni Pistis <antonio.pistis@virgilio.it>\n"
 "Language-Team: Sardu\n"
@@ -18,306 +18,358 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Faddina ligendi `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Faddina creendi `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Faddina srexinendi `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Faddina creendi coa de posta.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Faddina creendi coa de posta.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Faddina creendi coa de posta.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "faddina disconnota"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Faddina creendi coa de posta.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Faddina burrendi coa de posta.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Càrrigu Umperadoris e Grupus... Po praxeri, abeta"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Aina de maniju umperadoris Mandriva Linux"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/At_zionis"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Muda"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Burra"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/Sc_eras"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Cilira is umperadoris de su sistema"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_File"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/A_rrecasça"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Bessi"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Açungi umperadori"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Açungi _Grupu"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/A_judu"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/A_rrelata Farta"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/A_pitzus de..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Circa:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Àpriga ciliru"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Umperadoris"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Grupus"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Umperadoris e Grupus"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Nòmini umperadori"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID umperadori"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Grupu Primàriu"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Nòmini prenu"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Shell de login"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Home Directory"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Stadu"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Nòmini Grupu"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "IP Grupu"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Membrus de su Grupu"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Açungi Umperadori"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Açungi unu umperadori a su sistema"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Açungi Grupu"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Açungi unu grupu a su sistema"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Muda"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Muda s'arraya sçoberada"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Burra"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Burra s'arraya sçoberada"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Arrecasça"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Arrecasça sa lista"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Arrocu"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Scadèssiu"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Craca me in sa màgini po da cambiai"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Crea Umperadori Nou"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Crea Home Directory"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Home Directory: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Crea unu grupu personali po s'umperadori"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Indita su ID umperadori a manu"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "S'umperadori esistit jai, sçobera un'atru Nòmini Umperadori"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Disacòrdiu de password"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -326,12 +378,12 @@ msgstr ""
 "Custa password est tropu simpli. \n"
 " Is passwords bonas iant a bolli > 6 caràteris"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Sa Uid umperadori est < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -342,91 +394,91 @@ msgstr ""
 " Ses siguru ki du bolis fàiri?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Ponju %s in su grupu 'umperadoris'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Creu su grupu nou: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Açungu umperadori: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Annudda"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Sçobera grupu"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Açungi a grupu"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Açungi a su grupu 'umperadoris'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Crea Grupu Nou"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Indita ID Grupu a manu"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, 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:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "Su Gid de su Grupu est < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -437,22 +489,22 @@ msgstr ""
 " Ses siguru de du bolis fàiri?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Açungu Grupu: %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Burrai o no is file?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -461,27 +513,27 @@ msgstr ""
 "Burru umperadori %s\n"
 " Fatzu puru cantu sighit\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Burra sa Home Directory: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Burra sa Mailbox :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Srexinendi umperadori: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Diaderus bolis burrai su grupu %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -490,202 +542,210 @@ msgstr ""
 "%s est unu grupu primàriu po s'umperadori %s\n"
 " Burra s'umperadori a innantis"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Srèxinu grupu: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Nòmini prenu:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Password:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Cunfirma sa Password:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell de login:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Nòmini Grupu:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Muda Grupus / Umperadoris"
+msgid "Please select at least one group for the user"
+msgstr "Sçobera a su mancu unu grupu po s'umperadori"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Po praxeri, indita Annu, Mesi e Dì \n"
+" po sa Scadèssida de s'Account "
+
+#: ../userdrake:914
+#, 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:965
+#, 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:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Home:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Dadus Umperadori"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Abiva sa scadèssida de s'account"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "S'account scadessit (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Arroca s'account umperadori"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Account Info"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "S'umperadori at mudau a ùrtimu sa password :"
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Abiva sa scadèssida de sa password"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dìs antis de podi mudai:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Dìs antis de depi mudai :"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dìs de avertimentu antis de sa muda :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dìs antis de disabivai s'account :"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Password Info"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, 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:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Dadus Grupu"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Sçobera is umperadoris de uniri a custu grupu :"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Umperadoris de su Grupu"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Sçobera a su mancu unu grupu po s'umperadori"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Po praxeri, indita Annu, Mesi e Dì \n"
-" po sa Scadèssida de s'Account "
-
-#: ../userdrake:862
-#, 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:905
-#, 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"
+msgid "Edit Groups / Users"
+msgstr "Muda Grupus / Umperadoris"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Serra"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Maniju Umperadoris"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Antoni Pistis <antonio.pistis@virgilio.it>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, 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:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Su nòmini est tropu longu"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Faddina"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "faddina disconnota"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Faddina creendi `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Autoris: "
diff --git a/po/sk.po b/po/sk.po
index 74fd44f..334537b 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-sk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2004-09-13 10:08+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <sk@li.org>\n"
@@ -16,306 +16,358 @@ msgstr ""
 "X-Generator: KBabel 1.9\n"
 "Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Chyba v čítaní `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Chyba vo vytváraní `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Chyba v odstraOovaní oužívateľa:  `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Chyba vo vytváraní fronty e-mailov.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Chyba vo vytváraní fronty e-mailov.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Chyba vo vytváraní fronty e-mailov.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "neznáma chyba"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Chyba vo vytváraní fronty e-mailov.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Chyba pri vymazávaní fronty e-mailov.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Načítavajú sa používatelia a skupiny... Čakajte prosím"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux nástroj pre správu používateľov"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Akcie"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Upraviť"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Vymazať"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Nastavenia"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Filtrovať systémových používateľov"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Súbor"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Obnoviť"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Koniec"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Pridať používateľa"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Pridať_skupinu"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Pomoc"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Oznámiť chybu"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_O ..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Hľadať:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Aplikovať filter"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Používatelia"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Skupiny"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Používatelia a skupiny"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Používateľské meno"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID používateľa"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Primárna skupina"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Celé meno"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Prihlasovací shell"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Domovský adresár"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Stav"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Meno skupiny"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ID skupiny"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Členovia skupiny"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Pridať používateľa"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Pridať používateľa do systému"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Pridať skupinu"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Pridať skupinu do systému"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Upraviť"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Zmeniť označený riadok"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Zmazať"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Vymazať označený riadok"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Obnoviť"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Obnoviť zoznam"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Zablokované"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Expirácia"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Kliknite na ikonu pre zmenu"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Vytvoriť nového používateľa"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Vytvoriť domovský adresár"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Domovský adresár:"
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Vytvorenie privátnej skupiny pre používateľa"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Špecifikovať ID používateľa"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Používateľ už existuje, vyberte si iné používateľské meno"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Heslá nie sú zhodné"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -324,12 +376,12 @@ msgstr ""
 "Toto heslo je príliš jednoduché. \n"
 " Vhodné heslo by malo mať aspoň 6 znakov"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "ID používateľa je < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -340,91 +392,91 @@ msgstr ""
 " Naozaj si to želáte?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Priradenie %s do skupiny 'users'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Vytvoriť novú skupinu: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Pridávanie používateľa: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID:"
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Výber skupiny"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Pridať do existujúcej skupiny"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Pridať do skupiny 'users'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Vytvoriť novú skupinu"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Špecifikovať GID skupiny"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Skupina už existuje, zvoľte si prosím iné meno skupiny"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "Skupinové gid je < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -435,22 +487,22 @@ msgstr ""
 " Ste si istí že to chcete?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Pridávanie skupiny: %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID:"
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Vymazať súbory?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -459,27 +511,27 @@ msgstr ""
 "Vymazenie používateľa %s\n"
 " Vykonajú sa aj nasledovné akcie\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Vymazať domovský adresár: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Vymazať mailbox :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Odstránenie používateľa: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Naozaj chcete vymazať skupinu %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -488,201 +540,209 @@ msgstr ""
 "%s je primárna skupina pre používateľa %s\n"
 " Najprv odstráňte používateľa"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Odstránenie skupiny: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Celé meno:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Používateľské meno:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Potvrdiť heslo:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Prihlasovací shell:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Meno skupiny:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Upraviť Skupiny / Používateľov"
+msgid "Please select at least one group for the user"
+msgstr "Vyberte prosím aspoň jednu skupinu pre používateľa"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Vyšpecifikujte prosím rok, mesiac a deň\n"
+" kedy má byť konto zneplatnené"
+
+#: ../userdrake:914
+#, 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:965
+#, 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:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Domovský adresár:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Používateľské údaje"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Povoliť vypršanie platnosti účtov"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Vypršanie platnosti účtu (ROK-MES-DEN):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Zablokovať používateľský účet"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Informácie o účte"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Používateľ si naposledy zmenil heslo:"
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Povoliť expiráciu hesiel"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dní pre povolenou zmenou hesla :"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Dni pred vyžadovanou zmenou :"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Koľko dní varovať pred zmenou :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dní pred deaktivovaním konta :"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Informácie o hesle"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, 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:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Údaje skupiny"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Vybrať používateľov pre zaradenie do tejto skupiny :"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Skupina používateľov"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Vyberte prosím aspoň jednu skupinu pre používateľa"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Vyšpecifikujte prosím rok, mesiac a deň\n"
-" kedy má byť konto zneplatnené"
-
-#: ../userdrake:862
-#, 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:905
-#, 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"
+msgid "Edit Groups / Users"
+msgstr "Upraviť Skupiny / Používateľov"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Zatvoriť"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Manažovanie používateľov"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Tibor Pittich <Tibor.Pittich@mandriva.org>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Položka s menom je prázdna, zadajte prosím meno"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Meno je príliš dlhé"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Chyba"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "neznáma chyba"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Chyba vo vytváraní `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Autori:"
diff --git a/po/sl.po b/po/sl.po
index 75e3816..74a49c3 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2009-10-18 14:24+0200\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
@@ -24,306 +24,358 @@ msgstr ""
 "Plural-Forms:  nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
 "n%100==4 ? 2 : 3);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Napaka pri branju »%s«: %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Napaka pri ustvarjanju `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Napaka pri odstranjevanju `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Napaka pri ustvarjanju poštnega navitka (mail spool).\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Napaka pri ustvarjanju poštnega navitka (mail spool).\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Napaka pri ustvarjanju poštnega navitka (mail spool).\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "neznana napaka"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Napaka pri ustvarjanju poštnega navitka (mail spool).\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Napaka pri odstranjevanju poštnega navitka (mail spool).\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Nalaganje uporabnikov in skupin... Prosim počakajte"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux orodje za upravljanje z uporabniki"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr "/_Namesti račun za goste"
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr "/_Odstrani račun za goste"
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Dejanja"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Uredi"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Zbriši"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Možnosti"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Filtriraj sistemske uporabnike"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Osveži"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Končaj"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Dodaj uporabnika"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Dodaj _Skupino"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Poročaj o hrošču"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_O..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Iskanje:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Uporabi filter"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Uporabniki"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Skupine"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Uporabniki in skupine"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Uporabniško ime"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID uporabnika"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Primarna skupina"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Polno ime"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Prijavna lupina"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Domača mapa"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Stanje"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Ime skupine"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ID skupine"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Člani skupine"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Dodaj uporabnika"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Dodaj uporabnika v sistem"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Dodaj skupino"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Dodaj skupino v sistem"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Uredi"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Uredi izbrano vrstico"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Zbriši"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Zbriši izbrano vrstico"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Osveži"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Osveži spisek"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Zaklenjeno"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Potečeno"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Kliknite ikono, če jo želite spremeniti."
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Ustvari novega uporabnika"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Ustvari domačo mapo"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Domača mapa: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Ustvari zasebno skupino za uporabnika"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Ročno določi ID uporabnika:"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Uporabniško ime že obstaja, prosim izberite drugo uporabniško ime"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Neujemanje gesla"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -332,12 +384,12 @@ msgstr ""
 "Geslo je preenostavno. \n"
 " Dobro geslo je dolgo vsaj šest znakov"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Uporabnikov Uid je < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -348,27 +400,27 @@ msgstr ""
 "Ali ste prepričani, da želite narediti prav to?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Vstavljam %s v 'uporabniško' skupino"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Ustvarjanje nove skupine: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Dodajanje uporabnika: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Čarovnik za selitev"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -377,64 +429,64 @@ msgstr ""
 "Ali želite zagnati čarovnika za selitev, ki vam pomaga uvoziti dokumente in "
 "nastavitve iz Windows v Mandriva Linux?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Potrdi"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Izberi skupino"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Dodaj v obstoječo skupino"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Dodaj v uporabniško skupino"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Skupina s tem imenom že obstaja. Kaj bi želeli narediti?"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Ustvari novo skupino"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Ročno določi ID skupine"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Skupina že obstaja, prosim izberite drugo ime skupine"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "Gid skupine je < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -445,22 +497,22 @@ msgstr ""
 "Ali ste prepričani, da želite narediti prav to?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Dodajanje skupine: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Zbrišem datoteke ali ne?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -469,27 +521,27 @@ msgstr ""
 "Brisanje uporabnika %s\n"
 " Prav tako izvrši naslednja dejanja\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Zbriši domačo mapo: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Zbriši poštni nabiralnik :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Odstranjevanje uporabnika: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Ali resnično želite izbrisati skupino %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -498,199 +550,206 @@ msgstr ""
 "%s je primarna skupina za uporabnika %s\n"
 " Najprej odstranite uporabnika"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Odstranjevanje skupine: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Polno ime:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Uporabniško ime:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Geslo:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Potrdi geslo:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Prijavna lupina:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Ime skupine:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Uredi Skupine / Uporabnike"
+msgid "Please select at least one group for the user"
+msgstr "Prosim izberite vsaj eno skupino za uporabnika"
 
-#: ../userdrake:699
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Prosim določite leto, mesec in dan,\n"
+"ko uporabniški račun poteče "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Prosim izpolnite vsa polja o staranju gesla\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Uporabnika ni mogoče odstraniti '%s' iz njegove primarne skupine"
+
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Dom:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Podatki o uporabniku"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Omogoči, da račun poteče"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Uporabniški račun poteče (YYYY-MM-DD oz. leto-mesec-dan):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Zakleni uporabnikov račun"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Podatki o uporabniškem računu"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Uporabnik je nazadnje spremenil geslo: "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Omogoči, da geslo poteče"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Število dnevov preden je dovoljena sprememba:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Število dnevov pred zahtevano spremembo:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Število dnevov opozorila pred spremembo:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Število dnevov pred neaktivnostjo računa:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Podatki o geslu"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Izberite skupine katerih član bo uporabnik:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Podatki o skupini"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Izberite uporabnike za pridružitev tej skupini"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Skupinski uporabniki"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Prosim izberite vsaj eno skupino za uporabnika"
-
-#: ../userdrake:856
-#, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Prosim določite leto, mesec in dan,\n"
-"ko uporabniški račun poteče "
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Prosim izpolnite vsa polja o staranju gesla\n"
-
-#: ../userdrake:905
+#: ../userdrake:1127
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Uporabnika ni mogoče odstraniti '%s' iz njegove primarne skupine"
+msgid "Edit Groups / Users"
+msgstr "Uredi Skupine / Uporabnike"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Zapri"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Avtorske pravice (C) %s Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Upravljanje z uporabniki"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux "
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "_: Imena in e-poštni naslovi prevajalcev\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Polje z imenom je prazno, prosim podajte ime"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Ime lahko vsebuje le male črke, številke, `-' in `_'"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Ime je predolgo"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Napaka"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "neznana napaka"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Napaka pri ustvarjanju `%s': %s"
diff --git a/po/sq.po b/po/sq.po
index 3b5dfa0..30a02b4 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2002-11-12 23:30+0200\n"
 "Last-Translator: Naim Daka <naim70@freesurf.ch>\n"
 "Language-Team: Albanian <LL@li.org>\n"
@@ -19,311 +19,363 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "Gabim gjatë ngarkimit të skedares pixmap: %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, fuzzy, c-format
 msgid "Error removing `%s': %s"
 msgstr "Zhdukja përdoruesit: %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Gabim gjatë ngarkimit të skedares pixmap: %s"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 #, fuzzy
 msgid "Error creating mail spool.\n"
 msgstr "Gabim gjatë ngarkimit të skedares pixmap: %s"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Gabim gjatë ngarkimit të skedares pixmap: %s"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr ""
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Gabim gjatë ngarkimit të skedares pixmap: %s"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 #, fuzzy
 msgid "Error deleting mail spool.\n"
 msgstr "Gabim gjatë ngarkimit të skedares pixmap: %s"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Ngarkimi i Përdoruesve dhe i Grupeve... Një moment ju lutemi"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Vegël Qeverisëse për Përdoruesit Mandriva Linux"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Akcionet"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Boto"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Zhduke"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Opcionet"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Filter i sistemit të përdoruesve"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Skedare"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Rifreskoje"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Braktise"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Shtoje një përdorues"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Shtoje një grup"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Ndihmë"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Raport Bugi"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Në lidhje me..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Hulumto:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Aplikoje filterin"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Përdoruesitë"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Grupet"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, fuzzy, c-format
 msgid "Users and groups"
 msgstr "Në grupet"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Emri i Përdoruesit"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID i Përdoruesit"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Grupi Primar"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Emri i Plot"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Login Shell"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Repertori Home"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Statuti"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Emri i Grupit"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Grup ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Anëtarët e Grupit"
 
 # broken into two lines to avoid too large a button
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Shtoje një Përdorues"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Shtoje një përdorues në sistem"
 
 # broken into two lines to avoid too large a button
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Shtoje një Grup"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Shtoje një grup në sistem"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Boto"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Botoje rreshtin e zgjedhur"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Zhduke"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Zhduke rreshtin e zgjedhur"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Rifreskoje"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Rifreskoje listën"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Mbyllur"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Skadon afati"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Kliko mbi ikonë për ta ndërruar"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Krijo një Përdorues të Ri"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Krijo Repertorin Home"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Repertori Home: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Kroji një grup privat për përdoruesin"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Specifikoje ID e përdoruesit manuelisht"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, 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:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Parulla nuk Përputhet"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -332,12 +384,12 @@ msgstr ""
 "Kjo parullë është tejet e thjeshtë. \n"
 " Një parullë e mirë duhet të jetë me > 6 karaktere"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Uid i përdoruesit është < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -348,91 +400,91 @@ msgstr ""
 " A jeni i sigurt për këtë veprim?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Shtimi i %s në 'përdoruesit' e grupit"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Krijimi i një grupi të ri: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Shtimi i një përdoruesi: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Anulo"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, fuzzy, c-format
 msgid "Choose group"
 msgstr "Zgjedhe Grupin"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Shtoje në grupin ekzistues"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Shtoi në 'përdoruesit' grup"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Krijo një Grup të Ri"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Specifoje grupin e ID manuelisht"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, 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:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " Grupi Gid është < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -443,22 +495,22 @@ msgstr ""
 " A jeni i sigurt për këtë veprim?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Shtimi i një grupi: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, fuzzy, c-format
 msgid "Delete files or not?"
 msgstr "Zhduke rreshtin e zgjedhur"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -467,27 +519,27 @@ msgstr ""
 "Zhdukja e përdoruesit %s\n"
 " Njashtu parashefë akcionet vijuese\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Zhduke Repertorin Home: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Zhduke Mailbox :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Zhdukja përdoruesit: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, 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:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -496,202 +548,206 @@ msgstr ""
 "%s është grup primar për përdoruesin %s\n"
 " Zhduke përdoruesin para se të vazhdosh"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Zhdukja e grupit: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Emri i Plot:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Parulla:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Konfirmoje Parullën:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Login Shell:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Emri i Grupit:"
 
-#: ../userdrake:679
-#, fuzzy, c-format
-msgid "Edit Groups / Users"
-msgstr "Grup Përdoruesish"
+#: ../userdrake:894
+#, 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:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Ju lutemi zgjedheni Vitin, Muajin dhe Ditën \n"
+" për Mbarimin e afatit të Kontos "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Ju lutemi mbushni të gjitha fushat e parullës përsëri\n"
+
+#: ../userdrake:965
+#, 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:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Repertori Home:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Të dhënat e përdoruesit"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Mundësoje konton e afatizuar"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Kontoja skadon (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Lidhe Konton e Përdoruesit"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Informcion mbi Konton"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Përdoruesi i fundit e ka ndrryshuar parullën më :"
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Mundësoje Mbarimin Afatzgjatës të Parullës"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Ditët para se është mundësuar ndryshimi :"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Ditës para se është nevojitur ndryshimi :"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Ditër para se është ndryshuar vëmendja :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Ditët para se të jetë dezaktivizuar kontoja :"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Informacion mbi Parullën"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, 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:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Të dhëna të Grupit"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Zgjedhi përdoruesit të cilët do ti bashkangjiten grupit :"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Grup Përdoruesish"
 
-#: ../userdrake:847
-#, 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:856
-#, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Ju lutemi zgjedheni Vitin, Muajin dhe Ditën \n"
-" për Mbarimin e afatit të Kontos "
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Ju lutemi mbushni të gjitha fushat e parullës përsëri\n"
-
-#: ../userdrake:905
-#, 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:1127
+#, fuzzy, c-format
+msgid "Edit Groups / Users"
+msgstr "Grup Përdoruesish"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Mbylle"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, fuzzy, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "E drejtë autori © 2003 Mandriva SA"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Menagjer për Përdorues"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, 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:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Emri është shumë i gjatë"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Gabim"
 
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Gabim gjatë ngarkimit të skedares pixmap: %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Autorët: "
 
diff --git a/po/sr.po b/po/sr.po
index 7f32902..218a55e 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\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"
@@ -24,306 +24,358 @@ 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"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Грешка при читању `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Прављење грешке %s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Уклањам грешку `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Грешка при прављењу мејл спула.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Грешка при прављењу мејл спула.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Грешка при прављењу мејл спула.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "непозната грешка"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Грешка при прављењу мејл спула.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Грешка при брисању маејл спула.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Учитавам Кориснике и Групе... Молим Вас сачекајте"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Мандрива Линукс алат за управљање корисницима"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Акције"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Измени"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Бриши"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Опције"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Филтрирај системске кориснике"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Фајл"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Освежи"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Крај"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Додај корисника"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Додај _Групу"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Помоћ"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Пријавите грешку"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_О..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Тражи:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Примени филтер"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Корисници"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Групе"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Корисници и групе"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Корисничко име"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Корисников ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Примарна група"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Пуно име"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Шкољка за логовање"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Home директоријум"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Статус"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Име групе"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Групни ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Чланови групе"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Додај корисника"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Додај корисника у систем"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Додај Групу"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Додај групу у систем"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Измени"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Измени изабрани ред"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Бриши"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Избриши изабрани ред"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Освежи"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Освежи листу"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Закључано"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Истекло"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Кликните на икону да би је променили"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Креираљј новог корисника"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Креирај Home директоријум"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Home директоријум: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Крирај приватну групу за корисника"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Ручно одреди корисников ID"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "корисник већ постоји, изаберите друго Корисничко име"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Лозинкас се неодговара"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -332,12 +384,12 @@ msgstr ""
 "Ова лозинка је превише једноставна. \n"
 " Добра лозика има више од 6 карактера "
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "КОрисников  Uid је < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -348,91 +400,91 @@ msgstr ""
 " Да ли сте сигурни да жлите ово да урадите?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Постави %s у 'users' групу"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Креирам нову групу: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Додајем корисника: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Поништи"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "У реду"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Изабери групу"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Додај у постојећу групу"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Додај у корисникову групу"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Група са овим именом већ постоји. Шта желите да урадите?"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Креирај нову групу"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Ручно одреди ID за групу"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Група већ постоји, изаберите друго име за Групу"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " Gid за Групу је < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -443,22 +495,22 @@ msgstr ""
 " да ли сте сигурни да желите да урадите ово?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Додајем групу: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Бришем фајлове или не?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -467,27 +519,27 @@ msgstr ""
 "Бришем корисника  %s\n"
 " Такође сроводим следеће акције\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Бриши Home Директоријум: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Бриши ailbox :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Уклањам корисника: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Да ли заиста желите да обришете групу %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -496,202 +548,210 @@ msgstr ""
 "%s је примарна група за корисника %s\n"
 " Прво уклони корисникат"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Уклањам групу: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Пуно име:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Пријава:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Потврди лозинку:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Login Shell:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Име групе:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Уреди Групе / Кориснике"
+msgid "Please select at least one group for the user"
+msgstr "Изаберите бар једну групу за корисника"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Одредите Годину, Месец и Дан \n"
+" за време истицања налога "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Поново попуните сва поља и лозинку\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Не можете да уклоните корисника %s' из његове примарне групе"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Home:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Корисникови подаци"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Омогући ограничење налога"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Налог истиче (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Закључај корисников налог"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Инфо о налогу"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Корисникова последња промењена лозинка на : "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Омогући ограничење трајања лозике"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Дана пре дозволе за промену :"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Дана пре захтеване промене :"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Дана упозорења пре пормене :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Дана пре него налог постане неактиван :"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Инфо о лоозинци"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Изаберите групе у којима ће корисник бити члан:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Подаци о групи"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Изаберите кориснике који треба да приступе овој групи:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Корисници Групе"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Изаберите бар једну групу за корисника"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Одредите Годину, Месец и Дан \n"
-" за време истицања налога "
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Поново попуните сва поља и лозинку\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Не можете да уклоните корисника %s' из његове примарне групе"
+msgid "Edit Groups / Users"
+msgstr "Уреди Групе / Кориснике"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Затвори"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Сва права (C) %s задржава Мандрива"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Управљање корисницима"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Toma Jankovic <tomaja@net.yu>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Поље за име је празно, упишите име"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "Име може да садржи само мала слова, бројеве, `-' и `_'"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Име је предугачко"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Грешка"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "непозната грешка"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Прављење грешке %s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Аутори"
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 1eb0452..8212ee6 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\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"
@@ -24,306 +24,358 @@ 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"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Greška pri čitanju `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Pravljenje greške %s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Uklanjam grešku `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Greška pri pravljenju mejl spula.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Greška pri pravljenju mejl spula.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Greška pri pravljenju mejl spula.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "nepoznata greška"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Greška pri pravljenju mejl spula.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Greška pri brisanju maejl spula.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Učitavam Korisnike i Grupe... Molim Vas sačekajte"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux alat za upravljanje korisnicima"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Akcije"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Izmeni"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Briši"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Opcije"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Filtriraj sistemske korisnike"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Fajl"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Osveži"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Kraj"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Dodaj korisnika"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Dodaj _Grupu"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Prijavite grešku"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_O..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Traži:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Primeni filter"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Korisnici"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Grupe"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Korisnici i grupe"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Korisničko ime"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Korisnikov ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Primarna grupa"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Puno ime"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Školjka za logovanje"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Home direktorijum"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Status"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Ime grupe"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Grupni ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Članovi grupe"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Dodaj korisnika"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Dodaj korisnika u sistem"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Dodaj Grupu"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Dodaj grupu u sistem"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Izmeni"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Izmeni izabrani red"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Briši"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Izbriši izabrani red"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Osveži"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Osveži listu"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Zaključano"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Isteklo"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Kliknite na ikonu da bi je promenili"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Kreiraljj novog korisnika"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Kreiraj Home direktorijum"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Home direktorijum: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Kriraj privatnu grupu za korisnika"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Ručno odredi korisnikov ID"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "korisnik već postoji, izaberite drugo Korisničko ime"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Lozinkas se neodgovara"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -332,12 +384,12 @@ msgstr ""
 "Ova lozinka je previše jednostavna. \n"
 " Dobra lozika ima više od 6 karaktera "
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "KOrisnikov  Uid je < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -348,91 +400,91 @@ msgstr ""
 " Da li ste sigurni da žlite ovo da uradite?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Postavi %s u 'users' grupu"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Kreiram novu grupu: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Dodajem korisnika: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Poništi"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "U redu"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Izaberi grupu"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Dodaj u postojeću grupu"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Dodaj u korisnikovu grupu"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Kreiraj novu grupu"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Ručno odredi ID za grupu"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Grupa već postoji, izaberite drugo ime za Grupu"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " Gid za Grupu je < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -443,22 +495,22 @@ msgstr ""
 " da li ste sigurni da želite da uradite ovo?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Dodajem grupu: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Brišem fajlove ili ne?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -467,27 +519,27 @@ msgstr ""
 "Brišem korisnika  %s\n"
 " Takođe srovodim sledeće akcije\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Briši Home Direktorijum: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Briši ailbox :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Uklanjam korisnika: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Da li zaista želite da obrišete grupu %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -496,202 +548,210 @@ msgstr ""
 "%s je primarna grupa za korisnika %s\n"
 " Prvo ukloni korisnikat"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Uklanjam grupu: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Puno ime:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Prijava:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Potvrdi lozinku:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Login Shell:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Ime grupe:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Uredi Grupe / Korisnike"
+msgid "Please select at least one group for the user"
+msgstr "Izaberite bar jednu grupu za korisnika"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Odredite Godinu, Mesec i Dan \n"
+" za vreme isticanja naloga "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Ponovo popunite sva polja i lozinku\n"
+
+#: ../userdrake:965
+#, 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:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Home:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Korisnikovi podaci"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Omogući ograničenje naloga"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Nalog ističe (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Zaključaj korisnikov nalog"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Info o nalogu"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Korisnikova poslednja promenjena lozinka na : "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Omogući ograničenje trajanja lozike"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dana pre dozvole za promenu :"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Dana pre zahtevane promene :"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Dana upozorenja pre pormene :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dana pre nego nalog postane neaktivan :"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Info o loozinci"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Izaberite grupe u kojima će korisnik biti član:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Podaci o grupi"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Izaberite korisnike koji treba da pristupe ovoj grupi:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Korisnici Grupe"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Izaberite bar jednu grupu za korisnika"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Odredite Godinu, Mesec i Dan \n"
-" za vreme isticanja naloga "
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Ponovo popunite sva polja i lozinku\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Ne možete da uklonite korisnika %s' iz njegove primarne grupe"
+msgid "Edit Groups / Users"
+msgstr "Uredi Grupe / Korisnike"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Zatvori"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Sva prava (C) %s zadržava Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Upravljanje korisnicima"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Toma Jankovic_<tomaja@net.yu>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Polje za ime je prazno, upišite ime"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Ime je predugačko"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Greška"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "nepoznata greška"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Pravljenje greške %s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Autori"
 
diff --git a/po/sv.po b/po/sv.po
index 9e05274..6388180 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2-sv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2009-10-18 06:40+0300\n"
 "Last-Translator: Thomas Backlund <tmb@mandriva.org>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -23,310 +23,362 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Fel vid inläsning av `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Fel vid skapande av `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Fel vid borttagande av `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Fel vid skapande av e-postkö.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Fel vid skapande av e-postkö.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Fel vid skapande av e-postkö.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "okänt fel"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Fel vid skapande av e-postkö.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Fel vid borttagande av e-postkö.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Laddar användare och grupper.... Vänta."
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux-verktyg för användarhantering"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr "/_Installera gästkonto"
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr "/_Avinstallera gästkonto"
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Åtgärder"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/R_edigera"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Ta bort"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Alternativ"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Filtrera systemanvändare"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/Ark_iv"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/Uppdate_ra"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/Avsl_uta"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/L_ägg till användare"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Lägg till _grupp"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Hjälp"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Rapportera fel"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Om..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Sök:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Tillämpa filter"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Användare"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Grupper"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Användare och grupper"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Användarnamn"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Användar-id"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Primär grupp"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Fullständigt namn"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Inloggningsskal"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Hemkatalog"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Status"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Gruppnamn"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Grupp-id"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Gruppmedlemmar"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr ""
 "Lägg till\n"
 "användare"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Lägg till en användare till systemet"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr ""
 "Lägg till\n"
 "grupp"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Lägg till en grupp till systemet"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Redigera"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Redigera markerad rad"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Ta bort"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Ta bort vald rad"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Uppdatera listan"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Låst"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Utgången"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Klicka på ikonen för att ändra den"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Skapa ny användare"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Skapa hemkatalog"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Hemkatalog: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Skapa en privat grupp för användaren"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Ange användar-id manuellt"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Användaren finns redan, välj ett annat användarnamn"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Olika lösenord"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -335,12 +387,12 @@ msgstr ""
 "Det här lösenordet är för enkelt. \n"
 " Bra lösenord ska vara längre än sex tecken."
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Användar-id är < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -351,27 +403,27 @@ msgstr ""
 "Är du säker på att du vill göra detta?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Lägger till användare %s i gruppen \"users\""
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Skapar ny grupp: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Lägger till användare: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Migrationsguide"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -380,64 +432,64 @@ msgstr ""
 "Vill du köra migreringsguiden för att importera Windows dokument och "
 "inställninar till din Mandriva Linux distribution?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Välj grupp"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Lägg till i den befintliga gruppen"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Lägg till i gruppen \"users\""
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Skapa ny grupp"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Ange grupp-id manuellt"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Gruppen finns redan. Välj ett annat gruppnamn."
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " Grupp-id är < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -448,22 +500,22 @@ msgstr ""
 "Är du säker på att du vill göra detta?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Lägger till grupp: %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Ta bort filer eller inte?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -472,27 +524,27 @@ msgstr ""
 "Tar bort användare %s\n"
 " Utför också följande åtgärder\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Ta bort hemkatalog: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Ta bort brevlåda: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Tar bort användare: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Vill du verkligen ta bort gruppen %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -501,177 +553,177 @@ msgstr ""
 "%s är en primär grupp för användaren %s.\n"
 " Ta bort användaren först"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Tar bort grupp: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Fullständigt namn:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Användarnamn:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Bekräfta lösenord:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Inloggningsskal:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Gruppnamn:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Ändra Grupper / Användare"
+msgid "Please select at least one group for the user"
+msgstr "Välj minst en grupp åt användaren."
 
-#: ../userdrake:699
+#: ../userdrake:904
+#, 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 "
+
+#: ../userdrake:914
+#, 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:965
+#, 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:986
 #, c-format
 msgid "Home:"
 msgstr "Hem:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Användardata"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Aktivera tidsbegränsning av konto"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Kontot går ut den (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Lås användarkonto"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Kontoinformation"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Användaren ändrade lösenord: "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Aktivera tidsbegränsning av lösenord"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Dagar innan ändring tillåts: "
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Dagar före ändring krävs: "
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Förvarningstid i dagar innan ändring:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Dagar innan kontot blir inaktiverat:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Lösenordsinformation"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, 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:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Gruppdata"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, 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:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Gruppanvändare"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Välj minst en grupp åt användaren."
-
-#: ../userdrake:856
-#, 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 "
-
-#: ../userdrake:862
-#, 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:905
+#: ../userdrake:1127
 #, 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."
+msgid "Edit Groups / Users"
+msgstr "Ändra Grupper / Användare"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Stäng"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s, Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Användarhantering"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
@@ -683,24 +735,31 @@ msgstr ""
 "Fuad Sabanovic <manijak@telia.com>\n"
 "Kenneth Krekula\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Namnfältet är tomt. Ange ett namn."
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Namnet är för långt"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Fel"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "okänt fel"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Fel vid skapande av `%s': %s"
diff --git a/po/ta.po b/po/ta.po
index b5c5d75..49a018f 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\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"
@@ -19,320 +19,372 @@ msgstr ""
 "X-Generator: KBabel 0.9.6\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr " %s என்ற குறும்படத்தை ஏற்றுவதில் பிழை நேர்ந்துள்ளது"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, fuzzy, c-format
 msgid "Error removing `%s': %s"
 msgstr "பயனரைச் நீக்கு"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr " %s என்ற குறும்படத்தை ஏற்றுவதில் பிழை நேர்ந்துள்ளது"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 #, fuzzy
 msgid "Error creating mail spool.\n"
 msgstr " %s என்ற குறும்படத்தை ஏற்றுவதில் பிழை நேர்ந்துள்ளது"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr " %s என்ற குறும்படத்தை ஏற்றுவதில் பிழை நேர்ந்துள்ளது"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "தெரியாத பிழை"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr " %s என்ற குறும்படத்தை ஏற்றுவதில் பிழை நேர்ந்துள்ளது"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 #, fuzzy
 msgid "Error deleting mail spool.\n"
 msgstr " %s என்ற குறும்படத்தை ஏற்றுவதில் பிழை நேர்ந்துள்ளது"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "டிரேக்பயனர்"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr ""
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_செயல்கள்"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_தொகு"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_அழி"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_விருப்பத்தேர்வு"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_கோப்பு"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_புதிதாக்கு"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_வெளிச்செல்"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_பயனர சேர்"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/_குழுவை சேர்"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_உதவி"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_பிழைகளை அறிவிக்க"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_பற்றி"
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "தேடு:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "பயனர்கள்"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "குழுக்கள்"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "பயனர்களும் குழுக்களும்"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "பயனர் பெயர்"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "உபயோகிப்பாளர் அடையாளம்"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "முழுப் பெயர்"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "புகுபதிகை ஸ்செல்"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "இல்ல அடைவு"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "நிலை"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "குழுப்பெயர்"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "குழு ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "குழு நபர்கள்"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "பயனர சேர்"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "குழுவை சேர்"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, fuzzy, c-format
 msgid "Add a group to the system"
 msgstr "குழுவைச் சேர்"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "மாற்றியமை"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "நீக்கு"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "மீளேற்று"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, fuzzy, c-format
 msgid "Refresh the list"
 msgstr "பயனரின் பட்டியல்"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "பூட்டப்பட்டது"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "காலாவதியாணது"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr ""
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, fuzzy, c-format
 msgid "Create Home Directory"
 msgstr "பயனரின் தொடக்க அடைவு"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, fuzzy, c-format
 msgid "Home Directory: "
 msgstr "பயனரின் தொடக்க அடைவு"
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, fuzzy, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "இப்பெயர் ஏற்கனவே பயன்பாட்டில் உள்ளது"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, fuzzy, c-format
 msgid "Password Mismatch"
 msgstr "கடவுச்சொல்"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -340,91 +392,91 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr ""
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, fuzzy, c-format
 msgid "Creating new group: %s"
 msgstr "குழுக்களைக் காட்டு"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, fuzzy, c-format
 msgid "Adding user: %s"
 msgstr "பயனரைச் சேர்"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "நீக்கு"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "சரி"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, fuzzy, c-format
 msgid "Choose group"
 msgstr "இடம்பெற்றுள்ள குழுக்கள்"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "புதிய குழுவை உருவாக்கு"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -432,249 +484,257 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr ""
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr ""
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
 " Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, fuzzy, c-format
 msgid "Delete Home Directory: %s"
 msgstr "பயனரின் தொடக்க அடைவு"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, fuzzy, c-format
 msgid "Removing user: %s"
 msgstr "பயனரைச் நீக்கு"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr ""
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, fuzzy, c-format
 msgid "Removing group: %s"
 msgstr "குழுவை நீக்கு"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "முழுப் பெயர்:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "தொடங்கல் :"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "கடவுச்சொல்:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "கடவுச்சொல்லை உறுதிச் செய்:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "புகுபதிகை ஸ்செல்:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "குழுப்பெயர்:"
 
-#: ../userdrake:679
-#, fuzzy, c-format
-msgid "Edit Groups / Users"
-msgstr "குழுக்கள்"
+#: ../userdrake:894
+#, c-format
+msgid "Please select at least one group for the user"
+msgstr ""
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr ""
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "ஆரம்பம்:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, fuzzy, c-format
 msgid "User Data"
 msgstr "பயனரின் பட்டியல்"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr ""
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr ""
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr ""
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr ""
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr ""
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, fuzzy, c-format
 msgid "Password Info"
 msgstr "கடவுச்சொல்"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, fuzzy, c-format
 msgid "Group Data"
 msgstr "குழு  பட்டியல்"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr ""
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, fuzzy, c-format
 msgid "Group Users"
 msgstr "குழுக்கள்"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr ""
-
-#: ../userdrake:856
-#, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr ""
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr ""
+#: ../userdrake:1127
+#, fuzzy, c-format
+msgid "Edit Groups / Users"
+msgstr "குழுக்கள்"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "மூடு"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, fuzzy, c-format
 msgid "Users Management"
 msgstr "பயனர் பெயர்"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "மான்ட்ரிவ லினக்ஸ்"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "பிழை"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "தெரியாத பிழை"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr " %s என்ற குறும்படத்தை ஏற்றுவதில் பிழை நேர்ந்துள்ளது"
+
 #~ msgid "Authors: "
 #~ msgstr "ஆசிரியர்கள்: "
 
diff --git a/po/tg.po b/po/tg.po
index a9e9046..fa900aa 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-tg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2004-08-28 14:35+0000\n"
 "Last-Translator: Abrorova <H_Abrorova@rambler.ru>\n"
 "Language-Team: Tajik\n"
@@ -19,307 +19,359 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Хатогии хондани `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Хатогии офаридани `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Хатогии хориҷкунии `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Хатогии офаридани додаҳои пост.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Хатогии офаридани додаҳои пост.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Хатогии офаридани додаҳои пост.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "Хатогии номаълум"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Хатогии офаридани додаҳои пост.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Хатогии нобудкунии додаҳои пост.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Корвандҳо ва гурӯҳо ба кор андохта мешаванд... Лутфан, интизор шавед"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Асбоб барои Идора Намудани Корвандҳои Mandriva Linux"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Амалҳо"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Таҳрир"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Нобуд кардан"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Интихобҳо"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Корвандҳои системро ҷудо карда гирифтан"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Файл"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Нав намудан"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Баромадан"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Корвандро ҳамроҳ намоед"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Илова намоед _Гурӯҳ"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Ёрӣ"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Ҳисобот оиди хатогӣ"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Дар бораи..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Ҷустуҷӯ:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "филтрро истифода намудан"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Корвандҳо"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Гурӯҳҳо"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Корвандон ва гурӯҳҳо"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Номи корванд"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Корванди ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Гурӯҳи Асосӣ"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Номи Пурра"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Ҷилди номи дохилӣ"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Феҳристи хонагӣ"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Мақом"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Номи гурӯҳ"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Гурӯҳи ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Аъзоёни гурӯҳ"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Иловаи корванд"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Корвандро ба систем ҳамроҳ намудан"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Гурӯҳро илова намоед"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Гурӯҳро ба систем илова намоед"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Таҳрир"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Сатри интихобшударо таҳрир намудан"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Нобуд кардан"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Сатри интихобшударо хориҷ намудан"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Нав намудан"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Рӯйхатро нав намоед"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Баста шудааст"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Мӯҳлати амалиёт гузаштааст"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Барои тағирдиҳӣ ба тасвир ангушт занед"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Корванди Навро ташкил намудан"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Феҳристи хонагиро тартиб диҳед"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Феҳристи хонагӣ"
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Гурӯҳи шахсиро барои корванд ташкил намудан"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Дастӣ ID корвандро нишон додан"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr ""
 "Ин корванд аллакай вуҷуд дорад, лутфан номи корванди дигарро интихоб намоед"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Гузарвожа Mismatch"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -328,12 +380,12 @@ msgstr ""
 "Ин гузарвожа хеле содда аст. \n"
 "Гузарвожаҳои хуб бояд > аз 6 рамз бошанд"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Uid-и корванд < аз 500 мебошад"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -344,91 +396,91 @@ msgstr ""
 "Шумо боварӣ доред, ки инро иҷро карданӣ ҳастед?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Гузоштани %s ба гурӯҳи 'users'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Ташкили гурӯҳи нав: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Иловаи корванд: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Бекор кардан"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Гурӯҳро интихоб кунед"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Ба гурӯҳи вуҷуддошта дохил намудан"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Ба гурӯҳи 'users' илова намудан"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Гурӯҳ бо ин ном аллакай вуҷуд дорад.  Шумо чӣ кор каданӣ ҳастед?"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Гурӯҳи навро ташкил намоед"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Дастӣ гурӯҳи ID-ро нишон диҳед"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Гурӯҳ аллакай вуҷуд дорад, лутфан Номи дигари Гурӯҳро интихоб намоед"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " Gid-и гурӯҳ < аз 500 мебошад"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -439,22 +491,22 @@ msgstr ""
 "Шумо боварӣ доред, ки инро иҷро карданӣ ҳастед?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Гурӯҳ илова шуда истодааст: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Файлҳоро нобуд кунам ё не?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -463,27 +515,27 @@ msgstr ""
 "Корванд хориҷ карда мешавад %s\n"
 " Инчунин амалиётҳои зерин иҷро мешаванд\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Феҳристи хонагиро тоза намоед: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Қуттии мактубҳоро хориҷ намудан :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Хориҷи корванд(ҳо): %s "
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Шумо дар ҳақиқат гурӯҳро хориҷ карданӣ ҳастед %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -492,202 +544,210 @@ msgstr ""
 "%s гурӯҳи асосӣ барои корванд мебошад %s\n"
 "Сараввал корвандро хориҷ намоед"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Хориҷи гурӯҳ(ҳо): %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Номи Пурра:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Номи дохилӣ:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Гузарвожа:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Гузарвожаро тасдиқ намоед:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Ҷилди номи дохилӣ:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Номи гурӯҳ:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Таҳрири Гурӯҳҳо/ Корвандон"
+msgid "Please select at least one group for the user"
+msgstr "Лутфан, ақаллан як гурӯҳро барои корванд интихоб намоед"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Лутфан, сол, моҳ ва рӯзи \n"
+"тамом шудани мӯҳлати қайдро нишон диҳед "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Барои солгузории гузарвожа, лутфан ҳамаи майдонҳоро пур намоед\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Шумо корванди '%s' аз гурӯҳи асосии ӯ хориҷ карда наметавонед"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Хона (мавқеи аввала):"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Додаҳои корванд"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Мӯҳлати қайдро дохил намудан"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Мӯҳлати қайд мегузарад (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Қайди корвандро бастан"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Ахборот дар бораи суратҳисоб"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Дафъаи охирин корванд гузарвожаро иваз намуд : "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Мӯҳлати иҷроиши гузарвожаро дохил намудан"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Баъд аз чанд рӯз ба тағирот иҷозат дод :"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Баъд аз якчанд рӯз тағиротро талаб намуд:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Чанд рӯз дар бораи тағирот огоҳӣ намуд :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Миқдори рӯзҳои то қатъи қайд :"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Ахборот дар бораи гузарвожа"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Гурӯҳҳоро интихоб намоед, ки аъзои онҳо корванд хоҳад шуд:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Додаҳои гурӯҳ"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Барои дохил шудан ба ин гурӯҳ корвандҳоро интихоб намоед :"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Гурӯҳҳои корванд"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Лутфан, ақаллан як гурӯҳро барои корванд интихоб намоед"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Лутфан, сол, моҳ ва рӯзи \n"
-"тамом шудани мӯҳлати қайдро нишон диҳед "
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Барои солгузории гузарвожа, лутфан ҳамаи майдонҳоро пур намоед\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Шумо корванди '%s' аз гурӯҳи асосии ӯ хориҷ карда наметавонед"
+msgid "Edit Groups / Users"
+msgstr "Таҳрири Гурӯҳҳо/ Корвандон"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Махкам намоед"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Идораи корвандҳо"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Victor Ibragimov <youth_opportunities@tajikngo.org>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Майдони ном холӣ аст, лутфан номро пешниҳод намоед"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 "Ном бояд танҳо рамзҳои лотинӣ қайди поён, рақамҳо, `-' ва `_' -ро дошта бошад"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Ном бениҳоят дароз аст"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Хатогӣ"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "Хатогии номаълум"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Хатогии офаридани `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Муаллифон: "
diff --git a/po/th.po b/po/th.po
index c7abb92..8f3a09e 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2004-10-07 01:00-0400\n"
 "Last-Translator: Wachara Chinsettawong <wachara@yahoo.com>\n"
 "Language-Team: Thai\n"
@@ -17,306 +17,358 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "เกิดการผิดพลาดเวลาอ่าน `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "เกิดการผิดพลาดเวลาสร้าง `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "เกิดการผิดพลาดเวลาลบ `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "เกิดการผิดพลาดเวลาสร้าง mail spool.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "เกิดการผิดพลาดเวลาสร้าง mail spool.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "เกิดการผิดพลาดเวลาสร้าง mail spool.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "เกิดการผิดพลาดแบบไม่ทราบสาเหตุ"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "เกิดการผิดพลาดเวลาสร้าง mail spool.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "เกิดการผิดพลาดเวลาลบ mail spool.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "กำลังอ่านค่าผู้ใช้และกลุ่ม  กรรุณารอสักครู่"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "เครื่องมือจัดการผู้ใช้สำหรับ Mandriva Linux"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_แบบการทำงาน"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_ปรับแต่ง"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_ลบ"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_ทางเลือก"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_กรองผู้ใช้ระบบ"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_ไฟล์"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_อ่านค่าใหม่"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_เลิก"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_เพิ่มผู้ใช้"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/เพิ่มกลุ่ม"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_ช่วยเหลือ"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_แจ้งข้อผิดพลาด"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_เกี่ยวกับ"
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "ค้นหา:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "ใช้ตัวกรอง"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "ผู้ใช้"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "กลุ่ม"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr ""
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "ชื่อผู้ใช้"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "รหัสผู้ใช้"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "กลุ่มแรก"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "ชื่อเต็ม"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "ล็อกอินเชล"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Home Directory"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "สถานะ"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "ชื่อกลุ่ม"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "รหัสกลุ่ม"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "สมาชิกกลุ่ม"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "เพิ่มผู้ใช้"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "เพิ่มผู้ใช้เข้าระบบ"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "เพิ่มกลุ่ม"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "เพิ่มกลุ่มเข้าระบบ"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "ปรับแต่ง"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "ปรับแต่งบรรทัดที่เลือก"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "ลบ"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "ลบที่เลือก"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "อ่านค่าใหม่"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "อ่านค่ารายการใหม่"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "ล็อก"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "หมดอายุ"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "กดที่รูปเพื่อเปลี่ยนแปลง"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "สร้างผู้ใช้ใหม่"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "สร้าง Home Directory"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Home Directory: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "สร้างกลุ่มส่วนตัวสำหรับผู้ใช้"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "ระบุรหัสผู้ใช้เอง"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "ชื่อนี้มีแล้วกรุณาใช้ชื่ออื่น"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "รหัสลับไม่ถูกต้อง"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -325,12 +377,12 @@ msgstr ""
 "รหัสลับนี้ง่ายเกินไป\n"
 "รหัสที่ดีต้องมีตัวหนังสือมากกว่า 6 "
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "รหัสผู้ใช้น้อยกว่า 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -341,91 +393,91 @@ msgstr ""
 "คุณแน่ใจหรือที่จะสร้าง\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "ใส่ %s เข้าไปที่กลุ่ม 'user' "
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "สร้างกลุ่มใหม่ %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "เพิ่มผู้ใช้: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "ตกลง"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "รหัส: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "เลือกกลุ่ม"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "เพิ่มเข้ากลุ่มที่มีอยู่แล้ว"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "เพิ่มไปที่กลุ่ม 'users'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "ชื่อกลุ่มนี้มีแล้ว คุณจะทำอย่างไรต่อ"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "สร้างกลุ่มใหม่"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "ระบุรหัสกลุ่มเอง"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "ชื่อกลุ่มนี้มีอยู่แล้ว กรุณาเลือกชื่ออื่น"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "รหัสกลุ่มน้อยกว่า 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -436,22 +488,22 @@ msgstr ""
 "คุณแน่ใจหรือที่จะสร้าง\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "เพิ่มกลุ่ม: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "รหัสกลุ่ม:"
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "ลบไฟล์หรือไม่"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -460,27 +512,27 @@ msgstr ""
 "กำลังลบผู้ใช้ %s\n"
 "และกำลังทำงานสิ่งต่อไปนี้\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "ลบ Home Directory: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "ลบ Mailbox :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "ลบผู้ใช้: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "คุณแน่ใจหรือที่จะลบกลุ่ม %s"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -489,201 +541,209 @@ msgstr ""
 "%s คือกลุ่มแรกของ %s\n"
 " ลบผู้ใช้นี้ก่อน"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "ลบกลุ่ม: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "ชื่อเต็ม:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "รหัสลับ:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "ยืนยันรหัสลับ:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "ล็อกอินเชล:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "ชื่อกลุ่ม:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "แก้ใขกลุ่ม / ผู้ใช้"
+msgid "Please select at least one group for the user"
+msgstr "กรุณาเลือกอย่างน้อยหนึ่งกลุ่มสำหรับผู้ใช้"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"กรุณาระบุ ปี เดือน และวัน\n"
+"ที่บัญชีจะหมดอายุ "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "กรุณากรอกทุกช่องในอายุของรหัสลับ\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "คุณไม่สามารถลบผู้ใช้ '%s' จากกลุ่มแรกของเขา"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Home:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "ข้อมูลผู้ใช้"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "ใช้งานการจับเวลาวันหมดอายุของบัญชี"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "บัญชีหมดอายุ (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "ล็อกบัญชีผู้ใช้"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "ข้อมูลบัญชี"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "ผู้ใช้เปลี่ยนรหัสลับครั้งสุดท้ายเมื่อ :"
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "ใช้งานวันหมดอายุของรหัสลับ"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "จำนวนวันก่อนที่จะเปลี่ยนได้:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "จำนวนวันก่อนเปลี่ยนที่ต้องการ:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "จำนวนวันที่จะเตือนก่อนเปลี่ยน:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr ":จำนวนวันก่อนบัญชีจะใช้งานไม่ได้"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "ข้อมูลรหัสลับ"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "เลือกกลุ่มที่ผู้ใช้จะเป็นสมาชิก"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "ข้อมูลกลุ่ม"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "เลือกผู้ใช้สำหรับกลุ่มนี้:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "กลุ่มผู้ใช้"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "กรุณาเลือกอย่างน้อยหนึ่งกลุ่มสำหรับผู้ใช้"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"กรุณาระบุ ปี เดือน และวัน\n"
-"ที่บัญชีจะหมดอายุ "
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "กรุณากรอกทุกช่องในอายุของรหัสลับ\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "คุณไม่สามารถลบผู้ใช้ '%s' จากกลุ่มแรกของเขา"
+msgid "Edit Groups / Users"
+msgstr "แก้ใขกลุ่ม / ผู้ใช้"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "ปิด"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "การบริหารผู้ใช้"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "ไม่มีชื่อ กรุณาใส่ชื่อด้วย"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "ชื่อต้องเป็นตัวหนังสือลาตินแบบตัวเล็ก ตัวเลข `-' และ `_'"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "ชื่อยาวเกินไป"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "เกิดการผิดพลาด"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "เกิดการผิดพลาดแบบไม่ทราบสาเหตุ"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "เกิดการผิดพลาดเวลาสร้าง `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "ผู้แต่ง:"
diff --git a/po/tl.po b/po/tl.po
index 747e67b..e1cd34c 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\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"
@@ -16,306 +16,358 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Hindi mabasa ang `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Hindi magawa ang `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Hindi matanggal ang `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Hindi magawa ang mail spool.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Hindi magawa ang mail spool.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Hindi magawa ang mail spool.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "di-alam na kamalian"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Hindi magawa ang mail spool.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Hindi matanggal ang mail spool.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Nilo-load ang mga User at Grupo... Pakihintay"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux Users Management Tool"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/Mga _Aksyon"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/I-_Edit"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Alisin"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/Mga _Option"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Salain ang mga system user"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_File"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Sariwain"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/_Labas"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>L"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Magdagdag ng User"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Magdagdag ng _Grupo"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Tulong"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/Mag-ulat ng _Bug"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/Tung_kol sa..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Hanapin:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "I-apply ang pangsala"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Mga user"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Mga grupo"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Mga gumagamit at grupo"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Pangalan ng User"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "User ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Pangunahing Grupo"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Buong Pangalan"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Login Shell"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Tahanang Directory"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Kalagayan"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Pangalan ng Grupo"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Group ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Mga Kasapi sa Grupo"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Magdagdag ng User"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Magdagdag ng user sa sistema"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Magdagdag ng Grupo"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Magdagdag ng grupo sa sistema"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "I-edit"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "I-edit ang piniling hanay (row)"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Alisin"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Alisin ang piniling row"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Sariwain"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Sariwain ang talaan"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Naka-lock"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Wala ng bisa"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "I-click ang icon para baguhin ito"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Gumawa ng Bagong User"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Gumawa ng Tahanang Directory"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Tahanang Directory: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Gumawa ng pribadong grupo para sa user"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Mano-manong banggitin ang user ID"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Mayroon nang User, pakiusap, pumili ng ibang Pangalan ng User"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Password Di-tugma"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -324,12 +376,12 @@ msgstr ""
 "Itong password ay sobrang simple. \n"
 " Ang mga magandang password ay dapat > 6 character"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "User Uid ay < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -340,92 +392,92 @@ msgstr ""
 " Sigurado ka bang gusto mong gawin ito?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Nilalagay ang %s sa 'users' na grupo"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Ginagawa ang bagong grupo: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Idinadagdag ang user: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Kanselahin"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Pumili ng grupo"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Idagdag sa mayroon nang grupo"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Idagdag sa 'users' na grupo"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Gumawa ng Bagong Grupo"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Mano-manong banggitin ang ID ng grupo"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Mayroon nang Grupo, pakiusap, pumili ng ibang Pangalan ng Grupo"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " Gid ng Grupo ay < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -436,22 +488,22 @@ msgstr ""
 " Sigurado ka bang gusto mong gawin ito?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Idinadagdag ang grupo: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Alisin ang mga file o hindi?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -460,27 +512,27 @@ msgstr ""
 "Inaalis ang user %s\n"
 " At saka gawin ang mga sumusunod na aksyon\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Alisin ang Tahanang Directory: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Alisin ang Mailbox :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Inaalis ang user: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Gusto ma ba talagang alisin ang grupo na %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -489,187 +541,187 @@ msgstr ""
 "%s ay isang pangunahing grupo para sa user na %s\n"
 " Alisin muna ang user"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Inaalis ang grupo: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Buong Pangalan:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Password:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Ulitin ang Password:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Login Shell:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Pangalan ng Grupo:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "I-Edit ang mga Grupo / User"
+msgid "Please select at least one group for the user"
+msgstr "Pakiusap, pumili ng isa man lang na grupo para sa user"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Pakibanggit ang Taon, Buwan at Araw \n"
+" para sa Pagkawala ng bisa ng Account "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Pakipuno lahat ng mga field sa pagtanda ng password\n"
+
+#: ../userdrake:965
+#, 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:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Tahanan:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "User Data"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Paganahin ang pag-expire (walang bisa) ng account"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Mawawalang bisa (TTTT-BB-AA):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "I-lock ang Account ng User"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Inpormasyon sa Account"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Huling binago ng user ang password noong : "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Paganahin ang pag-expire (walang bisa) ng password"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Araw bago payagan pagbabago    :"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Araw bago kailanganing baguhin  :"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Araw ng pagbabala bago baguhin :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Araw bago inactive ang account    :"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Inpormasyon sa Password"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, 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:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Group Data"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Piliin ang mga user na sasali sa grupong ito :"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Mga User ng Grupo"
 
-#: ../userdrake:847
-#, 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:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Pakibanggit ang Taon, Buwan at Araw \n"
-" para sa Pagkawala ng bisa ng Account "
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Pakipuno lahat ng mga field sa pagtanda ng password\n"
-
-#: ../userdrake:905
-#, 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"
+msgid "Edit Groups / Users"
+msgstr "I-Edit ang mga Grupo / User"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Isara"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Pangangasiwa ng mga User"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Arys P. Deloso <arys@deloso.org>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Ang field na Pangalan ay walang laman, magbigay ng pangalan"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
@@ -677,15 +729,23 @@ msgstr ""
 "Ang pangalan ay dapat maglaman lamang ng maliliit na latin na titik, bilang, "
 "`-' at `_'"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Sobrang haba ng pangalan"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Error"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "di-alam na kamalian"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Hindi magawa ang `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Mga Autor: "
diff --git a/po/tr.po b/po/tr.po
index 7f36da6..c7649e7 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2009-10-17 23:45+0200\n"
 "Last-Translator: Atilla ÖNTAŞ <atilla_ontas@mandriva.org>\n"
 "Language-Team: Turkish <kde-i18n-doc@kde.org>\n"
@@ -26,306 +26,358 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Okurken hata `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Yaratılırken hata `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Silerken hata `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Yeni posta kuyruğu yaratma hatası.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Yeni posta kuyruğu yaratma hatası.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Yeni posta kuyruğu yaratma hatası.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Yeni posta kuyruğu yaratma hatası.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Posta kuyruğu silme hatası.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Kullanıcı ve Gruplar Yükleniyor... Lütfen bekleyin"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux Kullanıcı Yönetim Aracı"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr "/_konuk hesabını kur"
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr "/_konuk hesabını sil"
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/Eylemle_r"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/Dü_zenle"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Sil"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/S_eçenekler"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/Sistem kullanıcılarını _Filtrele"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Dosya"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Tazele"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/Çı_K"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/K_ullanıcı Ekle"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Gru_p Ekle"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/Hata _Bildir"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Hakkında..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Ara:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Filtreyi uygula"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Kullanıcılar"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Gruplar"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Kullanıcı ve gruplar"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Kullanıcı Adı"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Kullanıcı ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Birincil Grup"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Tam isim"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Giriş Kabuğu"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Ev Dizini"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Durum"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Grup Adı"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Grup ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Grup Üyeleri"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Kullanıcı Ekle"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Sisteme bir kullanıcı ekler"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Grup Ekle"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Sisteme bir kullanıcı ekler"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Düzenle"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Seçili sırayı süzenler"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Sil"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Seçili sırayı siler"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Tazele"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Listeyi tazeler"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Kilitli"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Hükmünü yitirmiş"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Değiştirmek için simgesine tıklayın"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Yeni Kullanıcı Oluştur"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Ev Dizini Oluştur"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Ev Dizini: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Kullanıcılar için özel bir grup oluştur"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Kullanıcının ID'sini elle belirle"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, 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:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Parolalar uyuşmuyor"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -334,12 +386,12 @@ msgstr ""
 "Bu parola çok basit. \n"
 " İyi bir parola en az 6 karakterden oluşturulmalıdır"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Kullanıcı adı 500 'den küçükj"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -351,27 +403,27 @@ msgstr ""
 " Bunu yapmak istediğinize emin misiniz ?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "%s 'users' grubuna koyuluyor"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Oluşturulan yeni grup: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Eklenen kullanıcı: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Göç sihirbazı"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -380,64 +432,64 @@ msgstr ""
 "Windows belge ve seçeneklerinizi Mandriva Linux dağıtımına aktarmak için göç "
 "sihirbazını çalıştırmak istiyor musunuz?"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Vazgeç"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Tamam"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Grup seçin"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Var olan bir gruba ekle"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "'users' grubuna ekle"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Yeni Grup Oluştur"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Grup ID'sini elle belirle"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, 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:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " Grup Gid 500 'den küçük"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -449,22 +501,22 @@ msgstr ""
 " Bunu yapmak istediğinize emin misiniz ?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Eklenen grup: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Dosyaları silinsin mi yoksa silinmesin mi?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -473,27 +525,27 @@ msgstr ""
 "%s Kullanıcısı siliniyor\n"
 " Sonrasında şu eylemler gerçekleştirilecek\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Ev Dizinini Sil: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Posta Kutusunu Sil :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Kaldırılan kullanıcı: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "%s grubunu gerçekten silmek istiyor musunuz?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -502,198 +554,206 @@ msgstr ""
 "%s grubu %s kullanıcısı için birincil gruptur\n"
 " Önce kullanıcıyı çıkartın"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Kaldırılan Grup: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Tam isim:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Giriş:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Parola:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Parolayı Tekrarla:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Giriş Kabuğu:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Grup Adı:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Grupları / Kullanıcıları Düzenle"
+msgid "Please select at least one group for the user"
+msgstr "Lütfen kullanıcı için en az bir grup seçiniz"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Lütfen hesabın hükmünü yitireceği Yılı, \n"
+"Ayı ve Günü belirtin "
+
+#: ../userdrake:914
+#, 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:965
+#, 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:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Ev:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Kullanıcı Verisi"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Hesabın hüküm yitirmesine imkan ver"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Hesabın sonlanması (YYYY-AA-GG):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Kullanıcı Hesabını Kilitle"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Hesap bilgisi"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Kullanıcı en son şu tarihte şifre değiştirdi : "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Parolanın hüküm yitirmesine imkan ver"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Değişikliğe kaç gün sonra izin verilecek"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Kaç gün sonra değiştirecek"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Değiştirmeden kaç gün önce uyarılacak :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Hesap kaç gün sonra kapatılacak :"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Parola bilgisi"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, 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:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Grup Verisi"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Gruba eklenecek kullanıcıları seçin :"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Grup Kullanıcıları"
 
-#: ../userdrake:847
-#, 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:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Lütfen hesabın hükmünü yitireceği Yılı, \n"
-"Ayı ve Günü belirtin "
-
-#: ../userdrake:862
-#, 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:905
-#, 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"
+msgid "Edit Groups / Users"
+msgstr "Grupları / Kullanıcıları Düzenle"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Kapat"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Tüm Hakları Saklıdır (C) %s Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Kullanıcı Yönetimi"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Taha Özket <taha.ozket@obss.net> 2007\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "İsim alanı boş bırakılmış lütfen uygun şekilde doldurunuz"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "İsim çok uzun"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Hata"
+
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "bilinmeyen hata"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Yaratılırken hata `%s': %s"
diff --git a/po/uk.po b/po/uk.po
index b9ff079..815dbeb 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2009-10-20 17:17+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
@@ -22,311 +22,363 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 0.3\n"
-"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"
+"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"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Помилка при читанні `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Помилка при створенні `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Помилка при видаленні `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Помилка при створенні поштової низки.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Помилка при створенні поштової низки.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Помилка при створенні поштової низки.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "невідома помилка"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Помилка при створенні поштової низки.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Помилка при видаленні поштової низки.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Завантажуються Користувачі і Групи... Зачекайте, будь ласка"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Інструмент керування користувачами Мандріва Лінакса"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr "/_Встановити обліковий запис для гостей"
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr "/В_илучити обліковий запис для гостей"
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Дії"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/Виправити"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/Вилучити"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/Параметри"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/Фільтрувати системних користувачів"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/Файл"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/Поновити"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/Вийти"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/Додати користувача"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Додати групу"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/Довідка"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/Звіт про помилку"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/Про програму..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Пошук:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Застосувати фільтр"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Користувачі"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Групи"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Користувачі і групи"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Ім'я користувача"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Код користувача"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Первинна група"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Повна назва"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Командний рядок реєстрації"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Домівка користувача"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Статус"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Назва групи"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Код групи"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Члени групи"
 
 # broken into two lines to avoid too large a button
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Додати користувача"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Додати користувача до системи"
 
 # broken into two lines to avoid too large a button
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Додати групу"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Додати групу до системи"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Виправити"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Виправити вибраний рядок"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Видалити"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Видалити вибраний рядок"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Поновити"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Поновити список"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Заблоковано"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Термін закінчився"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Клацніть на іконці, щоб змінити"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Створити нового користувача"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Створити домівку користувача"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Домівка користувача: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Створити особисту групу для користувача"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Задати код користувача вручну"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Такий користувач вже є, будь ласка, задайте інше ім'я користувача"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Паролі не збігаються"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -335,12 +387,12 @@ msgstr ""
 "Цей пароль занадто простий. \n"
 " Хороший пароль повинен мати > 6 символів"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Код користувача менший за 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -351,27 +403,27 @@ msgstr ""
 " Ви впевнені, що хочете зробити саме так?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Додається %s в групу 'users'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Створюється нова група: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Додається користувач: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "Помічник переходу"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -380,64 +432,64 @@ msgstr ""
 "Чи хочете Ви запустити Помічника переходу, щоб імпортувати налаштування і "
 "документи Віндовс у свій дистрибутив Мандріва Лінакс."
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Гаразд"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "Код користувача: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Виберіть групу"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Додати в існуючу групу"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Додати в групу 'users'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Група з такою назвою вже існує. Що б Ви хотіли зробити?"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Створити нову групу"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Задати код групи вручну"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Група вже існує, будь ласка, вкажіть іншу назву групи"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "Код групи менший за 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -448,22 +500,22 @@ msgstr ""
 " Ви впевнені, що хочете зробити саме так?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Додається група: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "Код групи: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Видалити файли, чи ні?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -472,27 +524,27 @@ msgstr ""
 "Вилучається користувач %s\n"
 " Також виконуються наступні дії\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Видалити домівку користувача: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Видалити поштову скриньку :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Вилучається користувач: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Ви справді хочете видалити групу %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -501,200 +553,207 @@ msgstr ""
 "%s є первинною групою для користувача %s\n"
 " Спочатку вилучіть користувача"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Вилучається група: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Повна назва:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Ім'я:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Підтвердіть пароль:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Командний рядок реєстрації:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Назва групи:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Редагувати Групи / Користувачів"
+msgid "Please select at least one group for the user"
+msgstr "Будь ласка, виберіть хоч одну групу для користувача"
 
-#: ../userdrake:699
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Будь ласка, задайте рік, місяць і день \n"
+" закінчення дії рахунку "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Будь ласка, заповніть всі поля, щоб встановити термін дії пароля\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Ви не можете вилучити користувача '%s' з його первинної групи"
+
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Домівка:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Дані користувача"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Увімкнути обмеження рахунків"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Термін дії рахунка закінчується (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Заблокувати облік користувачів"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Інформація про користувачів"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Остання зміна пароля користувачем: "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Увімкнути обмеження терміну дії пароля"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Дозволено днів перед зміною :"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Необхідно днів перед зміною :"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Днів попередження перед зміною :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Днів до завершення дії рахунка :"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Інформація про пароль"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Виберіть групи, членом яких буде користувач:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Дані групи"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Виберіть користувачів, яких включити в цю групу :"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Згрупувати користувачів"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Будь ласка, виберіть хоч одну групу для користувача"
-
-#: ../userdrake:856
-#, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Будь ласка, задайте рік, місяць і день \n"
-" закінчення дії рахунку "
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "Будь ласка, заповніть всі поля, щоб встановити термін дії пароля\n"
-
-#: ../userdrake:905
+#: ../userdrake:1127
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Ви не можете вилучити користувача '%s' з його первинної групи"
+msgid "Edit Groups / Users"
+msgstr "Редагувати Групи / Користувачів"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Закрити"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Керування користувачами"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Taras Boychuk <btr0001@ukr.net>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Поле з назвою порожнє, будь ласка, введіть назву."
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 "Назва може складатися тільки з малих латинських літер, цифр, `-' та `_'"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Назва занадто довга"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Помилка"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "невідома помилка"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Помилка при створенні `%s': %s"
diff --git a/po/userdrake.pot b/po/userdrake.pot
index 101ec37..80aca17 100644
--- a/po/userdrake.pot
+++ b/po/userdrake.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\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"
@@ -16,318 +16,369 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr ""
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr ""
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+msgid "Group creation failed.\n"
+msgstr ""
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr ""
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr ""
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr ""
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr ""
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr ""
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr ""
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr ""
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr ""
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr ""
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr ""
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr ""
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr ""
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr ""
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr ""
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr ""
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr ""
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr ""
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr ""
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr ""
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr ""
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr ""
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr ""
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr ""
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr ""
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr ""
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr ""
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr ""
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr ""
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr ""
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr ""
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr ""
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr ""
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr ""
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr ""
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr ""
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -335,91 +386,91 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr ""
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr ""
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr ""
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr ""
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr ""
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr ""
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr ""
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -427,245 +478,245 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr ""
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr ""
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
 " Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr ""
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr ""
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr ""
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr ""
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr ""
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr ""
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr ""
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr ""
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr ""
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr ""
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
+msgid "Please select at least one group for the user"
+msgstr ""
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr ""
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr ""
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr ""
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr ""
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr ""
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr ""
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr ""
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr ""
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr ""
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr ""
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr ""
 
-#: ../userdrake:847
+#: ../userdrake:1127
 #, c-format
-msgid "Please select at least one group for the user"
-msgstr ""
-
-#: ../userdrake:856
-#, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr ""
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
+msgid "Edit Groups / Users"
 msgstr ""
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr ""
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr ""
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr ""
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr ""
diff --git a/po/uz.po b/po/uz.po
index bf06e61..cf0ee98 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\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"
@@ -25,307 +25,358 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, fuzzy, c-format
 msgid "Error removing `%s': %s"
 msgstr "Foydalanuvchi olib tashlanmoqda: %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr ""
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "noma'lum xato"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+msgid "Group creation failed.\n"
+msgstr ""
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr ""
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake - foydalanuvchilarni boshqarish"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Foydalanuvchi va guruhlar yuklanmoqda, iltimos kutib turing..."
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux uchun foydalanuvchilarni boshqarish vositasi"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Amallar"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Tuzatish"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_O'chirish"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Parametrlar"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Sistema foydalanuvchilarini filterlash"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Fayl"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Yangilash"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/Chi_qish"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Foydalanuvchini qo'shish"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/_Guruhni qo'shish"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Yordam"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Xato haqida xabar qilish"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Haqida"
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Qidirish:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Filterni qo'llash"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Foydalanuvchilar"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Guruhlar"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Foydalanuvchi va guruhlar"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Foydalanuvchi"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Foydalanuvchining ID'si"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Asosiy guruh"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "To'liq ismi"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Kirish konsoli"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Uy direktoriyasi"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Holati"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Guruhning nomi"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Guruhning ID'si"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Guruh a'zolari"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Foydalanuvchini qo'shish"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Sistemaga foydalanuvchini qo'shish"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Guruhni qo'shish"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Sistemaga guruhni qo'shish"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Tuzatish"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Belgilangan qatorni tuzatish"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "O'chirish"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Belgilangan qatorni o'chirish"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Yangilash"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Ro'yxatni yangilash"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Qulflangan"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Muddati o'tgan"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Buni o'zgartirish uchun nishonchani bosing"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Yangi foydalanuvchini yaratish"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Uy direktoriyani yaratish"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Uy direktoriyasi: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Foydalanuvchi uchun shaxsiy guruhni yaratish"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr ""
 "Foydalanuvchi allaqachon mavjud, iltimos boshqa foydalanuvchini tanlang"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Maxfiy so'z mos kelmadi"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -334,12 +385,12 @@ msgstr ""
 "Bu maxfiy so'z juda sodda. \n"
 "Yaxshi maxfiy so'z 6 belgidan ko'p bo'lishi kerak"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Foydalanuvchining UID'si 500 dan kam"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -350,91 +401,91 @@ msgstr ""
 " Buni bajarishga ishonchingiz komilmi?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "%s \"users\" guruhiga qo'shilmoqda"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Yangi guruh yaratilmoqda: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Foydalanuvchi qo'shilmoqda: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Bekor qilish"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, fuzzy, c-format
 msgid "Choose group"
 msgstr "Guruhni tanlang"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Mavjud bo'lgan guruhga qo'shish"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "\"users\" guruhiga qo'shish"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Yangi guruhni yaratish"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Guruh allaqachon mavjud, iltimos boshqa guruh nomini tanlang"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "Guruhning GID'si 500 dan kam"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -445,22 +496,22 @@ msgstr ""
 " Buni bajarishga ishonchingiz komilmi?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Guruh qo'shilmoqda: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, fuzzy, c-format
 msgid "Delete files or not?"
 msgstr "Belgilangan qatorni o'chirish"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -469,27 +520,27 @@ msgstr ""
 "Foydalanuvchi %s o'chirilmoqda\n"
 " Budan tashqari quyidagi amallarni bajarish\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Uy direktoriyasini o'chirish: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Pochta qutisini o'chirish :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Foydalanuvchi olib tashlanmoqda: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Rostdan \"%s\" guruhini o'chirmoqchimisiz?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -498,187 +549,187 @@ msgstr ""
 "Guruh %s foydalanuvchi %s uchun asosiy\n"
 " Avvalo foydalanuvchini o'chiring"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Guruh olib tashlanmoqda: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "To'liq ismi:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Foydalanuvchi:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Maxfiy so'z:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Maxfiy so'zni tasdiqlang:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Kirish konsoli:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Guruhning nomi:"
 
-#: ../userdrake:679
-#, fuzzy, c-format
-msgid "Edit Groups / Users"
-msgstr "Guruh foydalanuvchilari"
+#: ../userdrake:894
+#, c-format
+msgid "Please select at least one group for the user"
+msgstr "Iltimos foydalanuvchi uchun eng kamida bitta guruhni tanlang"
 
-#: ../userdrake:699
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Iltimos hisob muddati o'tish\n"
+" yilni, oyni va kunni ko'rsating "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Foydalanuvchini \"%s\" asosiy guruhidan o'chirib bo'lmaydi"
+
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Uy direktoriya:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Foydalanuvchining ma'lumotlari"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Hisob muddati o'tishini yoqish"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Hisobning muddati o'tadi (YYYY-OO-KK):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Foydalanuvchining hisobini qulflash"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Hisob haqida ma'lumot"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Foydalanuvchi oxirgi marta maxfiy so'zni o'zgartirgan sana : "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Maxfiy so'z muddati o'tishini yoqish"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Shuncha kundan so'ng o'zgartirish mumkin :"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Shuncha kundan so'ng o'zgartirish talab qilinadi :"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr ""
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Shuncha kundan so'ng hisob qulflanadi :"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Maxfiy so'z haqida ma'lumot"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Foydalanuvchi a'zo bo'ladigan guruhni tanlang:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Guruhning ma'lumoti"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Bu guruhga a'zo bo'ladigan foydalanuvchilarni tanlang:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Guruh foydalanuvchilari"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Iltimos foydalanuvchi uchun eng kamida bitta guruhni tanlang"
-
-#: ../userdrake:856
-#, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Iltimos hisob muddati o'tish\n"
-" yilni, oyni va kunni ko'rsating "
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr ""
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Foydalanuvchini \"%s\" asosiy guruhidan o'chirib bo'lmaydi"
+#: ../userdrake:1127
+#, fuzzy, c-format
+msgid "Edit Groups / Users"
+msgstr "Guruh foydalanuvchilari"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Yopish"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Foydalanuvchilar boshqaruvi"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Mashrab Quvatov <kmashrab@uni-bremen.de>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Foydalanuvchi maydoni bo'sh. Iltimos foydalanuvchini kiriting."
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
@@ -686,16 +737,24 @@ msgstr ""
 "Foydalanuvchi faqat kichik lotin harflar, sonlar. \"-\" va \"_\" "
 "belgilaridan iborat bo'lishi mumkin"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Foydalanuvchining ismi juda uzun"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Xato"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "noma'lum xato"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Foydalanuvchi olib tashlanmoqda: %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Mualliflar: "
 
diff --git a/po/uz@cyrillic.po b/po/uz@cyrillic.po
index 401f0f9..2a50ec0 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\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"
@@ -25,306 +25,357 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr ""
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, fuzzy, c-format
 msgid "Error removing `%s': %s"
 msgstr "Фойдаланувчи олиб ташланмоқда: %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr ""
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "номаълум хато"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+msgid "Group creation failed.\n"
+msgstr ""
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr ""
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake - фойдаланувчиларни бошқариш"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "Фойдаланувчи ва гуруҳлар юкланмоқда, илтимос кутиб туринг..."
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux учун фойдаланувчиларни бошқариш воситаси"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Амаллар"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Тузатиш"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Ўчириш"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Параметрлар"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Система фойдаланувчиларини филтерлаш"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Файл"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Янгилаш"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/Чи_қиш"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Фойдаланувчини қўшиш"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/_Гуруҳни қўшиш"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Ёрдам"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Хато ҳақида хабар қилиш"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/_Ҳақида"
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Қидириш:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Филтерни қўллаш"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Фойдаланувчилар"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Гуруҳлар"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Фойдаланувчи ва гуруҳлар"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Фойдаланувчи"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "Фойдаланувчининг ID'си"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Асосий гуруҳ"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Тўлиқ исми"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Кириш консоли"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Уй директорияси"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Ҳолати"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Гуруҳнинг номи"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "Гуруҳнинг ID'си"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Гуруҳ аъзолари"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Фойдаланувчини қўшиш"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Системага фойдаланувчини қўшиш"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Гуруҳни қўшиш"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Системага гуруҳни қўшиш"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Тузатиш"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Белгиланган қаторни тузатиш"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Ўчириш"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Белгиланган қаторни ўчириш"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Янгилаш"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Рўйхатни янгилаш"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Қулфланган"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Муддати ўтган"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Буни ўзгартириш учун нишончани босинг"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Янги фойдаланувчини яратиш"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Уй директорияни яратиш"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Уй директорияси: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Фойдаланувчи учун шахсий гуруҳни яратиш"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "Фойдаланувчи аллақачон мавжуд, илтимос бошқа фойдаланувчини танланг"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Махфий сўз мос келмади"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -333,12 +384,12 @@ msgstr ""
 "Бу махфий сўз жуда содда. \n"
 "Яхши махфий сўз 6 белгидан кўп бўлиши керак"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "Фойдаланувчининг UID'си 500 дан кам"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -349,91 +400,91 @@ msgstr ""
 " Буни бажаришга ишончингиз комилми?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "%s \"users\" гуруҳига қўшилмоқда"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Янги гуруҳ яратилмоқда: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Фойдаланувчи қўшилмоқда: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Бекор қилиш"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "Ок"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, fuzzy, c-format
 msgid "Choose group"
 msgstr "Гуруҳни танланг"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Мавжуд бўлган гуруҳга қўшиш"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "\"users\" гуруҳига қўшиш"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Бундай номли гуруҳ аллақачон мавжуд. Сиз нимани бажаришни истайсиз?"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Янги гуруҳни яратиш"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "Гуруҳ аллақачон мавжуд, илтимос бошқа гуруҳ номини танланг"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "Гуруҳнинг GID'си 500 дан кам"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -444,22 +495,22 @@ msgstr ""
 " Буни бажаришга ишончингиз комилми?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Гуруҳ қўшилмоқда: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, fuzzy, c-format
 msgid "Delete files or not?"
 msgstr "Белгиланган қаторни ўчириш"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -468,27 +519,27 @@ msgstr ""
 "Фойдаланувчи %s ўчирилмоқда\n"
 " Будан ташқари қуйидаги амалларни бажариш\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Уй директориясини ўчириш: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Почта қутисини ўчириш :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Фойдаланувчи олиб ташланмоқда: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Ростдан \"%s\" гуруҳини ўчирмоқчимисиз?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -497,187 +548,187 @@ msgstr ""
 "Гуруҳ %s фойдаланувчи %s учун асосий\n"
 " Аввало фойдаланувчини ўчиринг"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Гуруҳ олиб ташланмоқда: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Тўлиқ исми:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Фойдаланувчи:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Махфий сўз:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Махфий сўзни тасдиқланг:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Кириш консоли:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Гуруҳнинг номи:"
 
-#: ../userdrake:679
-#, fuzzy, c-format
-msgid "Edit Groups / Users"
-msgstr "Гуруҳ фойдаланувчилари"
+#: ../userdrake:894
+#, c-format
+msgid "Please select at least one group for the user"
+msgstr "Илтимос фойдаланувчи учун энг камида битта гуруҳни танланг"
 
-#: ../userdrake:699
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Илтимос ҳисоб муддати ўтиш\n"
+" йилни, ойни ва кунни кўрсатинг "
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Фойдаланувчини \"%s\" асосий гуруҳидан ўчириб бўлмайди"
+
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Уй директория:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Фойдаланувчининг маълумотлари"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Ҳисоб муддати ўтишини ёқиш"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Ҳисобнинг муддати ўтади (ЙЙЙЙ-ОО-КК):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Фойдаланувчининг ҳисобини қулфлаш"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Ҳисоб ҳақида маълумот"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "Фойдаланувчи охирги марта махфий сўзни ўзгартирган сана : "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Махфий сўз муддати ўтишини ёқиш"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Шунча кундан сўнг ўзгартириш мумкин :"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Шунча кундан сўнг ўзгартириш талаб қилинади :"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr ""
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Шунча кундан сўнг ҳисоб қулфланади :"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Махфий сўз ҳақида маълумот"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Фойдаланувчи аъзо бўладиган гуруҳни танланг:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Гуруҳнинг маълумоти"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Бу гуруҳга аъзо бўладиган фойдаланувчиларни танланг:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Гуруҳ фойдаланувчилари"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "Илтимос фойдаланувчи учун энг камида битта гуруҳни танланг"
-
-#: ../userdrake:856
-#, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Илтимос ҳисоб муддати ўтиш\n"
-" йилни, ойни ва кунни кўрсатинг "
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr ""
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Фойдаланувчини \"%s\" асосий гуруҳидан ўчириб бўлмайди"
+#: ../userdrake:1127
+#, fuzzy, c-format
+msgid "Edit Groups / Users"
+msgstr "Гуруҳ фойдаланувчилари"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Ёпиш"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Фойдаланувчилар бошқаруви"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Машраб Қуватов <kmashrab@uni-bremen.de>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Фойдаланувчи майдони бўш. Илтимос фойдаланувчини киритинг."
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
@@ -685,16 +736,24 @@ msgstr ""
 "Фойдаланувчи фақат кичик лотин ҳарфлар, сонлар. \"-\" ва \"_\" белгиларидан "
 "иборат бўлиши мумкин"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Фойдаланувчининг исми жуда узун"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Хато"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "номаълум хато"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Фойдаланувчи олиб ташланмоқда: %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Муаллифлар: "
 
diff --git a/po/vi.po b/po/vi.po
index 77c746d..7e8ffa3 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: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\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"
@@ -15,306 +15,358 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Lỗi đọc `%s': %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Lỗi tạo `%s': %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Lỗi gỡ bỏ `%s': %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Lỗi tạo mail spool.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Lỗi tạo mail spool.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Lỗi tạo mail spool.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "lỗi không xác định"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Lỗi tạo mail spool.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Lỗi xóa bỏ mail spool.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../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"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Công Cụ Quản Lý Người Dùng Mandriva Linux"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/Hành độn_g"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/Hiệu _Chỉnh"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Xóa"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/Tù_y chọn"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Lọc người dùng hệ thống"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Tệp"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Cập nhật"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/Th_oát"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/Thê_m người dùng"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Thêm _Nhóm"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/Trợ _Giúp"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Báo cáo lỗi"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/G_iới thiệu..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Tìm kiếm:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Áp dụng trình lọc"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Người dùng"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Nhóm"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Người Dùng và Nhóm"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "Tên Người Dùng"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID Người Dùng"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Nhóm chính"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "Tên Đầy Đủ"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Shell Đăng nhập"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Thư mục home"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Trạng thái"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "Tên Nhóm"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ID Nhóm"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Thành Viên Nhóm"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "Thêm Người Dùng"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Thêm người dùng vào hệ thống"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "Thêm Nhóm"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Thêm nhóm vào hệ thống"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Biên soạn"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Hiệu chỉnh hàng chọn"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Xóa"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Xóa hàng chọn"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Cập nhật"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Cập nhật lại Danh sách"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Bị khoá"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Hết hạn"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "Nhấn chuột lên biểu tượng để thay đổi"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Tạo người dùng mới"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Tạo thư mục home"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Thư mục home:"
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Tạo nhóm riêng cho người dùng"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Tự định ra ID người dùng"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, 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:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Mật khẩu không khớp"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -323,12 +375,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:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "UID người dùng là < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -339,91 +391,91 @@ msgstr ""
 "Bạn có chắc là muốn làm vậy không?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Đặt %s vào nhóm 'users'"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Tạo nhóm mới: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Thêm người dùng: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Bỏ qua"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Chọn nhóm"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Thêm vào nhóm đang tồn tại"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Thêm vào nhóm 'users'"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Tạo Nhóm Mới"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Tự định ra ID nhóm"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, 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:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "GID nhóm là < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -434,22 +486,22 @@ msgstr ""
 " Bạn có chắc là muốn làm như vậy?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Thêm nhóm:  %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Xóa các tập tin hay không?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -458,27 +510,27 @@ msgstr ""
 "Xóa người dùng %s\n"
 "Cũng thực hiện cả hành động sau đây\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Xóa thư mục home: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Xóa hộp thư :/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Xóa bỏ người dùng: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, 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:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -487,201 +539,209 @@ 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:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Xóa bỏ nhóm: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "Tên Đầy Đủ:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "Đăng nhập:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Mật khẩu:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Xác Nhận Mật Khẩu:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell Đăng nhập:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "Tên Nhóm:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Hiệu chỉnh Người Dùng / Nhóm"
+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:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Hãy chỉ ra Năm, Tháng, Ngày cho \n"
+"thời hạn của Tài Khoản"
+
+#: ../userdrake:914
+#, 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:965
+#, 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:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Home:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Dữ Liệu Người Dùng"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Tính thời hạn của người dùng"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Hạn người dùng (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Khoá Tài Khoản Người Dùng"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Thông tin tài khoản"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, 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:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Tính thời hạn của mật khẩu"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Số ngày trước khi cho phép đổi:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Số ngày trước khi yêu cầu đổi :"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Cảnh báo số ngày trước khi đổi :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Ngày trước khi tài khoản không hoạt động:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Thông Tin Mật Khẩu"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, 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:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Dữ Liệu Nhóm"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, 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:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Người Dùng Nhóm"
 
-#: ../userdrake:847
-#, 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:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Hãy chỉ ra Năm, Tháng, Ngày cho \n"
-"thời hạn của Tài Khoản"
-
-#: ../userdrake:862
-#, 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:905
-#, 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ó"
+msgid "Edit Groups / Users"
+msgstr "Hiệu chỉnh Người Dùng / Nhóm"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Đóng"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Quản Lý Người Dùng"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, 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:1038
+#: ../userdrake:1294
 #, 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:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Tên quá dài"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Lỗi"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "lỗi không xác định"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Lỗi tạo `%s': %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Tác giả:"
diff --git a/po/wa.po b/po/wa.po
index 45e7ceb..8fa9978 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2004-08-05 21:54+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -26,312 +26,364 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Åk n' a nén stî tot lijhant «%s»: %s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "Åk n' a nén stî tot askepiant «%s»: %s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "Åk n' a nén stî tot oistant «%s»: %s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "Åk n' a nén stî tot askepiant l' cawêye d' emilaedje.\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "Åk n' a nén stî tot askepiant l' cawêye d' emilaedje.\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "Åk n' a nén stî tot askepiant l' cawêye d' emilaedje.\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "aroke nén cnoxhowe"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "Åk n' a nén stî tot askepiant l' cawêye d' emilaedje.\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "Åk n' a nén stî tot disfaçant l' cawêye d' emilaedje.\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../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"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Usteye di manaedjmint des uzeus di Mandriva Linux"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/_Accions"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/_Candjî"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/_Disfacer"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/_Tchuzes"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/_Passete po les uzeus sistinme"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/_Fitchî"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Rafrister"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/Moussî _foû"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/_Radjouter uzeu"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/Radjouter _groupe"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/_Aidance"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Rapoirter bug"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/Å_d fwait..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "Cweri:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "Mete en alaedje li passete"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "Uzeus"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "Groupes"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "Uzeus et groupes"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "No di l' uzeu"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "ID di l' uzeu"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "Prumioûle groupe"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "No en etir"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "Shell d' elodjaedje"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "Ridant måjhon"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "Estat"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "No do groupe"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "ID do groupe"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "Mimbes do groupe"
 
 # broken into two lines to avoid too large a button
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr ""
 "Radjouter\n"
 "uzeu"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "Radjouter èn uzeu å sistinme"
 
 # broken into two lines to avoid too large a button
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr ""
 "Radjouter\n"
 "groupe"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "Radjouter on groupe å sistinme"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "Candjî"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "Candjî l' roye tchoezeye"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "Disfacer"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "Disfacer l' roye tchoezeye"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "Rafrister"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "Rafrister l' djivêye"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "Bloké"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "Espiré"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "clitchîz so l' imådjete pol candjî"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "Ahiver on novea uzeu"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "Ahiver l' ridant måjhon"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "Ridant måjhon: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "Ahiver on groupe privé po l' uzeu"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "Diner al mwin l' idintifiant di l' uzeu"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, 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:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "Les screts n' sont nén les minmes"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -340,12 +392,12 @@ msgstr ""
 "Li scret est pår trop simpe. \n"
 " On bon scret doet aveur pus di 6 caracteres"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "L' UID est < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -356,92 +408,92 @@ msgstr ""
 "n' est nén ricmandé. Estoz seur del voleur fé?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "Dji radjoute %s å groupe «users»"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "Dj' ahive li novea groupe: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "Dji radjoute l' uzeu: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr ""
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mandriva Linux distribution?"
 msgstr ""
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "Rinoncî"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "'l est bon"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "Tchoezi groupe"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "Radjouter å groupe k' egzistêye dedja"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "Radjouter å groupe «users»"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, 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:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "Ahiver on novea groupe"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "Diner al mwin l' idintifiant do groupe"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, 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:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " Li GID est < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -452,22 +504,22 @@ msgstr ""
 "n' est nén ricmandé. Estoz seur del voleur fé?\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "Dji radjoute li groupe: %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "Disfacer les fitchîs ou nén?"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -476,28 +528,28 @@ msgstr ""
 "Dji disface l' uzeu %s\n"
 " Dji fwai eto les accions shuvantes\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "Disfacer l' ridant måjhon: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "Disfacer l' boesse ås emiles: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "Dji oistêye l' uzeu: %s"
 
 # c-format
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "Voloz vs vormint disfacer l' groupe %s?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -506,187 +558,187 @@ msgstr ""
 "%s est l' groupe prumioûle da l' uzeu %s\n"
 " I vs fåt d' aprume oister l' uzeu"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "Dji oistêye li groupe: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "No en etir:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "No d' elodjaedje:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "Sicret:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "Acertinaedje do scret:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "Shell d' elodjaedje:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "No do groupe:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "Candjî groupes / uzeus"
+msgid "Please select at least one group for the user"
+msgstr "Tchoezixhoz pol moens on groupe po l' uzeu s' i vs plait"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"Dinez l' anêye, li moes eyet l' djoû \n"
+" ki l' conte doet espirer "
+
+#: ../userdrake:914
+#, 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:965
+#, 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:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "Måjhon:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "Dinêyes di l' uzeu"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "Mete en alaedje l' espiraedje des contes uzeu"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "Li conte espire li (AAAA-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "Bloker l' conte di l' uzeu"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "Informåcion do conte"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "L' uzeu candja si scret pol dierin côp li:"
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "Mete en alaedje l' espiraedje des screts"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "Djoûs dvant d' poleur candjî:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "Djoûs dvant dveur candjî:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "Djoûs d' adviertixhmint divant d' diveur candjî:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "Djoûs dvant ki l' conte soeye djoké:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "Informåcion sol sicret"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, 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:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "Dinêyes do groupe"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "Tchoezixhoz les uzeus k' iront dins ç' groupe chal:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "Uzeus do groupe"
 
-#: ../userdrake:847
-#, 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:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Dinez l' anêye, li moes eyet l' djoû \n"
-" ki l' conte doet espirer "
-
-#: ../userdrake:862
-#, 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:905
-#, 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"
+msgid "Edit Groups / Users"
+msgstr "Candjî groupes / uzeus"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "Clôre"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright © %s pa Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "Manaedjmint des uzeus"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Pablo Saratxaga <pablo@mandriva.com>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, 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:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
@@ -694,15 +746,23 @@ msgstr ""
 "Li no n' pout aveur ki des ptitès latenès letes, des chifes, li loyeure («-») "
 "et li caractere sorlignî («_»)."
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "Li no est pår trop long"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "Aroke"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "aroke nén cnoxhowe"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "Åk n' a nén stî tot askepiant «%s»: %s"
+
 #~ msgid "Authors: "
 #~ msgstr "Oteurs: "
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f36e513..906e4d2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2004-01-17 18:50+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Chinese <zh@li.org>\n"
@@ -20,306 +20,358 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "读取“%s”出错：%s"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "创建“%s”出错：%s"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "删除“%s”出错：%s"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "创建邮件持出错。\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "创建邮件持出错。\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "创建邮件持出错。\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "未知错误"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "创建邮件持出错。\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "删除邮件池出错。\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "正在装入用户和组... 请稍候"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux 用户管理工具"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/操作(_A)"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/删除(_D)"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/过滤系统用户(_F)"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/刷新(_R)"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/退出(_Q)"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/添加用户(_A)"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/添加组(_G)"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/报告错误(_R)"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/关于(_A)..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "搜索:"
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "应用过滤器"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "用户"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "组"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "用户和组"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "用户名"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "用户 ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "主要的组"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "全名"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "登录 Shell"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "主目录"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "状态"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "组名"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "组 ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "组成员"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "添加用户"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "向系统中添加一个用户"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "添加组"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "向系统中添加一个组"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "编辑"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "编辑所选的行"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "删除"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "删除所选的行"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "刷新"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "刷新列表"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "已锁定"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "已到期"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "单击图标进行更改"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "创建新用户"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "创建主目录"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "用户主目录: "
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "为该用户创建一个私有组"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "手动指定用户 ID"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "用户已经存在，请选择其他用户名"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "密码不匹配"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -328,12 +380,12 @@ msgstr ""
 "这个密码太简单了。\n"
 "好的密码应该大于 6 个字符"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "用户的 UID 小于 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -344,27 +396,27 @@ msgstr ""
 "您确定您要这么做吗?\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "将 %s 添加到“users”组"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "创建新组: %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "添加用户: %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "迁移向导"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -373,64 +425,64 @@ msgstr ""
 "您是否想要运行迁移向导将 Windows 文档和设置导入到您的 Mandriva Linux 发行版"
 "中？"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "选择组"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "添加到已有组"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "添加到“users”组"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "已经存在同名组。您想要怎么做？"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "创建新组"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "手动指定组 ID"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "组已经存在，请使用其他组名"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "组的 GID 小于 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -441,22 +493,22 @@ msgstr ""
 "您确定您要这么做吗？\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "添加组: %s"
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "删除文件吗？"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -465,27 +517,27 @@ msgstr ""
 "删除用户 %s\n"
 " 同时执行下列操作\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "删除主目录: %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "删除邮箱: /var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "删除用户: %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "您真的想要删除组 %s 吗?"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -494,202 +546,210 @@ msgstr ""
 "%s 是用户 %s 的主要组\n"
 "请先删除这个用户"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "删除组: %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "全名:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "登录名:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "密码:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "确认密码:"
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "登录 Shell:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "组名:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "编辑组/用户"
+msgid "Please select at least one group for the user"
+msgstr "请为这个用户至少选择一个组"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"请指定账户过期的\n"
+"年月日"
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "请填满密码时效的所有域\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "您不能从用户“%s”的主要组中删除该用户"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "主目录:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "用户数据"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "启用账户过期"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "账户过期到 (YYYY-MM-DD):"
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "锁定用户账户"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "账户信息"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "用户最后一次修改密码的时间: "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "启用密码过期"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "允许修改前的天数:"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "必须修改前的天数:"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "更改前警告的天数:"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "账户不被激活前的天数:"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "密码信息"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "选择该用户将属于哪些组:"
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "组数据"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "选择要加入这个组的用户:"
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "组用户"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "请为这个用户至少选择一个组"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"请指定账户过期的\n"
-"年月日"
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "请填满密码时效的所有域\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "您不能从用户“%s”的主要组中删除该用户"
+msgid "Edit Groups / Users"
+msgstr "编辑组/用户"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "版权 (C) %s Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "用户管理"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Funda Wang <fundawang@gmail.com>\n"
 
-#: ../userdrake:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "名字栏是空的，请提供一个名字"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "名字只能小写的拉丁字母、数字、“-”和“_”"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "名字太长了"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "错误"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "未知错误"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "创建“%s”出错：%s"
+
 #~ msgid "Authors: "
 #~ msgstr "作者: "
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 42094ed..67a6f55 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 19:06+0200\n"
+"POT-Creation-Date: 2010-02-02 02:53+0100\n"
 "PO-Revision-Date: 2007-09-24 23:35+0800\n"
 "Last-Translator: You-Cheng Hsieh <yochenhsieh@gmail.com>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -28,306 +28,358 @@ msgstr ""
 "X-Poedit-Country: TAIWAN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../USER/USER.xs:84
+#: ../USER/USER.xs:86
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "讀取 `%s'： %s 時發生錯誤"
 
-#: ../USER/USER.xs:91
+#: ../USER/USER.xs:93 ../USER/USER.xs:526
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "建立 `%s'： %s 時發生錯誤"
 
-#: ../USER/USER.xs:203 ../USER/USER.xs:232 ../USER/USER.xs:248
+#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
 #, c-format
 msgid "Error removing `%s': %s"
 msgstr "移除 `%s'： %s 時發生錯誤"
 
-#: ../USER/USER.xs:530
+#: ../USER/USER.xs:490
+#, fuzzy, c-format
+msgid "Account creation failed: '%s'.\n"
+msgstr "建立郵件夾時發生錯誤。\n"
+
+#: ../USER/USER.xs:503
+msgid "Cannot get Uid number"
+msgstr ""
+
+#: ../USER/USER.xs:515
+msgid "Cannot retrieve val"
+msgstr ""
+
+#: ../USER/USER.xs:532
 msgid "Error creating mail spool.\n"
 msgstr "建立郵件夾時發生錯誤。\n"
 
-#: ../USER/USER.xs:616
+#: ../USER/USER.xs:582
+#, fuzzy, c-format
+msgid "User could not be modified: '%s'.\n"
+msgstr "建立郵件夾時發生錯誤。\n"
+
+#: ../USER/USER.xs:592
+#, c-format
+msgid "User Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
+#, c-format
+msgid "Failed to set password: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:618
 msgid "unknown error"
 msgstr "未知的錯誤"
 
-#: ../USER/USER.xs:879
+#: ../USER/USER.xs:685
+#, fuzzy
+msgid "Group creation failed.\n"
+msgstr "建立郵件夾時發生錯誤。\n"
+
+#: ../USER/USER.xs:695
+#, c-format
+msgid "Group could not be modified: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:705
+#, c-format
+msgid "Group could not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:863
+msgid "No home directory for the user.\n"
+msgstr ""
+
+#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#, c-format
+msgid "Home Directory Could Not be deleted: '%s'.\n"
+msgstr ""
+
+#: ../USER/USER.xs:881
 msgid "Error deleting mail spool.\n"
 msgstr "刪除郵件夾時發生錯誤。\n"
 
-#: ../userdrake:55 ../userdrake:1019
+#: ../userdrake:59 ../userdrake:1272
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:60
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "正在載入使用者與群組... 請稍候"
 
-#: ../userdrake:79
+#: ../userdrake:83
 #, c-format
 msgid "Mandriva Linux Users Management Tool"
 msgstr "Mandriva Linux 使用者管理工具"
 
-#: ../userdrake:94
+#: ../userdrake:96
 #, c-format
 msgid "/_Install guest account"
 msgstr ""
 
-#: ../userdrake:95
+#: ../userdrake:97
 #, c-format
 msgid "/_Uninstall guest account"
 msgstr ""
 
-#: ../userdrake:99 ../userdrake:100 ../userdrake:101 ../userdrake:109
-#: ../userdrake:110 ../userdrake:111
+#: ../userdrake:101 ../userdrake:102 ../userdrake:103 ../userdrake:114
+#: ../userdrake:115 ../userdrake:116
 #, c-format
 msgid "/_Actions"
 msgstr "/動作 (_A)"
 
-#: ../userdrake:89
+#: ../userdrake:101
 #, c-format
 msgid "/_Edit"
 msgstr "/編輯 (_E)"
 
-#: ../userdrake:90
+#: ../userdrake:102
 #, c-format
 msgid "/_Delete"
 msgstr "/刪除 (_D)"
 
-#: ../userdrake:91 ../userdrake:103
+#: ../userdrake:104 ../userdrake:120
 #, c-format
 msgid "/_Options"
 msgstr "/選項 (_O)"
 
-#: ../userdrake:91
+#: ../userdrake:104
 #, c-format
 msgid "/_Filter system users"
 msgstr "/過濾系統使用者 (_F)"
 
-#: ../userdrake:95 ../userdrake:96 ../userdrake:97
+#: ../userdrake:109 ../userdrake:110 ../userdrake:113
 #, c-format
 msgid "/_File"
 msgstr "/檔案 (_F)"
 
-#: ../userdrake:96
+#: ../userdrake:110
 #, c-format
 msgid "/_Refresh"
 msgstr "/更新 (_R)"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "/_Quit"
 msgstr "/離開 (_Q)"
 
-#: ../userdrake:97
+#: ../userdrake:113
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake:99
+#: ../userdrake:115
 #, c-format
 msgid "/_Add User"
 msgstr "/新增使用者 (_A)"
 
-#: ../userdrake:100
+#: ../userdrake:116
 #, c-format
 msgid "/Add _Group"
 msgstr "/新增群組 (_G)"
 
-#: ../userdrake:108 ../userdrake:109 ../userdrake:110 ../userdrake:111
+#: ../userdrake:125 ../userdrake:126 ../userdrake:127 ../userdrake:130
 #, c-format
 msgid "/_Help"
 msgstr "/輔助說明 (_H)"
 
-#: ../userdrake:110
+#: ../userdrake:127
 #, c-format
 msgid "/_Report Bug"
 msgstr "/回報臭蟲 (_R)"
 
-#: ../userdrake:111
+#: ../userdrake:130
 #, c-format
 msgid "/_About..."
 msgstr "/關於 (_A)..."
 
-#: ../userdrake:126
+#: ../userdrake:148
 #, c-format
 msgid "Search:"
 msgstr "搜尋："
 
-#: ../userdrake:129
+#: ../userdrake:154
 #, c-format
 msgid "Apply filter"
 msgstr "套用過濾條件"
 
-#: ../userdrake:131
+#: ../userdrake:158
 #, c-format
 msgid "Users"
 msgstr "使用者"
 
-#: ../userdrake:133 ../userdrake:742
+#: ../userdrake:162 ../userdrake:1041
 #, c-format
 msgid "Groups"
 msgstr "群組"
 
 #. -PO: do not translate, this is already translated in mcc
-#: ../userdrake:142
+#: ../userdrake:168
 #, c-format
 msgid "Users and groups"
 msgstr "使用者與群組"
 
-#: ../userdrake:157
+#: ../userdrake:186
 #, c-format
 msgid "User Name"
 msgstr "使用者名稱"
 
-#: ../userdrake:154
+#: ../userdrake:186
 #, c-format
 msgid "User ID"
 msgstr "使用者 ID"
 
-#: ../userdrake:154 ../userdrake:739
+#: ../userdrake:186 ../userdrake:1038
 #, c-format
 msgid "Primary Group"
 msgstr "主群組"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Full Name"
 msgstr "全名"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Login Shell"
 msgstr "預設的 Shell"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Home Directory"
 msgstr "家目錄"
 
-#: ../userdrake:154
+#: ../userdrake:187
 #, c-format
 msgid "Status"
 msgstr "狀態"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Name"
 msgstr "群組名稱"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group ID"
 msgstr "群組 ID"
 
-#: ../userdrake:161
+#: ../userdrake:194
 #, c-format
 msgid "Group Members"
 msgstr "群組成員"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add User"
 msgstr "新增使用者"
 
-#: ../userdrake:163
+#: ../userdrake:196
 #, c-format
 msgid "Add a user to the system"
 msgstr "新增一個使用者到系統"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add Group"
 msgstr "新增群組"
 
-#: ../userdrake:164
+#: ../userdrake:197
 #, c-format
 msgid "Add a group to the system"
 msgstr "新增一個群組到系統"
 
-#: ../userdrake:165 ../userdrake:602
+#: ../userdrake:198 ../userdrake:739
 #, c-format
 msgid "Edit"
 msgstr "編輯"
 
-#: ../userdrake:165
+#: ../userdrake:198
 #, c-format
 msgid "Edit selected row"
 msgstr "編輯選擇的行"
 
-#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
+#: ../userdrake:199 ../userdrake:674 ../userdrake:707 ../userdrake:739
 #, c-format
 msgid "Delete"
 msgstr "刪除"
 
-#: ../userdrake:166
+#: ../userdrake:199
 #, c-format
 msgid "Delete selected row"
 msgstr "刪除選擇的行"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh"
 msgstr "更新"
 
-#: ../userdrake:167
+#: ../userdrake:200
 #, c-format
 msgid "Refresh the list"
 msgstr "更新列表"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Locked"
 msgstr "被鎖住了"
 
-#: ../userdrake:204
+#: ../userdrake:263
 #, c-format
 msgid "Expired"
 msgstr "過期的"
 
-#: ../userdrake:258
+#: ../userdrake:339
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "點選圖示以改變它"
 
-#: ../userdrake:300
+#: ../userdrake:385
 #, c-format
 msgid "Create New User"
 msgstr "建立新的使用者"
 
-#: ../userdrake:307
+#: ../userdrake:391
 #, c-format
 msgid "Create Home Directory"
 msgstr "建立家目錄"
 
-#: ../userdrake:309
+#: ../userdrake:393
 #, c-format
 msgid "Home Directory: "
 msgstr "家目錄："
 
-#: ../userdrake:312
+#: ../userdrake:396
 #, c-format
 msgid "Create a private group for the user"
 msgstr "建立一個私有的群組給使用者"
 
-#: ../userdrake:313
+#: ../userdrake:397
 #, c-format
 msgid "Specify user ID manually"
 msgstr "手動指定使用者 ID"
 
-#: ../userdrake:327
+#: ../userdrake:414
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "這個使用者已經存在於系統中，請另外選取一個使用者名稱"
 
-#: ../userdrake:329 ../userdrake:817
+#: ../userdrake:419 ../userdrake:860
 #, c-format
 msgid "Password Mismatch"
 msgstr "密碼錯誤"
 
-#: ../userdrake:330 ../userdrake:819
+#: ../userdrake:422 ../userdrake:863
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -336,12 +388,12 @@ msgstr ""
 "這個密碼太簡單。 \n"
 " 好的密碼應該至少有 6 個字元"
 
-#: ../userdrake:341
+#: ../userdrake:434
 #, c-format
 msgid "User Uid is < 500"
 msgstr "使用者 Uid < 500"
 
-#: ../userdrake:341
+#: ../userdrake:435
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -352,27 +404,27 @@ msgstr ""
 " 您確定要這樣做嗎？\n"
 "\n"
 
-#: ../userdrake:356
+#: ../userdrake:450
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "放置 %s 到 'users' 群組"
 
-#: ../userdrake:362
+#: ../userdrake:457
 #, c-format
 msgid "Creating new group: %s"
 msgstr "建立新的群組： %s"
 
-#: ../userdrake:371
+#: ../userdrake:466
 #, c-format
 msgid "Adding user: %s"
 msgstr "新增使用者： %s"
 
-#: ../userdrake:392
+#: ../userdrake:478
 #, c-format
 msgid "Migration wizard"
 msgstr "檔案及設定轉移精靈"
 
-#: ../userdrake:393
+#: ../userdrake:479
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
@@ -380,64 +432,64 @@ msgid ""
 msgstr ""
 "您想要執行精靈來轉移 Windows 中的檔案及設定到您的 Mandriva Linux 發行版嗎？"
 
-#: ../userdrake:398 ../userdrake:436 ../userdrake:480 ../userdrake:568
-#: ../userdrake:597 ../userdrake:934
+#: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
+#: ../userdrake:707 ../userdrake:1163
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
-#: ../userdrake:1055
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1163
+#: ../userdrake:1314
 #, c-format
 msgid "Ok"
 msgstr "確定"
 
-#: ../userdrake:396
+#: ../userdrake:497
 #, c-format
 msgid "UID: "
 msgstr "UID："
 
-#: ../userdrake:408
+#: ../userdrake:510
 #, c-format
 msgid "Choose group"
 msgstr "選取群組"
 
-#: ../userdrake:410
+#: ../userdrake:512 ../userdrake:513
 #, c-format
 msgid "Add to the existing group"
 msgstr "新增到已經存在的群組"
 
-#: ../userdrake:410
+#: ../userdrake:514
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "新增到 'users' 群組"
 
-#: ../userdrake:413
+#: ../userdrake:516
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "一個同名的群組已經存在，您要怎麼處理呢？"
 
-#: ../userdrake:434
+#: ../userdrake:546
 #, c-format
 msgid "Create New Group"
 msgstr "建立新的群組"
 
-#: ../userdrake:440
+#: ../userdrake:551
 #, c-format
 msgid "Specify group ID manually"
 msgstr "手動指定群組 ID"
 
-#: ../userdrake:451
+#: ../userdrake:567
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "群組已經存在，請另外選擇一個群組名稱"
 
-#: ../userdrake:455
+#: ../userdrake:573
 #, c-format
 msgid " Group Gid is < 500"
 msgstr " 群組 Gid < 500"
 
-#: ../userdrake:455
+#: ../userdrake:574
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -448,22 +500,22 @@ msgstr ""
 " 您確定要這樣做嗎？\n"
 "\n"
 
-#: ../userdrake:460
+#: ../userdrake:581
 #, c-format
 msgid "Adding group: %s "
 msgstr "正在新增群組： %s "
 
-#: ../userdrake:471
+#: ../userdrake:591
 #, c-format
 msgid "GID: "
 msgstr "GID："
 
-#: ../userdrake:516 ../userdrake:560
+#: ../userdrake:636
 #, c-format
 msgid "Delete files or not?"
 msgstr "是否要刪除檔案？"
 
-#: ../userdrake:520
+#: ../userdrake:639
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -472,27 +524,27 @@ msgstr ""
 "正在刪除使用者 %s\n"
 " 也執行下列動作\n"
 
-#: ../userdrake:521
+#: ../userdrake:641
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "刪除家目錄： %s"
 
-#: ../userdrake:522
+#: ../userdrake:642
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "刪除郵件匝：/var/spool/mail/%s"
 
-#: ../userdrake:529
+#: ../userdrake:651
 #, c-format
 msgid "Removing user: %s"
 msgstr "移除使用者： %s"
 
-#: ../userdrake:561
+#: ../userdrake:684
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "您真的要刪除群組 %s 嗎？"
 
-#: ../userdrake:573
+#: ../userdrake:697
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -501,203 +553,211 @@ msgstr ""
 "%s 是使用者 %s 的主群組\n"
 " 請先移除使用者"
 
-#: ../userdrake:580
+#: ../userdrake:702
 #, c-format
 msgid "Removing group: %s"
 msgstr "移除群組： %s"
 
-#: ../userdrake:649
+#: ../userdrake:798
 #, c-format
 msgid "Full Name:"
 msgstr "全名:"
 
-#: ../userdrake:650
+#: ../userdrake:800
 #, c-format
 msgid "Login:"
 msgstr "登入:"
 
-#: ../userdrake:651
+#: ../userdrake:802
 #, c-format
 msgid "Password:"
 msgstr "密碼:"
 
-#: ../userdrake:652
+#: ../userdrake:804
 #, c-format
 msgid "Confirm Password:"
 msgstr "確認密碼："
 
-#: ../userdrake:653
+#: ../userdrake:806
 #, c-format
 msgid "Login Shell:"
 msgstr "預設的 Shell:"
 
-#: ../userdrake:664
+#: ../userdrake:820
 #, c-format
 msgid "Group Name:"
 msgstr "群組名稱:"
 
-#: ../userdrake:679
+#: ../userdrake:894
 #, c-format
-msgid "Edit Groups / Users"
-msgstr "編輯群組/使用者"
+msgid "Please select at least one group for the user"
+msgstr "請選擇至少一個群組給此使用者"
+
+#: ../userdrake:904
+#, c-format
+msgid ""
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
+msgstr ""
+"請指定年、月與日 \n"
+" 為帳號的使用期限"
+
+#: ../userdrake:914
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "請再次填入全部密碼欄位\n"
+
+#: ../userdrake:965
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "您不能從使用者 '%s' 的主群組移除他"
 
-#: ../userdrake:699
+#: ../userdrake:986
 #, c-format
 msgid "Home:"
 msgstr "家目錄:"
 
-#: ../userdrake:701
+#: ../userdrake:988
 #, c-format
 msgid "User Data"
 msgstr "使用者資料"
 
-#: ../userdrake:704
+#: ../userdrake:992
 #, c-format
 msgid "Enable account expiration"
 msgstr "啟用帳號使用期限"
 
-#: ../userdrake:706
+#: ../userdrake:994
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "帳號可使用至 (YYYY-MM-DD)："
 
-#: ../userdrake:712
+#: ../userdrake:1002
 #, c-format
 msgid "Lock User Account"
 msgstr "鎖住使用者帳號"
 
-#: ../userdrake:715
+#: ../userdrake:1005
 #, c-format
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: ../userdrake:720
+#: ../userdrake:1010
 #, c-format
 msgid "User last changed password on: "
 msgstr "使用者最後改變密碼於 : "
 
-#: ../userdrake:724
+#: ../userdrake:1017
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "啟用密碼使用期限"
 
-#: ../userdrake:727
+#: ../userdrake:1022
 #, c-format
 msgid "Days before change allowed:"
 msgstr "允許改變之前的日數 :"
 
-#: ../userdrake:728
+#: ../userdrake:1024
 #, c-format
 msgid "Days before change required:"
 msgstr "需要改變之前的日數 :"
 
-#: ../userdrake:729
+#: ../userdrake:1026
 #, c-format
 msgid "Days warning before change:"
 msgstr "改變之前的日數警告 :"
 
-#: ../userdrake:730
+#: ../userdrake:1028
 #, c-format
 msgid "Days before account inactive:"
 msgstr "帳號凍結之前的日數 :"
 
-#: ../userdrake:732
+#: ../userdrake:1031
 #, c-format
 msgid "Password Info"
 msgstr "密碼資訊"
 
-#: ../userdrake:736
+#: ../userdrake:1035
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "選擇使用者要加入的群組："
 
-#: ../userdrake:781
+#: ../userdrake:1102
 #, c-format
 msgid "Group Data"
 msgstr "群組數據"
 
-#: ../userdrake:784
+#: ../userdrake:1105
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "選擇要加入此群組的使用者："
 
-#: ../userdrake:785
+#: ../userdrake:1107
 #, c-format
 msgid "Group Users"
 msgstr "群組使用者"
 
-#: ../userdrake:847
-#, c-format
-msgid "Please select at least one group for the user"
-msgstr "請選擇至少一個群組給此使用者"
-
-#: ../userdrake:856
+#: ../userdrake:1127
 #, c-format
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"請指定年、月與日 \n"
-" 為帳號的使用期限"
-
-#: ../userdrake:862
-#, c-format
-msgid "Please fill up all fields in password aging\n"
-msgstr "請再次填入全部密碼欄位\n"
-
-#: ../userdrake:905
-#, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "您不能從使用者 '%s' 的主群組移除他"
+msgid "Edit Groups / Users"
+msgstr "編輯群組/使用者"
 
-#: ../userdrake:1012
+#: ../userdrake:1264
 #, c-format
 msgid "Close"
 msgstr "關閉"
 
-#: ../userdrake:1033
+#: ../userdrake:1274
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../userdrake:1036
+#: ../userdrake:1277
 #, c-format
 msgid "Users Management"
 msgstr "使用者管理"
 
-#: ../userdrake:1038
+#: ../userdrake:1279
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1044
+#: ../userdrake:1285
 #, 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:1051
+#: ../userdrake:1292
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "名稱欄位是空白的，請提供一個名稱"
 
-#: ../userdrake:1038
+#: ../userdrake:1294
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "名稱中只能包含小寫的拉丁字母、數字、`-' 與 `_'"
 
-#: ../userdrake:1039
+#: ../userdrake:1297
 #, c-format
 msgid "Name is too long"
 msgstr "名稱太長"
 
-#: ../userdrake:1049
+#: ../userdrake:1310
 #, c-format
 msgid "Error"
 msgstr "錯誤"
 
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "未知的錯誤"
+
+#, fuzzy
+#~ msgid "Error creating %s: %s.\n"
+#~ msgstr "建立 `%s'： %s 時發生錯誤"
+
 #~ msgid "Authors: "
 #~ msgstr "作者："
author	Thierry Vignaud <tv@mandriva.org>	2010-02-02 08:44:09 +0000
committer	Thierry Vignaud <tv@mandriva.org>	2010-02-02 08:44:09 +0000
commit	51c4e31c0ed0f881d6dde0d45b186f1f9d9c0986 (patch)
tree	0b5b0046d170016650fbc110d2d2930a9266453c
parent	15a8d265dea93d18c687d49b662d4aa0b9e9cc2b (diff)
download	userdrake-51c4e31c0ed0f881d6dde0d45b186f1f9d9c0986.tar userdrake-51c4e31c0ed0f881d6dde0d45b186f1f9d9c0986.tar.gz userdrake-51c4e31c0ed0f881d6dde0d45b186f1f9d9c0986.tar.bz2 userdrake-51c4e31c0ed0f881d6dde0d45b186f1f9d9c0986.tar.xz userdrake-51c4e31c0ed0f881d6dde0d45b186f1f9d9c0986.zip