updated pot file

56 files changed, 6055 insertions, 6318 deletions

diff --git a/po/ar.po b/po/ar.po
index 5bd8acc..fff2843 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2003-06-24 12:12-0300\n"
 "Last-Translator: Mohammed Gamal <f2c2001@yahoo.com>\n"
 "Language-Team: Arabic\n"
@@ -17,205 +17,205 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr "أداة Mandrake Linux لإدارة المستخدمين"
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 msgid "/_Actions"
 msgstr "/_أحداث"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 msgid "/_Edit"
 msgstr "/_تحرير"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 msgid "/_Delete"
 msgstr "/_حذف"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr "/تن_قية مستخدمي النظام"
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 msgid "/_Options"
 msgstr "/_خيارات"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 msgid "/_File"
 msgstr "/_ملف"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr "/تح_ديث"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr "/_خروج"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 msgid "/_Add User"
 msgstr "/_اضف مستخدم"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 msgid "/Add _Group"
 msgstr "/اضف م_جموعة"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 msgid "/_Help"
 msgstr "/مسا_عدة"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr "/أ_رسل تقرير بالعيوب"
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 msgid "/_About..."
 msgstr "/_حول..."
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "المستخدمون"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 msgid "Group Users"
 msgstr "مستخدمو المجموعة"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr "الإسم الكامل"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "Home Directory"
 msgstr "الدليل الخاص"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 msgid "Login Shell"
 msgstr "غلاف (سطر أوامر) الدخول"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr "المجموعة الأساسية"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "ابدأ TLS"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "User ID"
 msgstr "هوية المستخدم"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "User Name"
 msgstr "اسم المستخدم"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 msgid "Group ID"
 msgstr "هوية المجموعة"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 msgid "Group Members"
 msgstr "أعضاء المجموعة"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 msgid "Group Name"
 msgstr "اسم المجموعة"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add User"
 msgstr "اضف مستخدم"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr "اضافة مستخدم الى النظام"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 msgid "Add Group"
 msgstr "اضف مجموعة"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 msgid "Add a group to the system"
 msgstr "اضافة مجموعة الى النظام"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "تحرير"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr "تحرير الصف المختار"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "الغاء"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr "حذف الصف المختار"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr "تحديث"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh the list"
 msgstr "تحديث القائمة"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr "مساعدة عامة حول userdrake"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "مساعدة"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr "انشئ مستخدم جديد"
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 msgid "Create home Directory"
 msgstr "انشئ دليل خاص"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 msgid "Home Directory: "
 msgstr "الدليل الخاص: "
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr "انشئ مجموعة خاصة بالمستخدم"
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr "حدّد هوية المستخدم يدوياً"
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 msgid "User already exists, please choose another User Name"
 msgstr "المستخدم موجود مسبقاً, فضلاً اختر اسم مستخدم آخر"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 msgid "Password Mismatch"
 msgstr "كلمات المرور غير مطابقة"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
@@ -223,7 +223,7 @@ msgstr ""
 "كلمة المرور هذه بسيطة جداً. \n"
 " كلمات المرور الجيدة يجب أن تكون أكثر من 6 رموز"
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -233,61 +233,51 @@ msgstr ""
 " هل أنت متأكد أنك تريد فعل ذلك؟\n"
 "\n"
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr "هوية المستخدم أصغر من 500"
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "الغاء"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "موافق"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr "هوية المستخدم: "
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr "اختر مجموعة"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr "أضف الى مجموعة 'المستخدمين'"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr "أضف الى المجموعة الموجودة"
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "توجد مجموعة بهذا الإسم مسبقاً.  ماذا تريد أن تفعل؟"
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr "نعم"
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr "لا"
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr "حدّد هوية المجموعة يدوياً"
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr "المجموعة موجودة مسبقاً, فضلاً اختر اسم آخر للمجموعة"
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr " هوية المجموعة أصغر من 500"
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -297,19 +287,19 @@ msgstr ""
 " هل أنت متأكد أنك تريد فعل ذلك؟\n"
 "\n"
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr "هوية المجموعة: "
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid " Remove Home Directory"
 msgstr " احذف الدليل الخاص"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr "هل تريد حذف الدليل الخاص و صف البريد لهذا المستخدم؟"
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -318,91 +308,91 @@ msgstr ""
 "%s مجموعة أساسية للمستخدم %s\n"
 " احذف المستخدم أولاً"
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "اسم الدخول"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "كلمة المرور"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 msgid "Confirm Password:"
 msgstr "تأكيد كلمة المرور:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "الدليل الخاص"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 msgid "User Data"
 msgstr "بيانات المستخدم"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr "تمكين انهاء صالحية الحسابات"
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr "الحساب تنتهي صالحيته يوم   شهر/يوم/سنة :"
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr "اقفال حساب المستخدم"
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr "معلومات الحساب"
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr "قام المستخدم بتغيير كلمة مروره عند : "
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr "تمكين انهاء صالحية كلمات المرور"
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr "الأيام قبل التغيير المسموح :"
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr "الأسام قبل التغيير المطلوب :"
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr "أيام التحذير قبل التغيير :"
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr "الأيام قبل انهاء الحساب :"
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 msgid "Password Info"
 msgstr "معلومات كلمة المرور"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr "اختر المجموعات التي سيصبح المستخدم عضواً فيها: "
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "المجموعات"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 msgid "Group Data"
 msgstr "بيانات المجموعة"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr "اختر المستخدمين الذين سيلحقون بالمجموعة :"
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr "فضلاً اختر مجموعة واحدة على الأقل للمستخدم"
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
@@ -410,52 +400,58 @@ msgstr ""
 "فضلا حدد سنة و شهر و يوم\n"
 " انتهاء صالحية الحساب "
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 #, fuzzy
 msgid "Please specify all field for password aging\n"
 msgstr "فضلاً حدد جميع حقول تقادم كلمة المرور"
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "لا يمكك حذف المستخدم '%s' من مجموعته الأساسية"
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 msgid "Close"
 msgstr "اغلق"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr "المؤلفون: "
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr "ادارة المستخدمين \n"
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "جميع الحقوق محفوظة 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr "حقل الإسم فارغ فضلاً قم بتحديد اسم"
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "الإسم يجب أن يحتوي فقط على حروف صغيرة, أرقام, `-' و `_'"
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr "الإسم طويل جداً"
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr "خطأ"
 
+#~ msgid "Cancel"
+#~ msgstr "الغاء"
+
+#~ msgid "Ok"
+#~ msgstr "موافق"
+
 #~ msgid "/Filter system users"
 #~ msgstr "/تنقية مستخدمي النظام"
 
diff --git a/po/az.po b/po/az.po
index ee3d98c..308b2a1 100644
--- a/po/az.po
+++ b/po/az.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2002-08-01 15:11GMT+0200\n"
 "Last-Translator: Vasif İsmayıloğlu MD <azerb_linux@hotmail.com>\n"
 "Language-Team: Azerbaijani Turkic <linuxaz@azerimail.net>\n"
@@ -17,463 +17,459 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "Gedişatlar"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Düzəlt"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Sil"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Gedişatlar"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Fayl"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "İstifadəçi əlava et"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Qrup əlavə et"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Yardım"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "Haqqında"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "İstifadəçilər"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Qruplar"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "İstifadəçi ev cərgəsi"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Giriş"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Başlanğıc tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "İstifadəçi"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Qrup"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Qruplar"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Qrup"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "İstifadəçi əlava et"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Qrup əlavə et"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Qrup əlavə et"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Düzəlt"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Sil"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "İstifadəçi siyahısı"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Yardım"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "İstifadəçi ev cərgəsi"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "İstifadəçi ev cərgəsi"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "Bu ad onsuz da sistemdə vardır"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Parol"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Ləğv Et"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Oldu"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "İstifadəçi ev cərgəsi"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Giriş"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Parol"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Parol:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Ev"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "İstifadəçi siyahısı"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Parol"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Qruplar"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Qrup siyahısı"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "Təmizlə"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Təlif Haqqı © 2003 MandrakeSoft."
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Ləğv Et"
+
+#~ msgid "Ok"
+#~ msgstr "Oldu"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Gedişatlar"
diff --git a/po/bg.po b/po/bg.po
index 89d7acb..992d342 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2-bg\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2003-06-25 19:43+0300\n"
 "Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -18,205 +18,205 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.1\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr "Мандрейк инструмент за работа с потребителски сметки"
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 msgid "/_Actions"
 msgstr "_Действия"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 msgid "/_Edit"
 msgstr "_Промени"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 msgid "/_Delete"
 msgstr "И_зтрий"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr "_Филтрира системните потребители"
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 msgid "/_Options"
 msgstr "_Настройки"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 msgid "/_File"
 msgstr "_Файл"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr "_Опресни"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr "_Изход"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 msgid "/_Add User"
 msgstr "_Добави потребител"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 msgid "/Add _Group"
 msgstr "Добави _група"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 msgid "/_Help"
 msgstr "Помо_щ"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr "_Уведоми за грешка"
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 msgid "/_About..."
 msgstr "_Информация"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Потребители"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 msgid "Group Users"
 msgstr "Потребители в групата"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr "Пълно име"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "Home Directory"
 msgstr "Домашна директория на потрбител"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 msgid "Login Shell"
 msgstr "Влизане в системата"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr "Основна група"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Старт tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "User ID"
 msgstr "Потребителски номер"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "User Name"
 msgstr "Име на потребител"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 msgid "Group ID"
 msgstr "Номер на група"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 msgid "Group Members"
 msgstr "Членове на група"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 msgid "Group Name"
 msgstr "Име на група"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add User"
 msgstr "Добави потребител"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr "Добавя потребител към системата"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 msgid "Add Group"
 msgstr "Добави група"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 msgid "Add a group to the system"
 msgstr "Добавя група към системата"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Промени"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr "Редактира избраната редица"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Изтрии"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr "Изтрива избраната редица"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr "Опресни"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh the list"
 msgstr "Опресни списъка с потребителите"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr "Начална помощ за юзердрейк"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Помощ"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr "Създава нов потребител"
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 msgid "Create home Directory"
 msgstr "Създава домашна директория"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 msgid "Home Directory: "
 msgstr "Домашна директория:"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr "Създава лична група за потребителя"
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr "Ръчно задаване на потребителски номер"
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 msgid "User already exists, please choose another User Name"
 msgstr "Това име вече съществува в системата,моля изберете друго"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 msgid "Password Mismatch"
 msgstr "Паролите не съвпадат"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
@@ -224,7 +224,7 @@ msgstr ""
 "Паролата е твърде проста. \n"
 "Добри пароли са тези с поне 6 символа."
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -234,227 +234,223 @@ msgstr ""
 "Сигурни ли сте,че го желаете ?\n"
 "\n"
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr "Потребителският номер е по-малък от 500"
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Отказ"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "ОК"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr "Изберете група"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr "Добавяне към група \"потребители\""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr "Добавя към съществуваща група"
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Група "
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "Домашна директория на потрбител"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Влизане в с-мата"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Парола"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Парола:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Дом"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Спикък с потребители"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Парола"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Групи"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Списък с групите"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "Изчисти"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr ""
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Отказ"
+
+#~ msgid "Ok"
+#~ msgstr "ОК"
+
 #~ msgid "/Filter system users"
 #~ msgstr "Филтрира системните потребители"
 
diff --git a/po/bs.po b/po/bs.po
index b6674ba..73f8259 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 17.08.2002. 19:11\n"
 "Last-Translator: Amila Akagi� <bono@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -16,463 +16,459 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "Akcije"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Edituj"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Izbri�i"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Akcije"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Datoteka"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Dodaj korisnika"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Dodaj grupu"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Pomo�"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "O programu"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Korisnici"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Grupe"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "Korisni�ki ku�ni direktorij"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Korisni�ko ime"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Pokreni tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "Korisnik"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Grupa"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Grupe"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Grupa"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Dodaj korisnika"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Dodaj grupu"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Dodaj grupu"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Edituj"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Izbri�i"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "Listu korisnika"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Pomo�"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "Korisni�ki ku�ni direktorij"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "Korisni�ki ku�ni direktorij"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "Ovo ime ve� postoji na sistemu"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "�ifra"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Odustani"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "U redu"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "Korisni�ki ku�ni direktorij"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Korisni�ko ime"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "�ifra"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "�ifra:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Ku�ni direktorij"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Lista korisnika"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "�ifra"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Grupe"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Lista grupa"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "O�isti"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Autorska prava (C) 2003 MandrakeSoft."
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Odustani"
+
+#~ msgid "Ok"
+#~ msgstr "U redu"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Akcije"
diff --git a/po/ca.po b/po/ca.po
index 724426b..d508eb8 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2002-08-19 20:55+0100\n"
 "Last-Translator: Softcatal� <traddrake@softcatala.org>\n"
 "Language-Team: Catalan <info@softcatala.org>\n"
@@ -16,463 +16,459 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "Accions"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Edita"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Esborrar"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Accions"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Fitxer"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Afegir usuari"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Afegir grup"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Ajuda"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "Sobre"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Usuaris"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Grups"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "Directori home d�usuari"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Login"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Inicia tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "Usuari"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Grup"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Grups"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Grup"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Afegir usuari"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Afegir grup"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Afegir un grup"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Edita"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Esborrar"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "Llista de usuaris"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "Directori home d�usuari"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "Directori home d�usuari"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "Aquest nom ja existeix dins el sistema"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Contrasenya"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Cancel�la"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "D'acord"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "Directori home d�usuari"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Login"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Contrasenya"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Contrasenya:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Home"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Llista d'usuaris"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Contrasenya"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Grups"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Llista de grups"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "Buida"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Copyright � 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Cancel�la"
+
+#~ msgid "Ok"
+#~ msgstr "D'acord"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Accions"
diff --git a/po/cs.po b/po/cs.po
index 01dc639..4010a2e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2-cs\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2003-06-26 00:17GMT\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -19,205 +19,205 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr "Nástroj Mandrake Linux pro správu uživatelů"
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 msgid "/_Actions"
 msgstr "/_Akce"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 msgid "/_Edit"
 msgstr "/Ú_pravy"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 msgid "/_Delete"
 msgstr "/O_dstranit"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr "/_Filtrovat systémové uživatele"
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 msgid "/_Options"
 msgstr "/V_olby"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 msgid "/_File"
 msgstr "/_Soubor"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr "/O_bnovit"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr "/_Konec"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 msgid "/_Add User"
 msgstr "/Přid_at uživatele"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 msgid "/Add _Group"
 msgstr "/Přidat s_kupinu"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 msgid "/_Help"
 msgstr "/Nápo_věda"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr "/_Nahlásit chybu"
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 msgid "/_About..."
 msgstr "/O _aplikaci..."
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Uživatelé"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 msgid "Group Users"
 msgstr "Seskupit uživatele"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr "Celé jméno"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "Home Directory"
 msgstr "Domovský adresář"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 msgid "Login Shell"
 msgstr "Přihlašovací shell"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr "Primární skupina"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Počátek tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "User ID"
 msgstr "ID uživatele"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "User Name"
 msgstr "Jméno uživatele"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 msgid "Group ID"
 msgstr "ID skupiny"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 msgid "Group Members"
 msgstr "Členové skupiny"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 msgid "Group Name"
 msgstr "Název skupiny"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add User"
 msgstr "Přidat uživatele"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr "Přidat uživatele do systému"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 msgid "Add Group"
 msgstr "Přidat skupinu"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 msgid "Add a group to the system"
 msgstr "Přidat skupinu do systému"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Změnit"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr "Upravit vybraný řádek"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Odstranit"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr "Odstranit vybraný řádek"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr "Obnovit"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh the list"
 msgstr "Obnovit seznam"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr "Obecná nápověda k aplikaci UserDrake"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Nápověda"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr "Vytvořit nového uživatele"
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 msgid "Create home Directory"
 msgstr "Vytvořit domovský adresář"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 msgid "Home Directory: "
 msgstr "Domovský adresář: "
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr "Vytvořit pro uživatele samostatnou skupinu"
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr "Zadat ID uživatele ručně"
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 msgid "User already exists, please choose another User Name"
 msgstr "Uživatel již existuje, vyberte prosím jiné uživatelské jméno"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 msgid "Password Mismatch"
 msgstr "Hesla se neshodují"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
@@ -225,7 +225,7 @@ msgstr ""
 "Toto heslo je příliš jednoduché.\n"
 "Správná hesla by měla být delší než 6 znaků"
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -235,61 +235,51 @@ msgstr ""
 "Jste si jisti, že to chcete udělat?\n"
 "\n"
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr "ID uživatele je menší než 500"
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Budiž"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr "Vybrat skupinu"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr "Přidat ke skupině 'users'"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr "Přidat k existující skupině"
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 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_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr "Ano"
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr "Ne"
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr "Zadat ID skupiny ručně"
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr "Skupina již existuje, vyberte prosím jiný název skupiny"
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr "GID skupiny je menší než 500"
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -299,19 +289,19 @@ msgstr ""
 "Jste si jisti, že to chcete udělat?\n"
 "\n"
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid " Remove Home Directory"
 msgstr "Odstranit domovský adresář"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr "Chcete odstranit domovský adresář uživatele a jeho příchozí poštu?"
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -320,91 +310,91 @@ msgstr ""
 "%s je primární skupina pro uživatele %s\n"
 "Odstraňte nejprve tohoto uživatele"
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Přihlášení"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Heslo"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 msgid "Confirm Password:"
 msgstr "Potvrdit heslo:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Domovský adresář"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 msgid "User Data"
 msgstr "Data uživatele"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr "Povolit vypršení účtu"
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr "Účet vyprší   MM/DD/RRRR :"
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr "Zamknout účet uživatele"
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr "Informace o účtu"
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr "Uživatel naposledy změnil heslo dne: "
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr "Povolit vypršení hesla"
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr "Počet dní před povolením změny:"
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr "Počet dní před vyžadováním změny:"
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr "Varovat kolik dní před změnou:"
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr "Počet dní před vypršením účtu:"
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 msgid "Password Info"
 msgstr "Informace o heslu"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr "Vyberte skupiny, do kterých má uživatel patřit:"
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Skupiny"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 msgid "Group Data"
 msgstr "Data skupiny"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr "Vyberte uživatele, kteří se mají připojit k této skupině:"
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr "Vyberte prosím pro uživatele alespoň jednu skupinu"
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
@@ -412,52 +402,58 @@ msgstr ""
 "Zadejte prosím Rok, Měsíc a Den\n"
 "vypršení účtu"
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 #, fuzzy
 msgid "Please specify all field for password aging\n"
 msgstr "Pro vypršení hesla vyplňte prosím všechna pole"
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Nelze odstranit uživatele '%s' z jeho primární skupiny"
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 msgid "Close"
 msgstr "Zavřít"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr "Autoři:"
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr "Správa uživatelů\n"
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Copyright ©2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr "Pole se jménem je prázdné, zadejte prosím jméno"
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Jméno musí obsahovat pouze malá písmena, číslice a znaky '-' a '_'"
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr "Jméno je příliš dlouhé"
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr "Chyba"
 
+#~ msgid "Cancel"
+#~ msgstr "Zrušit"
+
+#~ msgid "Ok"
+#~ msgstr "Budiž"
+
 #~ msgid "/Filter system users"
 #~ msgstr "/Filtrovat systémové uživatele"
 
diff --git a/po/cy.po b/po/cy.po
index c9c0dee..212aa4f 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2003-03-02 17:07-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <rhoslyn.prys@meddal.org.uk>\n"
@@ -16,463 +16,459 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "Gweithredoedd"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Golygu"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Dileu"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Gweithredoedd"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Ffeil"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Ychwanegu defnyddiwr"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Ychwanegu grwp"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Cymorth"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "Ynghylch"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Defnyddwyr"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Grwpiau"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "Cyfeiriadur cartref defnyddiwr"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Mewngofnod"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Cychwyn tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "Defnyddiwr"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Grwp"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Grwpiau"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Grwp"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Ychwanegu defnyddiwr"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Ychwanegu grwp"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Ychwanegu grwp"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Golygu"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Dileu"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "Rhestr defnyddwyr"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Cymorth"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "Cyfeiriadur cartref defnyddiwr"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "Cyfeiriadur cartref defnyddiwr"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "Mae'r enw hwn yn bodoli ar y system"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Cyfrinair"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Dileu"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Iawn"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "Cyfeiriadur cartref defnyddiwr"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Mewngofnod"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Cyfrinair"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Cyfrinair:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Cartref"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Rhestr defnyddwyr"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Cyfrinair"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Grwpiau"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Rhestr grwpiau"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "Cirio"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Hawlfraint © 2003 MandrakeSoft."
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Dileu"
+
+#~ msgid "Ok"
+#~ msgstr "Iawn"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Gweithredoedd"
diff --git a/po/da.po b/po/da.po
index 9d505c7..31a05c6 100644
--- a/po/da.po
+++ b/po/da.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2002-09-18 13:37+0200\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -18,463 +18,459 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "Handlinger"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Redig�r"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Slet"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Handlinger"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Fil"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Tilf�j bruger"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Tilf�j gruppe"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Hj�lp"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "Om"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Brugere"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Grupper"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "Brugers hjemmekatalog"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Login"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Start tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "Bruger"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Gruppe"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Grupper"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Gruppe"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Tilf�j bruger"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Tilf�j gruppe"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Tilf�j en gruppe"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Redig�r"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Slet"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "Brugerliste"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Hj�lp"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "Brugers hjemmekatalog"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "Brugers hjemmekatalog"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "Dette navn findes allerede i systemet"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Adgangskode"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Annull�r"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Ok"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "Brugers hjemmekatalog"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Login"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Adgangskode"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Adgangskode:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Hjem"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Brugerliste"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Adgangskode"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Grupper"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Gruppeliste"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "Ryd"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Copyright � 2003 MandrakeSoft SA"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Annull�r"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Handlinger"
diff --git a/po/de.po b/po/de.po
index 2ea9520..ae0402c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2003-05-20 23:16+0200\n"
 "Last-Translator: Sebastian Deutscher <sebastian_deutscher@web.de>\n"
 "Language-Team: german <<cooker-i18n@linux-mandrake.com>>\n"
@@ -20,464 +20,460 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "Bearbeiten"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Ändern"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Löschen"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Bearbeiten"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Datei"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Benutzer hinzufügen"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Gruppe hinzufügen"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Hilfe"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "Über"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Benutzer"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Gruppe(n)"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "Homeverzeichnis"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Benutzername"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "\"tls starten\""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "Benutzer"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "UserDrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Gruppe"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Gruppe(n)"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Gruppe"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Benutzer hinzufügen"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Gruppe hinzufügen"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Gruppe hinzufügen"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Ändern"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "Benutzerliste"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "Homeverzeichnis"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "Homeverzeichnis"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "Dieser Name existiert bereits im System."
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Passwort"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "OK"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "Homeverzeichnis"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Benutzername"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Passwort"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Passwort:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Homeverzeichnis"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Benutzerliste"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 #, fuzzy
 msgid "User last changed password on : "
 msgstr "Ich kann das Passwort nicht ändern."
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Passwort"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Gruppe(n)"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Gruppenliste"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "Löschen"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Urheberrecht © 2003 MandrakeSoft."
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Abbrechen"
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Bearbeiten"
diff --git a/po/el.po b/po/el.po
index 594d4d6..1383db6 100644
--- a/po/el.po
+++ b/po/el.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2002-08-20 10:27+0300\n"
 "Last-Translator: ����� �������� (Nick Niktaris) <niktaris@yahoo.com>\n"
 "Language-Team: Greek <nls@hellug.gr>\n"
@@ -19,463 +19,459 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "���������"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "�����������"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "��������"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "���������"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "������"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "�������� ������"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "�������� ������"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "�������"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "����"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "�������"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "������"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "������� ������� ������"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "����������"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "�������� tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "�������"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "�����"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "������"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "�����"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "�������� ������"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "�������� ������"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "�������� ���� ������"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "�����������"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "��������"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "����� �������"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "�������"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "������� ������� ������"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "������� ������� ������"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "�� ����� ������� ��� ��� �������"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "������� ���������"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "�����"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "�������"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "������� ������� ������"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "����������"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "������� ���������"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "������� ���������:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "������� ���������"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "����� �������"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "������� ���������"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "������"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "����� ������"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "����������"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Copyright � 2003 MandrakeSoft SA"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "�����"
+
+#~ msgid "Ok"
+#~ msgstr "�������"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "���������"
diff --git a/po/eo.po b/po/eo.po
index a232fdc..f7cf663 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2-eo\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2003-06-25 13:34+0000\n"
 "Last-Translator: Vilhelmo Lutermano <vlutermano@free.fr>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -19,205 +19,205 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr "Mastrumilo por Mandrake Linux Uzuloj"
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 msgid "/_Actions"
 msgstr "/_Agoj"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 msgid "/_Edit"
 msgstr "/_Redaktu"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 msgid "/_Delete"
 msgstr "/_Forigu"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr "/_Filtrilo uzuloj"
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 msgid "/_Options"
 msgstr "/_Opcioj"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 msgid "/_File"
 msgstr "/_Dosiero"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr "/_Rekalkulu"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr "/_Finu"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 msgid "/_Add User"
 msgstr "/_Aldonu uzulon"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 msgid "/Add _Group"
 msgstr "/Aldonu _grupon"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 msgid "/_Help"
 msgstr "/_Helpo"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr "/_Raportu cimon"
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 msgid "/_About..."
 msgstr "/_Pri..."
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Uzuloj"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 msgid "Group Users"
 msgstr "Grupo Uzuloj"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr "Plena nomo"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "Home Directory"
 msgstr "Hejma dosierujo"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 msgid "Login Shell"
 msgstr "Salutnoma kampo"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr "Primara grupo"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Startigu tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "User ID"
 msgstr "Uzula ID"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "User Name"
 msgstr "Uzul-nomo"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 msgid "Group ID"
 msgstr "Grupa ID"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 msgid "Group Members"
 msgstr "Grupanoj"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 msgid "Group Name"
 msgstr "Grupa nomo"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add User"
 msgstr "Aldonu uzulon"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr "Aldonu uzulon al la sistemo"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 msgid "Add Group"
 msgstr "Aldonu grupon"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 msgid "Add a group to the system"
 msgstr "Aldonu grupon al la sistemo"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Redaktu"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr "Redaktu selektitan linion"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Forigu"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr "Forigu selektitan linion"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr "Rekalkulu"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh the list"
 msgstr "Rekalkulu la liston"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr "Genera helpo pri userdrake"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Helpo"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr "Kreu novan uzulon"
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 msgid "Create home Directory"
 msgstr "Kreu hejman dosierujon"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 msgid "Home Directory: "
 msgstr "Hejma dosierujo"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr "Kreu privatan grupon por la uzulo"
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr "Mane difinu uzul-ID"
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 msgid "User already exists, please choose another User Name"
 msgstr "Ĉi tiu nomo jam ekzistas, bonvolu elekti alian uzulnomon"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 msgid "Password Mismatch"
 msgstr "Pasvorta konfuzo"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
@@ -225,7 +225,7 @@ msgstr ""
 "Tiu ĉi pasvorto estas tro simpla. \n"
 " Bonaj pasvortoj havu > 6 signojn"
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -235,61 +235,51 @@ msgstr ""
 " Ĉu vi certas  ke vi volas tion?\n"
 "\n"
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr "Uzula Uid estas < 500"
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Nuligu"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "JES"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr "Elektu grupon"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr "Aldonu al la grupo 'uzuloj' ('users')"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr "Aldonu al la ekzistanta grupo"
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 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_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr "Jes"
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr "Ne"
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr "Difinu grupan ID mane"
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr "Grupo jam ekzistas, bonvolu elekti alian grupnomon"
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr "Gid de la grupo estas < 500"
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -299,21 +289,21 @@ msgstr ""
 " Ĉu vi certas ke vi volas tion?\n"
 "\n"
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid " Remove Home Directory"
 msgstr "Forigu la hejman dosierujon"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 "Ĉu vi deziras forigi la hejman dosierujon de la uzulo kaj ties poŝtan fon-"
 "eneligon?"
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -322,91 +312,91 @@ msgstr ""
 "%s estas primara grupo por uzulo %s\n"
 " Unue forigu la uzulon"
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Salutnomo"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Pasvorto"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 msgid "Confirm Password:"
 msgstr "Konfirmu pasvorton:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Hejmo"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 msgid "User Data"
 msgstr "Uzul-datumoj"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr "Enŝaltu kont-eksvalidiĝon"
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr "Konto eksvalidiĝos   MM/DD/YYYY :"
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr "Ŝlosu la uzul-konton"
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr "Kont-informo"
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr "Uzulo laste ŝanĝis pasvorton al : "
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr "Enŝaltu pasvort-eksvalidiĝon"
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr "Tagoj antaŭ ol ŝanĝo estas permesita :"
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr "Tagoj postulataj antaŭ ŝanĝo"
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr "Tagoj da avertado antaŭ ŝanĝo :"
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr "Tagoj antaŭ malaktivigo de la konto :"
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 msgid "Password Info"
 msgstr "Pasvort-informo"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr "Selektu la grupojn kies ano estu la uzulo:"
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Grupoj"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 msgid "Group Data"
 msgstr "Grupo-datumoj"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr "Selektu la uzulojn aniĝendajn al tiu grupo :"
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr "Bonvolu selekti almenaŭ unu grupon por la uzulo"
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
@@ -414,52 +404,58 @@ msgstr ""
 "Bonvolu difinu Jaron, Monaton kaj Tagon \n"
 " por kont-eksvalidiĝo "
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 #, fuzzy
 msgid "Please specify all field for password aging\n"
 msgstr "Bonvolu difini la tutan kampon por pasvort-aĝiĝo"
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, 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_.c:824
+#: ../userdrake_.c:827
 msgid "Close"
 msgstr "Fermu"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr "Aŭtoroj: "
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr "Uzul-mastrumado \n"
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Kopirajto (C) 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr "Nomo-kampo malplenas, bonvolu enmeti nomon"
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "La nomo devas havi nur minusklajn literojn, ciferojn,`-' kaj `_'"
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr "Nomo tro longas"
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr "Eraro"
 
+#~ msgid "Cancel"
+#~ msgstr "Nuligu"
+
+#~ msgid "Ok"
+#~ msgstr "JES"
+
 #~ msgid "/Filter system users"
 #~ msgstr "/Filtrosistemo uzuloj"
 
diff --git a/po/es.po b/po/es.po
index c58c075..6f00aa8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
-"POT-Creation-Date: 2003-07-04 16:26+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2003-07-05 14:10-0300\n"
 "Last-Translator: Fabian Mandelbaum <fmandelbaum@hotmail.com>\n"
 "Language-Team: Espa�ol <es@li.org>\n"
@@ -21,205 +21,205 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.1\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr "Herramienta de administraci�n de usuarios de Mandrake Linux"
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 msgid "/_Actions"
 msgstr "/_Acciones"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 msgid "/_Delete"
 msgstr "/_Borrar"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr "/_Filtrar usuarios del sistema"
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 msgid "/_Options"
 msgstr "/_Opciones"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 msgid "/_File"
 msgstr "/_Fichero"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr "/_Refrescar"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr "/_Salir"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr "<control>S"
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 msgid "/_Add User"
 msgstr "/_A�adir usuario"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 msgid "/Add _Group"
 msgstr "/A�adir _Grupo"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 msgid "/_Help"
 msgstr "/a_Yuda"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr "/_Reportar bug"
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 msgid "/_About..."
 msgstr "/_Acerca de..."
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr "Aplicar filtro"
 
-#: ../userdrake_.c:117
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../userdrake_.c:118 ../userdrake_.c:615
+#: ../userdrake_.c:106 ../userdrake_.c:602
 msgid "Group Users"
 msgstr "Grupos de usuarios"
 
-#: ../userdrake_.c:131 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr "Nombre completo"
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 msgid "Home Directory"
 msgstr "Directorio personal"
 
-#: ../userdrake_.c:131 ../userdrake_.c:495
+#: ../userdrake_.c:119 ../userdrake_.c:481
 msgid "Login Shell"
 msgstr "Shell de login"
 
-#: ../userdrake_.c:131 ../userdrake_.c:568
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr "Grupo primario"
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 msgid "Status"
 msgstr "Estado"
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 msgid "User ID"
 msgstr "ID de usuario"
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 msgid "User Name"
 msgstr "Nombre de usuario"
 
-#: ../userdrake_.c:137
+#: ../userdrake_.c:125
 msgid "Group ID"
 msgstr "ID de grupo"
 
-#: ../userdrake_.c:137
+#: ../userdrake_.c:125
 msgid "Group Members"
 msgstr "Miembros del grupo"
 
-#: ../userdrake_.c:137 ../userdrake_.c:506
+#: ../userdrake_.c:125 ../userdrake_.c:492
 msgid "Group Name"
 msgstr "Nombre del grupo"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:131
 msgid "Add User"
 msgstr "A�adir usuario"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr "A�adir un usuario al sistema"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:132
 msgid "Add Group"
 msgstr "A�adir grupo"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:132
 msgid "Add a group to the system"
 msgstr "A�adir un grupo al sistema"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Editar"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr "Editar fila seleccionada"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr "Borrar fila seleccionada"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:135
 msgid "Refresh the list"
 msgstr "Refrescar la lista"
 
-#: ../userdrake_.c:148
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr "Ayuda gen�rica sobre userdrake"
 
-#: ../userdrake_.c:148
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../userdrake_.c:175
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr "Expirado"
 
-#: ../userdrake_.c:175
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr "Trabado"
 
-#: ../userdrake_.c:210 ../userdrake_.c:344
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr "Crear usuario nuevo"
 
-#: ../userdrake_.c:217
+#: ../userdrake_.c:205
 msgid "Create home Directory"
 msgstr "Crear directorio personal"
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:207
 msgid "Home Directory: "
 msgstr "Directorio personal: "
 
-#: ../userdrake_.c:222
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr "Crear un grupo privado para el usuario"
 
-#: ../userdrake_.c:223
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr "Especificar ID de usuario manualmente"
 
-#: ../userdrake_.c:234
+#: ../userdrake_.c:222
 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_.c:236 ../userdrake_.c:647
+#: ../userdrake_.c:224 ../userdrake_.c:634
 msgid "Password Mismatch"
 msgstr "No coincide la contrase�a"
 
-#: ../userdrake_.c:237 ../userdrake_.c:649
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
@@ -227,7 +227,7 @@ msgstr ""
 "Esta contrase�a es demasiado simple. \n"
 " Las contrase�as buenas deber�an tener m�s de 6 caracteres"
 
-#: ../userdrake_.c:248
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -237,61 +237,51 @@ msgstr ""
 "�Est� seguro que desea hacer esto?\n"
 "\n"
 
-#: ../userdrake_.c:248
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr "El UID del usuario es menor a 500"
 
-#: ../userdrake_.c:286 ../userdrake_.c:322 ../userdrake_.c:375
-#: ../userdrake_.c:753
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../userdrake_.c:286 ../userdrake_.c:318 ../userdrake_.c:375
-#: ../userdrake_.c:753 ../userdrake_.c:885
-msgid "Ok"
-msgstr "Aceptar"
-
-#: ../userdrake_.c:297
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake_.c:309
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr "Seleccione grupo"
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr "A�adir al grupo 'users'"
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr "A�adir al grupo existente"
 
-#: ../userdrake_.c:314
+#: ../userdrake_.c:303
 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_.c:335
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr "S�"
 
-#: ../userdrake_.c:339
+#: ../userdrake_.c:328
 msgid "No"
 msgstr "No"
 
-#: ../userdrake_.c:350
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr "Especificar ID de grupo manualmente"
 
-#: ../userdrake_.c:361
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr "El grupo ya existe, por favor use otro nombre de grupo"
 
-#: ../userdrake_.c:365
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr "El GID del grupo es menor a 500"
 
-#: ../userdrake_.c:365
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -301,20 +291,20 @@ msgstr ""
 "�Est� seguro que desea hacer esto?\n"
 "\n"
 
-#: ../userdrake_.c:380
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake_.c:431
+#: ../userdrake_.c:419
 msgid " Remove Home Directory"
 msgstr "Quitar directorio personal"
 
-#: ../userdrake_.c:431
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 "�Desea eliminar el directorio personal y la cola de correos del usuario?"
 
-#: ../userdrake_.c:441
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -323,91 +313,91 @@ msgstr ""
 "%s es un grupo primario para el usuario %s\n"
 "Quite primero al usuario"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Login"
 
-#: ../userdrake_.c:493
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Contrase�a"
 
-#: ../userdrake_.c:494
+#: ../userdrake_.c:480
 msgid "Confirm Password:"
 msgstr "Confirmar contrase�a:"
 
-#: ../userdrake_.c:529
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Directorio personal"
 
-#: ../userdrake_.c:531
+#: ../userdrake_.c:518
 msgid "User Data"
 msgstr "Datos del usuario"
 
-#: ../userdrake_.c:535
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr "Habilitar expiraci�n de cuenta"
 
-#: ../userdrake_.c:537
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr "La cuenta expira   MM/DD/AAAA :"
 
-#: ../userdrake_.c:543
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr "Trabar cuenta de usuario"
 
-#: ../userdrake_.c:544
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr "Informaci�n de la cuenta"
 
-#: ../userdrake_.c:549
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr "El usuario cambi� la contrase�a por �ltima vez el : "
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr "Habilitar expiraci�n de contrase�a"
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr "D�as antes que se permita el cambio :"
 
-#: ../userdrake_.c:557
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr "D�as antes que se requiera el cambio :"
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr "D�as de advertencia antes del cambio :"
 
-#: ../userdrake_.c:559
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr "D�as antes que la cuenta se inactive :"
 
-#: ../userdrake_.c:561
+#: ../userdrake_.c:548
 msgid "Password Info"
 msgstr "Informaci�n de contrase�a"
 
-#: ../userdrake_.c:565
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr "Seleccione los grupos a los cuales pertenecer� el usuario:"
 
-#: ../userdrake_.c:571
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Grupos"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:598
 msgid "Group Data"
 msgstr "Datos del grupo"
 
-#: ../userdrake_.c:614
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr "Seleccione los usuarios que formar�n parte de este grupo:"
 
-#: ../userdrake_.c:678
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr "Por favor, seleccione al menos un grupo para el usuario"
 
-#: ../userdrake_.c:687
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
@@ -415,52 +405,58 @@ msgstr ""
 "Por favor, especifique el a�o, mes y d�a\n"
 "para la expiraci�n de la cuenta"
 
-#: ../userdrake_.c:694
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 "Por favor, especifique todos los campos para la caducaci�n de la contrase�a\n"
 
-#: ../userdrake_.c:736
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "No puede quitar al usuario '%s' de su grupo primario"
 
-#: ../userdrake_.c:848
+#: ../userdrake_.c:827
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../userdrake_.c:854
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:860
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr "Autores: "
 
-#: ../userdrake_.c:866
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr "Administraci�n de usuarios \n"
 
-#: ../userdrake_.c:867
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Copyright (C) 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:873
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr "El campo de nombre est� vac�o, por favor proporcione un nombre"
 
-#: ../userdrake_.c:874
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "El nombre debe contener s�lo letras min�sculas, n�meros, `-' y `_'"
 
-#: ../userdrake_.c:875
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr "El nombre es muy largo"
 
-#: ../userdrake_.c:879
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr "Error"
 
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Ok"
+#~ msgstr "Aceptar"
+
 #~ msgid "/Filter system users"
 #~ msgstr "/Filtrar usuarios del sistema"
 
diff --git a/po/et.po b/po/et.po
index 69e254d..07ec386 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake 0.3\n"
-"POT-Creation-Date: 2003-07-04 16:26+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2003-07-04 16:47+0300\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -15,204 +15,204 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr "Mandrake Linuxi kasutajate haldur"
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 msgid "/_Actions"
 msgstr "/_Tegevused"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 msgid "/_Edit"
 msgstr "/_Muuda"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 msgid "/_Delete"
 msgstr "/_Kustuta"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr "/_Filtreeri süsteemsed kasutajad"
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 msgid "/_Options"
 msgstr "/_Seadistused"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 msgid "/_File"
 msgstr "/_Fail"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr "/Vä_rskenda"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr "/_Välju"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 msgid "/_Add User"
 msgstr "/Lis_a kasutaja"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 msgid "/Add _Group"
 msgstr "/Lisa _grupp"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr "/_Veateade"
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 msgid "/_About..."
 msgstr "/_Misvärk"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr "Rakenda filter"
 
-#: ../userdrake_.c:117
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Kasutajad"
 
-#: ../userdrake_.c:118 ../userdrake_.c:615
+#: ../userdrake_.c:106 ../userdrake_.c:602
 msgid "Group Users"
 msgstr "Grupikasutajad"
 
-#: ../userdrake_.c:131 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr "Täisnimi"
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 msgid "Home Directory"
 msgstr "Kodukataloog"
 
-#: ../userdrake_.c:131 ../userdrake_.c:495
+#: ../userdrake_.c:119 ../userdrake_.c:481
 msgid "Login Shell"
 msgstr "Käsurida"
 
-#: ../userdrake_.c:131 ../userdrake_.c:568
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr "Esmane grupp"
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 msgid "Status"
 msgstr "Staatus"
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 msgid "User ID"
 msgstr "Kasutaja ID"
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 msgid "User Name"
 msgstr "Kasutajanimi"
 
-#: ../userdrake_.c:137
+#: ../userdrake_.c:125
 msgid "Group ID"
 msgstr "Grupi ID"
 
-#: ../userdrake_.c:137
+#: ../userdrake_.c:125
 msgid "Group Members"
 msgstr "Grupi liikmed"
 
-#: ../userdrake_.c:137 ../userdrake_.c:506
+#: ../userdrake_.c:125 ../userdrake_.c:492
 msgid "Group Name"
 msgstr "Grupi nimi"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:131
 msgid "Add User"
 msgstr "Lisa kasutaja"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr "Lisab süsteemi kasutaja"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:132
 msgid "Add Group"
 msgstr "Lisa grupp"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:132
 msgid "Add a group to the system"
 msgstr "Lisab süsteemi grupi"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Muuda"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr "Muudab valitud rida"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Kustuta"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr "Kustutab valitud rea"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr "Värskenda"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:135
 msgid "Refresh the list"
 msgstr "Värskendab nimekirja"
 
-#: ../userdrake_.c:148
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr "Userdrake üldine abi"
 
-#: ../userdrake_.c:148
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Abi"
 
-#: ../userdrake_.c:175
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr "Aegunud"
 
-#: ../userdrake_.c:175
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr "Lukustatud"
 
-#: ../userdrake_.c:210 ../userdrake_.c:344
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr "Uue kasutaja loomine"
 
-#: ../userdrake_.c:217
+#: ../userdrake_.c:205
 msgid "Create home Directory"
 msgstr "Luuakse kodukataloog"
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:207
 msgid "Home Directory: "
 msgstr "Kodukataloog: "
 
-#: ../userdrake_.c:222
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr "Kasutajale luuakse privaatgrupp"
 
-#: ../userdrake_.c:223
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr "Kasutaja ID määratakse käsitsi"
 
-#: ../userdrake_.c:234
+#: ../userdrake_.c:222
 msgid "User already exists, please choose another User Name"
 msgstr "Selline kasutaja on juba olemas, palun valige muu nimi"
 
-#: ../userdrake_.c:236 ../userdrake_.c:647
+#: ../userdrake_.c:224 ../userdrake_.c:634
 msgid "Password Mismatch"
 msgstr "Paroolid ei lange kokku"
 
-#: ../userdrake_.c:237 ../userdrake_.c:649
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
@@ -220,7 +220,7 @@ msgstr ""
 "See parool on liiga lihtne. \n"
 " Korralik parool peaks koosnema vähemalt 6 sümbolist"
 
-#: ../userdrake_.c:248
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -230,61 +230,51 @@ msgstr ""
 " Kas soovite seda kindlasti teha?\n"
 "\n"
 
-#: ../userdrake_.c:248
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr "Kasutaja UID on väiksem kui 500"
 
-#: ../userdrake_.c:286 ../userdrake_.c:322 ../userdrake_.c:375
-#: ../userdrake_.c:753
-msgid "Cancel"
-msgstr "Katkesta"
-
-#: ../userdrake_.c:286 ../userdrake_.c:318 ../userdrake_.c:375
-#: ../userdrake_.c:753 ../userdrake_.c:885
-msgid "Ok"
-msgstr "Olgu"
-
-#: ../userdrake_.c:297
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake_.c:309
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr "Vali grupp"
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr "Lisa gruppi 'users'"
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr "Lisa olemasolevasse gruppi"
 
-#: ../userdrake_.c:314
+#: ../userdrake_.c:303
 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_.c:335
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr "Jah"
 
-#: ../userdrake_.c:339
+#: ../userdrake_.c:328
 msgid "No"
 msgstr "Ei"
 
-#: ../userdrake_.c:350
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr "Grupi ID määratakse käsitsi"
 
-#: ../userdrake_.c:361
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr "Selline grupp on juba olemas, palun valige muu nimi"
 
-#: ../userdrake_.c:365
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr " Grupi GID on väiksem kui 500"
 
-#: ../userdrake_.c:365
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -294,19 +284,19 @@ msgstr ""
 " Kas soovite seda kindlasti teha?\n"
 "\n"
 
-#: ../userdrake_.c:380
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake_.c:431
+#: ../userdrake_.c:419
 msgid " Remove Home Directory"
 msgstr " Kodukataloogi eemaldamine"
 
-#: ../userdrake_.c:431
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr "Kas soovite eemaldada kasutaja kodukataloogi ja meilispuuli?"
 
-#: ../userdrake_.c:441
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -315,91 +305,91 @@ msgstr ""
 "%s on kasutaja %s esmane grupp\n"
 " Eemaldage esmalt kasutaja"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Kasutajatunnus"
 
-#: ../userdrake_.c:493
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Parool"
 
-#: ../userdrake_.c:494
+#: ../userdrake_.c:480
 msgid "Confirm Password:"
 msgstr "Parool uuesti:"
 
-#: ../userdrake_.c:529
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Kodukataloog"
 
-#: ../userdrake_.c:531
+#: ../userdrake_.c:518
 msgid "User Data"
 msgstr "Kasutaja andmed"
 
-#: ../userdrake_.c:535
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr "Konto aegumise lubamine"
 
-#: ../userdrake_.c:537
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr "Konto aegub   MM/DD/YYYY :"
 
-#: ../userdrake_.c:543
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr "Kasutaja konto lukustamine"
 
-#: ../userdrake_.c:544
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr "Konto info"
 
-#: ../userdrake_.c:549
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr "Kasutaja muutis viimati parooli :"
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr "Parooli aegumise lubamine"
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr "Päevi enne muutmise lubamist :"
 
-#: ../userdrake_.c:557
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr "Päevi enne muutmise nõudmist :"
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr "Päevi enne muutmise hoiatuse andmist :"
 
-#: ../userdrake_.c:559
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr "Päevi enne konto tühistamist :"
 
-#: ../userdrake_.c:561
+#: ../userdrake_.c:548
 msgid "Password Info"
 msgstr "Parooli info"
 
-#: ../userdrake_.c:565
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr "Grupid, millesse see kasutaja kuulub:"
 
-#: ../userdrake_.c:571
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Grupid"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:598
 msgid "Group Data"
 msgstr "Grupi andmed"
 
-#: ../userdrake_.c:614
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr "Kasutajad, kes sellesse gruppi kuuluvad :"
 
-#: ../userdrake_.c:678
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr "Palun valige kasutajale vähemalt üks grupp"
 
-#: ../userdrake_.c:687
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
@@ -407,51 +397,57 @@ msgstr ""
 "Palun määrake konto aegumise \n"
 " aasta, kuu ja päev "
 
-#: ../userdrake_.c:694
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr "Palun täitke kõik parooli aegumise väljad\n"
 
-#: ../userdrake_.c:736
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Kasutajat '%s' ei saa eemaldada tema esmasest grupist"
 
-#: ../userdrake_.c:848
+#: ../userdrake_.c:827
 msgid "Close"
 msgstr "Sulge"
 
-#: ../userdrake_.c:854
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:860
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr "Autorid: "
 
-#: ../userdrake_.c:866
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr "Kasutajate haldamine \n"
 
-#: ../userdrake_.c:867
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Autoriõigus © 2003: Mandrakesoft SA"
 
-#: ../userdrake_.c:873
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr "Nimeväli on tühi. Palun määrake nimi"
 
-#: ../userdrake_.c:874
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Nimi tohib sisaldada vaid väiketähti, numbreid ning märke '-' ja '_'"
 
-#: ../userdrake_.c:875
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr "Nimi on liiga pikk"
 
-#: ../userdrake_.c:879
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr "Viga"
 
+#~ msgid "Cancel"
+#~ msgstr "Katkesta"
+
+#~ msgid "Ok"
+#~ msgstr "Olgu"
+
 #~ msgid "/Filter system users"
 #~ msgstr "/Filtreeri süsteemsed kasutajad"
 
diff --git a/po/eu.po b/po/eu.po
index a37f25e..f65572a 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2002-07-14 17:02+0200\n"
 "Last-Translator: I�igo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: Euskara <linux-eu@chanae.alphanet.ch>\n"
@@ -18,463 +18,459 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "Ekintzak"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Editatu"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Ezabatu"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Ekintzak"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Fitxategia"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Gehitu erabiltzailea"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Gehitu taldea"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Laguntza"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "Honi buruz"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Erabiltzaileak"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Taldeak"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "Erabiltzailearen etxeko direktorioa"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Erabiltzaile-izena"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Abiatu tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "Erabiltzailea"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "UserDrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Taldea"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Taldeak"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Taldea"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Gehitu erabiltzailea"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Gehitu taldea"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Gehitu taldea"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Editatu"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "Erabiltzaileen zerrenda"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Laguntza"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "Erabiltzailearen etxeko direktorioa"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "Erabiltzailearen etxeko direktorioa"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "Izen hori existitzen da lehendik sisteman"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Pasahitza"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Utzi"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Ados"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "Erabiltzailearen etxeko direktorioa"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Erabiltzaile-izena"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Pasahitza"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Pasahitza:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Etxea"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Erabiltzaile-zerrenda"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Pasahitza"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Taldeak"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Talde-zerrenda"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "Garbitu"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Copyright � 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Utzi"
+
+#~ msgid "Ok"
+#~ msgstr "Ados"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Ekintzak"
diff --git a/po/fi.po b/po/fi.po
index f99978d..132df4e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-fi - MDK Release 9.2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2003-06-30 00:08+0300\n"
 "Last-Translator: Thomas Backlund <tmb@iki.fi>\n"
 "Language-Team: Finnish <cooker-i18n@linux-mandrake.com>\n"
@@ -21,205 +21,205 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr "Mandrake Linux käyttäjänhallintatyökalu"
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 msgid "/_Actions"
 msgstr "/T_oiminnot"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 msgid "/_Edit"
 msgstr "/_Muokkaa"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 msgid "/_Delete"
 msgstr "/_Poista"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr "/_Suodata järjestelmäkäyttäjät"
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 msgid "/_Options"
 msgstr "/_Valinnat"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 msgid "/_File"
 msgstr "/_Tiedosto"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr "/_Päivitä"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr "/_Lopeta"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 msgid "/_Add User"
 msgstr "/Lisää _käyttäjä"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 msgid "/Add _Group"
 msgstr "/Lisää _ryhmä"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 msgid "/_Help"
 msgstr "/O_hje"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr "/_Ilmoita virheestä"
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 msgid "/_About..."
 msgstr "/Tieto_ja"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 msgid "Group Users"
 msgstr "Ryhmän käyttäjät"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr "Ryhmän käyttäjät"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "Home Directory"
 msgstr "Käyttäjän kotihakemisto"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 msgid "Login Shell"
 msgstr "Sisäänkirjautumistulkki"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr "Ensisijainen ryhmä"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Käynnistä tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "User ID"
 msgstr "Käyttäjä-ID"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "User Name"
 msgstr "Käyttäjänimi"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 msgid "Group ID"
 msgstr "Ryhmä-ID"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 msgid "Group Members"
 msgstr "Ryhmän jäsenet"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 msgid "Group Name"
 msgstr "Ryhmän nimi"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add User"
 msgstr "Lisää käyttäjä"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr "Lisää käyttäjä järjestelmään"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 msgid "Add Group"
 msgstr "Lisää ryhmä"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 msgid "Add a group to the system"
 msgstr "Lisää ryhmä järjestelmään"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr "Muokkaa valittua riviä"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Poista"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr "Poista valittu rivi"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr "Päivitä"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh the list"
 msgstr "Päivitä lista"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr "Yleinen UserDraken ohje"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Ohje"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr "Luo uusi käyttäjä"
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 msgid "Create home Directory"
 msgstr "Luo kotihakemisto"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 msgid "Home Directory: "
 msgstr "Kotihakemisto: "
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr "Luo yksityinen ryhmä käyttäjälle"
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr "Määritä käyttäjän ID manuaalisesti"
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 msgid "User already exists, please choose another User Name"
 msgstr "Käyttäjä on jo olemassa, ole hyvä ja valitse toinen käyttäjänimi"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 msgid "Password Mismatch"
 msgstr "Salasana ei täsmää"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
@@ -227,7 +227,7 @@ msgstr ""
 "Tämä salasana on liian yksinkertainen.\n"
 " Hyvä salasana on ainakin yli kuusi merkkiä pitkä."
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -237,61 +237,51 @@ msgstr ""
 " Oletko varma että haluat tehdä tämän?\n"
 "\n"
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr "Käyttäjän UID on < 500"
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Peruuta"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Ok"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr "Valitse ryhmä"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr "Lisää ryhmään 'users'"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr "Lisää olemassaolevaan ryhmään"
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 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_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr "Ei"
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr "Määritä ryhmä-ID manuaalisesti"
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr "Ryhmä on jo olemassa, ole hyvä ja valitse toinen ryhmänimi"
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr "Ryhmä-ID on < 500"
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -301,19 +291,19 @@ msgstr ""
 " Oletko varma että haluat tehdä tämän?\n"
 "\n"
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid " Remove Home Directory"
 msgstr "Poista kotihakemisto"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr "Haluatko poistaa käyttäjän kotihakemiston ja postijonon?"
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -322,91 +312,91 @@ msgstr ""
 "%s on ensisijainen ryhmä käyttäjälle %s\n"
 " Poista käyttäjä ensin"
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Käyttäjätunnus"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Salasana"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 msgid "Confirm Password:"
 msgstr "Varmista salasana:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Kotihakemisto"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 msgid "User Data"
 msgstr "Käyttäjän tiedot"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr "Ota käyttöön käyttäjätilin vanheneminen"
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr "Käyttäjätili vanhenee   MM/DD/YYYY :"
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr "Lukitse käyttäjätili"
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr "Käyttäjätilin tiedot"
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr "Käyttäjä vaihtoi viimeksi salasanaa : "
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr "Ota käyttöön salasanan vanheneminen"
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr "Päivät ennen kuin vaihtaminen sallitaan : "
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr "Päivät ennen kuin vaihtaminen vaaditaan : "
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr "Päivät jolloin varoitetaan ennen vaihtoa : "
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr "Päivät ennen kuin käyttäjätili käyttämätön : "
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 msgid "Password Info"
 msgstr "Salasanan tiedot"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr "Valitse ryhmät joiden jäsen käyttäjä tulee olemaan:"
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Ryhmät"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 msgid "Group Data"
 msgstr "Ryhmän tiedot"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr "Valitse käyttäjät jotka kuuluvat tähän ryhmään:"
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr "Ole hyvä ja valitse vähintään yksi ryhmä käyttäjälle"
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
@@ -414,52 +404,58 @@ msgstr ""
 "Ole hyvä ja määritä vuosi, kuukausi ja päivä\n"
 " käyttäjätilin vanhenemiselle "
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 #, fuzzy
 msgid "Please specify all field for password aging\n"
 msgstr "Ole hyvä ja määritä kaikki kentät salasanan vanhenemiselle"
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Et voi poistaa käyttäjää '%s' hänen ensisijaisesta ryhmästään"
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 msgid "Close"
 msgstr "Sulje"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr "Tekijät: "
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr "Käyttäjänhallinta\n"
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Copyright © 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr "Nimikenttä on tyhjä, ole hyvä ja määritä nimi"
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Nimi voi muodostua pienistä kirjaimista, numeroista, `-' ja `_'"
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr "Nimi on liian pitkä"
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr "Virhe"
 
+#~ msgid "Cancel"
+#~ msgstr "Peruuta"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
 #~ msgid "/Filter system users"
 #~ msgstr "/Suodata järjestelmäkäyttäjät"
 
diff --git a/po/fr.po b/po/fr.po
index b51be8c..839507f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2000-10-05 15:15+0200\n"
 "Last-Translator: Guy CLOTILDE <guy.clotilde@wanadoo.fr>\n"
 "Language-Team: francais <i18n@mandrakesoft.com>\n"
@@ -16,458 +16,454 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 msgid "/_Actions"
 msgstr "/_Actions"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 msgid "/_Edit"
 msgstr "/_�diter"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Retirer"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Actions"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 msgid "/_File"
 msgstr "/_Fichier"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Ajouter un utilisateur"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Ajouter un groupe"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 msgid "/_Help"
 msgstr "/_Aide"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 msgid "/_About..."
 msgstr "/_A propos..."
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Groupes d'appartenance"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "nom du dossier personnel"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Utilisateur"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "D�marrer tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "Utilisateur"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Groupe"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Groupes d'appartenance"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Groupe"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Ajouter un utilisateur"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Ajouter un groupe"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Ajouter le(s) groupe(s)"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "�diter"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Retirer"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "utilisateurs du groupe"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Aide"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "nom du dossier personnel"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "nom du dossier personnel"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "Ce groupe existe d�j� dans le syst�me"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Mot de passe"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Annuler"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Ok"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "nom du dossier personnel"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Utilisateur"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Mot de passe"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Mot de passe�:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Dossier perso."
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "�l�ments visibles dans la liste des utilisateurs"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Mot de passe"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Groupes d'appartenance"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "�l�ments visibles dans la liste des groupes"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "Effacer"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Copyright � 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Annuler"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Actions"
diff --git a/po/ga.po b/po/ga.po
index bad4110..2edf178 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2001-08-10 21:00+0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <ga@li.org>\n"
@@ -16,454 +16,450 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 msgid "/_Actions"
 msgstr ""
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Eagar"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Scr�os"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 msgid "/_Options"
 msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Comhad"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Suimigh �s�ideoir"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Suimigh grupa"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 msgid "/_Help"
 msgstr ""
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "Faoi"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "�s�ideoir�"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Grupa�"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "Eolaire Baile:"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Logann"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "Status"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "�s�ideoir "
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Grupa"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Grupa�"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Grupa"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Suimigh �s�ideoir"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Suimigh grupa"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Cuir grupa"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Eagar"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Scr�os"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh the list"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 msgid "Create home Directory"
 msgstr ""
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "Eolaire Baile:"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 msgid "User already exists, please choose another User Name"
 msgstr ""
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Pasfhocal"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Cealaigh"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Ceart go Leor"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid " Remove Home Directory"
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Logann"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Pasfhocal"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Pasfhocal"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Baile"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "ID �s�ideoir"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Pasfhocal"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Grupa�"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "ID Grupa"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 msgid "Close"
 msgstr ""
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Co�pcheart � 2003 Mandrakesoft."
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Cealaigh"
+
+#~ msgid "Ok"
+#~ msgstr "Ceart go Leor"
+
 #, fuzzy
 #~ msgid "/Edit"
 #~ msgstr "Eagar"
diff --git a/po/gl.po b/po/gl.po
index c1f850b..e866221 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2001-03-18 10:34+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez (mdk) <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -17,462 +17,458 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "Acci�ns"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Editar"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Borrar"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Acci�ns"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Ficheiro"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Engadir usuario"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Engadir grupo"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Axuda"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "Acerca"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Grupos"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "Directorio persoal do usuario"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Nome de usuario"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "Status"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "Usuario"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Grupo"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Grupos"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Grupo"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Engadir usuario"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Engadir grupo"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Engadir un grupo"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Editar"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "Lista de usuarios"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Axuda"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "Directorio persoal do usuario"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "Directorio persoal do usuario"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "Este nome xa existe no sistema"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Contrasinal"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Aceptar"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "Directorio persoal do usuario"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Nome de usuario"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Contrasinal"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Contrasinal"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Dir. Persoal"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Lista de usuarios"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 #, fuzzy
 msgid "User last changed password on : "
 msgstr "Non pode mudar o contrasinal"
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Contrasinal"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Grupos"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Lista de grupos"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 msgid "Close"
 msgstr ""
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr ""
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Ok"
+#~ msgstr "Aceptar"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Acci�ns"
diff --git a/po/he.po b/po/he.po
index 20cc2f3..d12cbb4 100644
--- a/po/he.po
+++ b/po/he.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2003-03-07 16:22+0000\n"
 "Last-Translator: dovix <dovix2003@yahoo.com>\n"
 "Language-Team: Hebrew <en@li.org>\n"
@@ -18,463 +18,459 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "פעולות"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "עריכה"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "מחיקה"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "פעולות"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "קובץ"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "הוספת משתמש"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "הוספת קבוצה"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "עזרה"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "אודות"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "משתמשים"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "קבוצות"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "ספריית הבית של המשתמש"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "שם משתמש"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "איתחול tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "משתמש"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "קבוצה"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "קבוצות"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "קבוצה"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "הוספת משתמש"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "הוספת קבוצה"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "הוספת קבוצה"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "עריכה"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "מחיקה"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "רשימת משתמשים"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "עזרה"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "ספריית הבית של המשתמש"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "ספריית הבית של המשתמש"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "שם זה כבר קיים במערכת"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "סיסמה"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "ביטול"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "אישור"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "ספריית הבית של המשתמש"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "שם משתמש"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "סיסמה"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "סיסמה:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "ספריית הבית"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "רשימת משתמשים"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "סיסמה"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "קבוצות"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "הצגת קבוצות"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "ניקוי"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "כל הזכויות שמורות © 2003 MandrakeSoft."
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "ביטול"
+
+#~ msgid "Ok"
+#~ msgstr "אישור"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "פעולות"
diff --git a/po/hi.po b/po/hi.po
index 0f48414..bf57671 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2-hi\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2003-06-27 20:34+0530\n"
 "Last-Translator: धनंजय शर्मा (Dhananjaya Sharma) <dysxhi@yahoo.co.in>\n"
 "Language-Team: हिन्दी, भारत (Hindi, India) <dysxhi@yahoo.co.in>\n"
@@ -16,204 +16,204 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr "मैनड्रैक लिनक्स उपयोगकर्ता प्रबंधन टूल"
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 msgid "/_Actions"
 msgstr "/कार्य-कलाप(_A)"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 msgid "/_Edit"
 msgstr "/सम्पादित करें(_E)"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 msgid "/_Delete"
 msgstr "/मिटायें(_D)"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr "/प्रणाली उपयोगकर्ताओं को अलग करें(_F)"
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 msgid "/_Options"
 msgstr "/विकल्प(_O)"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 msgid "/_File"
 msgstr "/संचिका (_F)"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr "/पुनः ताजा करें (_R)"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr "/निर्गम(_Q)"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 msgid "/_Add User"
 msgstr "/उपयोग-कर्ता जोड़े(_A)"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 msgid "/Add _Group"
 msgstr "/समूह जोड़े(_G)"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 msgid "/_Help"
 msgstr "/सहायता(_H)"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr "/दोष के बारे में बतायें(_R)"
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 msgid "/_About..."
 msgstr "/के बारे में(_A)..."
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "उपयोग-कर्ता"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 msgid "Group Users"
 msgstr "समूह उपयोगकर्ता"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr "पूरा नाम"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "Home Directory"
 msgstr "गृह स्थल निर्देशिका"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 msgid "Login Shell"
 msgstr "सत्र-आरंभ कोश"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr "प्रधान समूह"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "Status"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "User ID"
 msgstr "उपयोग-कर्ता पहचान संख्या"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "User Name"
 msgstr "उपयोगकर्ता का नाम"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 msgid "Group ID"
 msgstr "समूह पहचान संख्या"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 msgid "Group Members"
 msgstr "समूह के सदस्य"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 msgid "Group Name"
 msgstr "समूह का नाम"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add User"
 msgstr "उपयोग-कर्ता जोड़ना"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr "एक उपयोग-कर्ता को प्रणाली में जोड़ना"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 msgid "Add Group"
 msgstr "समूह जोड़ना"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 msgid "Add a group to the system"
 msgstr "एक समूह को प्रणाली में जोड़ना"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "सम्पादन"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr "चयन की हुई पंक्ति का संपादन"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "मिटाना"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr "चयन की हुई पंक्ति को मिटाना"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr "पुनः ताजा करना"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh the list"
 msgstr "उपयोग-कर्ता सूची को पुनः ताजा करना"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr "यूज़रड्रैक पर सामान्य सहायता"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "सहायता"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr "नये उपयोगकर्ता का निर्माण"
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 msgid "Create home Directory"
 msgstr "गृह स्थल निर्देशिका का निर्माण"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 msgid "Home Directory: "
 msgstr "गृह स्थल निर्देशिका: "
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr "उपयोगकर्ता के लिए एक व्यक्तिगत समूह का निर्माण"
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr "उपयोगकर्ता पहचान संख्या को स्वमं निर्दिष्ट करना"
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 msgid "User already exists, please choose another User Name"
 msgstr "उपयोगकर्ता पहिले से विद्यमान है, कृपया अन्य उपयोगकर्ता नाम चुनें।"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 msgid "Password Mismatch"
 msgstr "कूट-शब्द बेमेल"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
@@ -221,7 +221,7 @@ msgstr ""
 "यह कूट-शब्द अति सरल है।\n"
 " अच्छे कूट-शब्दों को ६ अक्षरों से अधिक का होना चाहिए"
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -232,61 +232,51 @@ msgstr ""
 "क्या आप वास्तव में ऐसा करना चाहते है?\n"
 "\n"
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr "उपयोगकर्ता की उपयोगकर्ता-पहचान-संख्या ५०० से कम है"
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "निरस्त"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "ओ०के०"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr "उपयोगकर्ता पहचान संख्या: "
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr "समूह चयन"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr "'users' समूह में जोड़ना"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr "विद्यमान समूह में जोड़ना"
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "इस नाम का एक समूह पहिले से विद्यमान है। आप क्या करना चाहेगें? "
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr "हाँ"
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr "ना"
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr "समूह पहचान संख्या स्वमं निर्दिष्ट करें"
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr "समूह पहिले से विद्यमान है, कृपया अन्य समूह नाम का चयन करें"
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr " समूह की समूह पहचान संख्या ५०० से कम है"
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -296,19 +286,19 @@ msgstr ""
 "क्या आप वास्तव में ऐसा करना चाहते है?\n"
 "\n"
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr "समूह पहचान संख्या: "
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid " Remove Home Directory"
 msgstr "गृह स्थल निर्देशिका को हटाना"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr "क्या आप उपयोगकर्ता की गृह-स्थल निर्देशिका और विपत्र स्पूल को मिटाना चाहते है?"
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -317,91 +307,91 @@ msgstr ""
 "%s , उपयोगकर्ता %s के लिए, एक प्रधान समूह है\n"
 " उपयोगकर्ता को पहिले हटायें"
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "सत्र-आरंभ"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "कूट-शब्द"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 msgid "Confirm Password:"
 msgstr "कूट-शब्द की पुष्टि:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "गॄह-स्थल"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 msgid "User Data"
 msgstr "उपयोग-कर्ता जानकारी"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr "खाता समाप्ति प्रक्रिया को सक्रिय करें"
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr "खाता समाप्ति की तिथि MM/DD/YYYY :"
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr "उपयोगकर्ता खाते को लॉक करें"
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr "खाते के बारे में जानकारी"
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr "उपयोगकर्ता ने कूट शब्द को अंतिम बार इस तिथि को परिवर्तित किया था: "
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr "कूट शब्द समाप्ति प्रक्रिया को सक्रिय करें"
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr "दिन संख्या, जिसके पहिले परिवर्तन की अनुमति है :"
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr "दिन संख्या, जिसके पहिले परिवर्तन आवश्यक है :"
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr "दिन संख्या, जिसके पहिले परिवर्तन की चेतावनी मिलेगी :"
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr "दिन संख्या जिसके पहिले खाता निष्क्रिय होगा :"
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 msgid "Password Info"
 msgstr "कूट-शब्द सूचना"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr "उन समूहों का चयन करें जिनका यह उपयोगकर्ता एक सदस्य होगा:"
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "समूह"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 msgid "Group Data"
 msgstr "समूह जानकारी"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr "एस समूह में शामिल होने के लिए उपयोगकर्ताओं का चयन करें"
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr "कृपया इस उपयोगकर्ता के लिए कम-से-कम एक समूह का चयन करें"
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
@@ -409,53 +399,59 @@ msgstr ""
 "कृपया खाता समाप्ति के लिए \n"
 "वर्ष, माह और दिवस बतायें"
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 #, fuzzy
 msgid "Please specify all field for password aging\n"
 msgstr "कृपया कूट-शब्द आयु के लिए सभी क्षेत्रों के बारे में बतायें"
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "आप, '%s' उपयोगकर्ता को उसके प्रधान समूह से नहीं हटा सकते है"
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 msgid "Close"
 msgstr "समाप्त"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 #, fuzzy
 msgid "Userdrake"
 msgstr "यूज़र-ड्रैक२"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr "लेखकों के नाम: "
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr "उपयोगकर्ता प्रबंधन \n"
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "सर्वाधिकार © २००३ मैनड्रैकसॉफ़्ट एस०ऐ०"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr "नाम क्षेत्र खाली है, कृपया एक नाम प्रदान करें"
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "नाम में सिर्फ़ टाइप के छोटे अक्षर, संख्याऐं, `-' और `_' शामिल होना चाहिए"
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr "नाम अत्याधिक लंबा है"
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr "त्रुटि"
 
+#~ msgid "Cancel"
+#~ msgstr "निरस्त"
+
+#~ msgid "Ok"
+#~ msgstr "ओ०के०"
+
 #~ msgid "/Filter system users"
 #~ msgstr "/प्रणाली उपयोगकर्ताओं को अलग करें"
 
diff --git a/po/hr.po b/po/hr.po
index 41149f1..074293b 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2002-03-07 18:10CET\n"
 "Last-Translator: Vlatko Kosturjak <kost@iname.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -17,461 +17,457 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "Radnje"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Podesi"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Ukloni"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Radnje"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Datoteka"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Dodaj korisnika"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Dodaj grupu"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Pomo�"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "O programu"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Korisnici"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Grupe"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "Korisnikov direktorij"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Korisni�ka oznaka"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "Status"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "Korisnik"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Grupa"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Grupe"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Grupa"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Dodaj korisnika"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Dodaj grupu"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Dodaj grupu"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Podesi"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Ukloni"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "Lista korisnika"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Pomo�"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "Korisnikov direktorij"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "Korisnikov direktorij"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "Ovo ime ve� postoji u sustavu"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Lozinka"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Odustani"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "U redu"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "Korisnikov direktorij"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Korisni�ka oznaka"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Lozinka"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Lozinka"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Korisni�ki direktorij"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Lista korisnika"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Lozinka"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Grupe"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Lista grupa"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 msgid "Close"
 msgstr ""
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Autorska prava (C) 2003 MandrakeSoft."
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Odustani"
+
+#~ msgid "Ok"
+#~ msgstr "U redu"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Radnje"
diff --git a/po/hu.po b/po/hu.po
index eaf68a6..c40e1b1 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2002-09-11 22:47+0200\n"
 "Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
 "Language-Team: Hungarian\n"
@@ -17,464 +17,460 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "M�veletek"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "M�dos�t�s"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "T�rl�s"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "M�veletek"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "F�jl"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "�j felhaszn�l�"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "�j csoport"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Seg�ts�g"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "N�vjegy"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Felhaszn�l�k"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Csoportok"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "A saj�t k�nyvt�r"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Bejelentkez�si n�v"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "TLS ind�t�sa"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "Felhaszn�l�"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "UserDrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Csoport"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Csoportok"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Csoport"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "�j felhaszn�l�"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "�j csoport"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "�j csoport"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "M�dos�t�s"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "T�rl�s"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "A felhaszn�l�k list�ja"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Seg�ts�g"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "A saj�t k�nyvt�r"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "A saj�t k�nyvt�r"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "Ez a n�v m�r foglalt"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Jelsz�"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "M�gsem"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "OK"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "A saj�t k�nyvt�r"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Bejelentkez�si n�v"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Jelsz�"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Jelsz�:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Saj�t k�nyvt�r"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "A felhaszn�l�k list�ja"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Jelsz�"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Csoportok"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "A csoportok list�ja"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
 # Connection Type: "Start tls", "ssl" vagy "Clear"
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "K�dolatlan"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr ""
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "M�gsem"
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "M�veletek"
diff --git a/po/id.po b/po/id.po
index 8e1595c..a4b40df 100644
--- a/po/id.po
+++ b/po/id.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2003-06-26 13:14+0900\n"
 "Last-Translator: Budi Rachmanto <rac@linux-mandrake.com>\n"
 "Language-Team: Bahasa Indonesia <id@li.org>\n"
@@ -16,205 +16,205 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr "Manajer Pengguna Linux Mandrake"
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 msgid "/_Actions"
 msgstr "/_Aksi"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 msgid "/_Edit"
 msgstr "/_Edit"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 msgid "/_Delete"
 msgstr "/_Hapus"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr "/_Saring pengguna sistem"
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 msgid "/_Options"
 msgstr "/_Opsi"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 msgid "/_File"
 msgstr "/_File"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr "/Penyega_ran"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr "/_Keluar"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 msgid "/_Add User"
 msgstr "/T_ambah Pengguna"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 msgid "/Add _Group"
 msgstr "/Tambah _Grup"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 msgid "/_Help"
 msgstr "/Per_tolongan"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr "/_Laporan Kutu"
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 msgid "/_About..."
 msgstr "/_Keterangan"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Pengguna"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 msgid "Group Users"
 msgstr "Pengguna Grup"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr "Nama Lengkap"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "Home Directory"
 msgstr "Direktori Rumah"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 msgid "Login Shell"
 msgstr "Cangkang Login"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr "Grup Utama"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Mulai tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "User ID"
 msgstr "ID Pengguna"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "User Name"
 msgstr "Nama Pengguna"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 msgid "Group ID"
 msgstr "ID Grup"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 msgid "Group Members"
 msgstr "Anggota Grup"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 msgid "Group Name"
 msgstr "Nama Grup"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add User"
 msgstr "Tambah Pengguna"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr "Tambah pengguna ke sistem"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 msgid "Add Group"
 msgstr "Tambah Grup"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 msgid "Add a group to the system"
 msgstr "Tambah grup ke sistem"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Edit"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr "Edit baris terpilih"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Hapus"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr "Hapus baris terpilih"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr "Penyegaran"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh the list"
 msgstr "Segarkan daftar"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr "Pertolongan userdrake"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Pertolongan"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr "Buat Pengguna Baru"
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 msgid "Create home Directory"
 msgstr "Buat Direktori rumah"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 msgid "Home Directory: "
 msgstr "Direktori Rumah:"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr "Buat grup privat utk pengguna"
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr "Tentukan ID pengguna secara manual"
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 msgid "User already exists, please choose another User Name"
 msgstr "Nama ini sudah dipakai, pilihlah nama lain"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 msgid "Password Mismatch"
 msgstr "Katasandi Tak Cocok"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
@@ -222,7 +222,7 @@ msgstr ""
 "Katasandi terlalu mudah.\n"
 " Harus lebih dari 6 karakter"
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -232,61 +232,51 @@ msgstr ""
 " Anda yakin ingin melakukannya?\n"
 "\n"
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr "Uid pengguna < 500"
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Batal"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Ok"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr "Pilih Grup"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr "Tambah ke grup 'pengguna'"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr "Tambah ke grup yg telah ada"
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Sudah ada grup dg nama ini. Apa yg ingin Anda lakukan?"
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr "Ya"
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr "Tidak"
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr "Tentukan ID grup secara manual"
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr "Grup sudah ada, pilihlah Nama Grup lain"
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr " Gid grup < 500"
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -296,19 +286,19 @@ msgstr ""
 " Anda yakin ingin melakukannya?\n"
 "\n"
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid " Remove Home Directory"
 msgstr " Hapus Direktori Rumah"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr "Anda ingin menghapus direktori rumah dan spool mail pengguna?"
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -317,91 +307,91 @@ msgstr ""
 "%s adalah grup utama pengguna %s\n"
 " Hapus dulu pengguna"
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Login"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Katakunci"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 msgid "Confirm Password:"
 msgstr "Konfirmasi Katasandi:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Rumah"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 msgid "User Data"
 msgstr "Data Pengguna"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr "Aktifkan kadaluarsa account"
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr "Account kadaluarsa MM/DD/YYYY :"
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr "Kunci Account Pengguna"
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr "Info Account"
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr "Katasandi diubah terakhir pada : "
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr "Aktifkan Kadaluarsa Katasandi"
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr "Jumlah hari sebelum perubahan diizinkan :"
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr "Jumlah hari sebelum perubahan dibutuhkan :"
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr "Jumlah hari peringatan sebelum perubahan :"
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr "Jumlah hari sebelum account non-aktif :"
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 msgid "Password Info"
 msgstr "Info Katasandi"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr "Pilihlah grup-grup yg akan diikuti pengguna:"
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Grup"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 msgid "Group Data"
 msgstr "Data Grup"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr "Pilih pengguna yg bergabung dg grup ini :"
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr "Pilihlah setidaknya satu grup utk pengguna"
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
@@ -409,52 +399,58 @@ msgstr ""
 "Tentukan Tahun, Bulan dan Hari\n"
 " Kadaluarsa Account"
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 #, fuzzy
 msgid "Please specify all field for password aging\n"
 msgstr "Penuhi semua isian utk umur katasandi"
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Anda tak dapat menghapus pengguna '%s' dari grup utama mereka"
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 msgid "Close"
 msgstr "Tutup"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr "Pengarang: "
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr "Manajemen Pengguna \n"
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Hakcipta (C) 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr "Isian nama kosong, berikanlah satu nama"
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Nama harus berisi hanya huruf kecil, angka, `-' dan `_'"
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr "Nama terlalu panjang"
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr "Error"
 
+#~ msgid "Cancel"
+#~ msgstr "Batal"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
 #~ msgid "/Filter system users"
 #~ msgstr "/Saring pengguna sistem"
 
diff --git a/po/it.po b/po/it.po
index a6e186b..41ba083 100644
--- a/po/it.po
+++ b/po/it.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2002-09-02 12:58+0200\n"
 "Last-Translator: Simone Riccio <s.riccio@aeb-informatica.it>\n"
 "Language-Team: Italian <IT@li.org>\n"
@@ -22,463 +22,459 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "Azioni"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Modifica"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Elimina"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Azioni"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "File"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Aggiungi utente"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Aggiungi gruppo"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Aiuto"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "A proposito"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Utenti"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Gruppi"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "Directory home dell'utente"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Login"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Avvia tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "Utente"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Gruppo"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Gruppi"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Gruppo"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Aggiungi utente"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Aggiungi gruppo"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Aggiungi un gruppo"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Modifica"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Elimina"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "Lista degli utenti"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Aiuto"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "Directory home dell'utente"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "Directory home dell'utente"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "Questo nome � gi� presente nel sistema"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Password"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Annulla"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Ok"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "Directory home dell'utente"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Login"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Password"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Password:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Home"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Lista degli utenti"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Password"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Gruppi"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Lista dei gruppi"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "Pulisci"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Copyright � 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Annulla"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Azioni"
diff --git a/po/ja.po b/po/ja.po
index f855fe1..9b0f3fb 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2-ja\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2003-06-28 18:03+0900\n"
 "Last-Translator: UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
 "Language-Team:  <ja@li.org>\n"
@@ -21,205 +21,205 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr "Mandrake Linuxのユーザ管理ツール"
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 msgid "/_Actions"
 msgstr "/アクション(_A)"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 msgid "/_Edit"
 msgstr "/編集(_E)"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 msgid "/_Delete"
 msgstr "/削除(_D)"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr "/システムユーザをフィルタ(_F)"
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 msgid "/_Options"
 msgstr "/オプション(_O)"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 msgid "/_File"
 msgstr "/ファイル(_F)"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr "/更新(_R)"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr "/終了(_Q)"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 msgid "/_Add User"
 msgstr "/ユーザを追加(_A)"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 msgid "/Add _Group"
 msgstr "/グループを追加(_G)"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 msgid "/_Help"
 msgstr "/ヘルプ(_H)"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr "/バグを報告(_R)"
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 msgid "/_About..."
 msgstr "/_About.."
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "ユーザ"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 msgid "Group Users"
 msgstr "グループユーザ"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr "フルネーム"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "Home Directory"
 msgstr "ホームディレクトリ"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 msgid "Login Shell"
 msgstr "ログインシェル"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr "第１グループ"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "tlsを開始"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "User ID"
 msgstr "ユーザのID"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "User Name"
 msgstr "ユーザ名"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 msgid "Group ID"
 msgstr "グループのID"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 msgid "Group Members"
 msgstr "グループのメンバ"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 msgid "Group Name"
 msgstr "グループ名"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add User"
 msgstr "ユーザを追加"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr "システムにユーザを追加"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 msgid "Add Group"
 msgstr "グループを追加"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 msgid "Add a group to the system"
 msgstr "システムにグループを追加"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "編集"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr "選択した欄を編集"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "削除"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr "選択した欄を削除"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr "更新"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh the list"
 msgstr "リストを更新"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr "userdrakeのヘルプ"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "ヘルプ"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr "新規ユーザを作成"
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 msgid "Create home Directory"
 msgstr "ホームディレクトリを作成"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 msgid "Home Directory: "
 msgstr "ホームディレクトリ: "
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr "ユーザのプライベートグループを作成"
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr "ユーザのIDを手動で指定"
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 msgid "User already exists, please choose another User Name"
 msgstr "その名前は既に使われています。別のユーザ名を選んでください"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 msgid "Password Mismatch"
 msgstr "パスワードが合っていません"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
@@ -227,7 +227,7 @@ msgstr ""
 "このパスワードは簡単すぎます。 \n"
 " パスワードは６文字以上にしてください"
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -237,61 +237,51 @@ msgstr ""
 "本当に作成しますか？\n"
 "\n"
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr "ユーザのUIDが500以下です"
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "キャンセル"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "OK"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr "グループを選択"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr "'ユーザ'のグループに追加"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr "既存のグループに追加"
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "このグループ名は既に存在します。どうしますか？"
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr "はい"
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr "いいえ"
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr "グループのIDを手動で指定"
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr "グループは既に存在します。別のグループ名を選んでください"
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr " グループのGIDが500以下です"
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -301,19 +291,19 @@ msgstr ""
 " 本当に作成しますか？\n"
 "\n"
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid " Remove Home Directory"
 msgstr " ホームディレクトリを削除"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr "ユーザのホームディレクトリとメールスプールを削除しますか？"
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -322,91 +312,91 @@ msgstr ""
 "%s はユーザ %s の第１グループです。\n"
 " 先にユーザを削除してください"
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "ログイン"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "パスワード"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 msgid "Confirm Password:"
 msgstr "パスワードを確認:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "ホーム"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 msgid "User Data"
 msgstr "ユーザのデータ"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr "アカウントの期限を有効にする"
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr "アカウントの期限  (例)03/28/2008 :"
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr "ユーザのアカウントをロック"
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr "アカウントの情報"
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr "ユーザのパスワードの最終変更 : "
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr "パスワードの期限を有効にする"
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr "変更を許可するまでの日数 :"
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr "変更を求めるまでの日数 :"
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr "変更前に警告する日数 :"
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr "アカウントを無効にするまでの日数 :"
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 msgid "Password Info"
 msgstr "パスワードの情報"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr "ユーザが所属するグループを選んでください:"
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "グループ"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 msgid "Group Data"
 msgstr "グループのデータ"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr "このグループに参加するユーザを選んでください :"
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr "ユーザ１人につき少なくとも１つのグループを選んでください"
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
@@ -414,52 +404,58 @@ msgstr ""
 "アカウントの期限として \n"
 "年,月,日を指定してください "
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 #, fuzzy
 msgid "Please specify all field for password aging\n"
 msgstr "パスワードの全ての日付欄を埋めてください"
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "ユーザ '%s' を第１グループから削除することはできません"
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 msgid "Close"
 msgstr "閉じる"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr "作者: "
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr "ユーザの管理 \n"
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Copyright (C) 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr "名前欄が空白です。入力してください"
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "名前は小文字,数字,`-',`_'で入力してください"
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr "名前が長すぎます"
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr "エラー"
 
+#~ msgid "Cancel"
+#~ msgstr "キャンセル"
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
 #~ msgid "/Filter system users"
 #~ msgstr "/システムユーザをフィルタ"
 
diff --git a/po/ka.po b/po/ka.po
index 8685c3a..3c333d8 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2003-01-29 23:48+0400\n"
 "Last-Translator: Aiet Kolkhi <aiet@gmx.net>\n"
 "Language-Team: Georgian\n"
@@ -17,461 +17,457 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "დამუშავება"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "დამუშავება"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "წაშლა"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "დამუშავება"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "ფაილი"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "მომხმარებლის დამატება"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "ჯგუფის დამატება"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "დახმარება"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "ინფორმაცია..."
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 #, fuzzy
 msgid "Users"
 msgstr "მომხმარებელი"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "ჯგუფ(ებ)ი"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "მომხმარებლის პირადი უჯრა"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "მომხმარებელი"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "Status"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "მომხმარებელი"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "UserDrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "ჯგუფ(ებ)ი"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "ჯგუფ(ებ)ი"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "ჯგუფ(ებ)ი"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "მომხმარებლის დამატება"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "ჯგუფის დამატება"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "ჯგუფის დამატება"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "დამუშავება"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "წაშლა"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "მომხმარებელთა სია"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "დახმარება"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "მომხმარებლის პირადი უჯრა"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "მომხმარებლის პირადი უჯრა"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 msgid "User already exists, please choose another User Name"
 msgstr ""
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "პაროლი"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "სტოპ!"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "OK"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "მომხმარებლის პირადი უჯრა"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "მომხმარებელი"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "პაროლი"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "პაროლი"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "პირადი უჯრა"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "მომხმარებელთა სია"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "პაროლი"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "ჯგუფ(ებ)ი"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "ჯგუფთა სია"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 msgid "Close"
 msgstr ""
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr ""
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "სტოპ!"
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "დამუშავება"
diff --git a/po/ko.po b/po/ko.po
index 62cfbf0..e33afad 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\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"
@@ -16,464 +16,460 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "����"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "����"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "����"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "����"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "����"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "����� �߰�"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "�׷� �߰�"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "����"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "�� ���α׷���..."
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "�����"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "�׷�"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "����� Ȩ ���丮"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "�α��θ�"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "TLS ����"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "�����"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "����ڵ巹��ũ"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "�׷�"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "�׷�"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "�׷�"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "����� �߰�"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "�׷� �߰�"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "�׷� �߰�"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "����"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "����"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "����� ���"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "����"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "����� Ȩ ���丮"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "����� Ȩ ���丮"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "�̹� �����ϴ� �̸��Դϴ�."
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "��ȣ"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "���"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Ȯ��"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "����� Ȩ ���丮"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "�α��θ�"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "��ȣ"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "��ȣ:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Ȩ ���丮"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "����� ���"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "��ȣ"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "�׷�"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "�׷� ���"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "�����"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 #, fuzzy
 msgid "Userdrake"
 msgstr "����ڵ巹��ũ"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr ""
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "���"
+
+#~ msgid "Ok"
+#~ msgstr "Ȯ��"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "����"
diff --git a/po/lt.po b/po/lt.po
index da6c1aa..b020f68 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2000-10-19 10:25+0200\n"
 "Last-Translator: Mykolas Norvai�as <myka@centras.lt>\n"
 "Language-Team: Lithuanian\n"
@@ -16,462 +16,458 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "Veiksmai"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Redaguoti"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "I�trinti"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Veiksmai"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Byla"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Prid�ti vartotoj�"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Prid�ti grup�"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Pagalba"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "Apie"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Vartotojai"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Grup�s"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "Vartotoj� nam� katalogas"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Prisijungti"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "Status"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "Vartotojas"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Grup�"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Grup�s"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Grup�"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Prid�ti vartotoj�"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Prid�ti grup�"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Prid�ti grup�"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Redaguoti"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "I�trinti"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "Vartotoj� s�ra�as"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Pagalba"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "Vartotoj� nam� katalogas"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "Vartotoj� nam� katalogas"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "�is vardas jau yra sitemoje"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Slapta�odis"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "At�aukti"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Gerai"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "Vartotoj� nam� katalogas"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Prisijungti"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Slapta�odis"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Slapta�odis"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Nam�"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Vartotoj� s�ra�as"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 #, fuzzy
 msgid "User last changed password on : "
 msgstr "Negaliu pakeisti slapt"
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Slapta�odis"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Grup�s"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Grupi� s�ra�as"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 msgid "Close"
 msgstr ""
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr ""
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "At�aukti"
+
+#~ msgid "Ok"
+#~ msgstr "Gerai"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Veiksmai"
diff --git a/po/lv.po b/po/lv.po
index d393b2b..093dca1 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2002-09-25 18:44+0200\n"
 "Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
 "Language-Team: ll10nt <ll10nt@listes.murds.lv>\n"
@@ -16,463 +16,459 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "Darb�bas"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Labot"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Dz�st"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Darb�bas"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Fails"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Pievienot lietot�ju"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Pievienot grupu"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Pal�dz�ba"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "Par"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Lietot�ji"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Grupas"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "LIetot�ja m�jas katalogs"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Login"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Palaist tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "Lietot�js"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Grupa"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Grupas"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Grupa"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Pievienot lietot�ju"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Pievienot grupu"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Pievienot grupu"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Labot"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Dz�st"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "Lietot�ju saraksts"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Pal�dz�ba"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "LIetot�ja m�jas katalogs"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "LIetot�ja m�jas katalogs"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "Sist�m� jau eksist� ��ds v�rds"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Parole"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Atcelt"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Ok"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "LIetot�ja m�jas katalogs"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Login"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Parole"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Parole:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "M�jas"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Lietot�ju saraksts"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Parole"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Grupas"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Grupu saraksts"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "Izt�r�t"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Autorties�bas � 2003 MandrakeSoft."
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Atcelt"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Darb�bas"
diff --git a/po/mk.po b/po/mk.po
index 9c4ecda..0ee47f0 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2003-02-07 14:18+0100\n"
 "Last-Translator: Danko Ilik <danko@mindless.com>\n"
 "Language-Team: Macedonian <mkde-l10n@lists.sourceforge.net>\n"
@@ -18,463 +18,459 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "Акции"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Уреди"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Отстрани"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Акции"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Датотека"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Додај корисник"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Додај група"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Помош"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "За"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Корисници"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Групи"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "Кориснички домашен дир."
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Login"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Вклучи tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "Корисник"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Група"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Групи"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Група"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Додај корисник"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Додај група"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Додај група"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Уреди"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Отстрани"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "Листа на корисници"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Помош"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "Кориснички домашен дир."
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "Кориснички домашен дир."
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "Ова име веќе постои на системот"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Лозинка"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Откажи"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Во ред"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "Кориснички домашен дир."
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Login"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Лозинка"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Лозинка:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Дома"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Листа на корисници"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Лозинка"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Групи"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Листа на групи"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "Исчисти"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr ""
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Откажи"
+
+#~ msgid "Ok"
+#~ msgstr "Во ред"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Акции"
diff --git a/po/mn.po b/po/mn.po
index 3128bbd..0465892 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2003-05-14 00:28+0200\n"
 "Last-Translator: Khurelbaatar Lkhagvasuren <hujii@dhtech.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
@@ -18,464 +18,460 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "Үйлдэлүүд"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Засах"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Устгах"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Үйлдэлүүд"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Файл"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Хэрэглэгч нэмэх"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Групп нэмэх"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Тусламж"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "Тухай"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Хэрэглэгчид"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Группүүд"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "Хэрэглэгчийн гэрийн зам"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Нэвтрэх"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "tls-г эхлүүлэх"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "Хэрэглэгч"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Хэрэглэгчийн драке"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Групп"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Группүүд"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Групп"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Хэрэглэгч нэмэх"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Групп нэмэх"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Шинэ групп нэмэх"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Засах"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Устгах"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "Хэрэглэгчидийн жагсаалт"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Тусламж"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "Хэрэглэгчийн гэрийн зам"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "Хэрэглэгчийн гэрийн зам"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "Энэ нэр хэдийн системд орсон байна"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Нууц үг"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Хүчингүй"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Ок"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "Хэрэглэгчийн гэрийн зам"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Нэвтрэх"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Нууц үг"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Нууц үг:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Эзний гэр"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Хэрэглэгчидийн жагсаалт"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Нууц үг"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Группүүд"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Группийн жагсаалт"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "Цэвэрлэх"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 #, fuzzy
 msgid "Userdrake"
 msgstr "Хэрэглэгчийн драке"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr ""
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Хүчингүй"
+
+#~ msgid "Ok"
+#~ msgstr "Ок"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Үйлдэлүүд"
diff --git a/po/ms.po b/po/ms.po
index 991bab0..f047cfe 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2002-12-16 11:15+0800\n"
 "Last-Translator: Yuzz <yuzz@emasonline.com>\n"
 "Language-Team: Malaysia <yuzz@emasonline.com>\n"
@@ -17,463 +17,459 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "Aksi"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Edit"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Hapus"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Aksi"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Fail"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Tambah user"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Tambah kumpulan"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Pertolongan"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "Mengenai"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "User"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Kumpulan"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "Direktori rumah user"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Login"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Mula tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "User"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Kumpulan"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Kumpulan"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Kumpulan"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Tambah user"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Tambah kumpulan"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Tambah Kumpulan"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Edit"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Hapus"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "Daftar user"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Pertolongan"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "Direktori rumah user"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "Direktori rumah user"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "Nama ini sudah sedia adai dalam sistem"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Katalaluan"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Batal"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Ok"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "Direktori rumah user"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Login"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Katalaluan"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Katalaluan:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Rumah"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Daftar user"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Katalaluan"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Kumpulan"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Daftar kumpulan"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "Terang"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Hakcipta © 2003 MandrakeSoft."
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Batal"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Aksi"
diff --git a/po/mt.po b/po/mt.po
index 28fa726..56cf4f0 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2002-07-27 06:37CET\n"
 "Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
 "Language-Team: Maltese <mt@li.org>\n"
@@ -17,463 +17,459 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "Azzjonijiet"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Biddel"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Ħassar"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Azzjonijiet"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Fajl"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Żid user"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Żid grupp"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Għajnuna"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "Dwar"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Users"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Gruppi"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "Direttorju personali tal-user"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Login"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Ibda' tls "
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "User"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Grupp"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Gruppi"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Grupp"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Żid user"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Żid grupp"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Żid grupp"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Biddel"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Ħassar"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "Lista ta' users"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Għajnuna"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "Direttorju personali tal-user"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "Direttorju personali tal-user"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "Dan l-isem diġà jeżisti fis-sistema"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Password"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Ikkanċella"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Ok"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "Direttorju personali tal-user"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Login"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Password"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Password:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Direttorju personali"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Lista ta' users"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Password"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Gruppi"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Lista ta' gruppi"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "Neħħi"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Copyright © 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Ikkanċella"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Azzjonijiet"
diff --git a/po/nb.po b/po/nb.po
index 2e46c66..138fce0 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2001-09-23 14:02CET\n"
 "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
 "Language-Team: norwegian\n"
@@ -18,463 +18,459 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.8\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "Handlinger"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Rediger"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Slett"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Handlinger"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Fil"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Legg til bruker"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Legg til gruppe"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Hjelp"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "Om"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Brukere"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Grupper"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "Bruker hjemmekatalog"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Innlogg"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Start tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "Bruker"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Gruppe"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Grupper"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Gruppe"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Legg til bruker"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Legg til gruppe"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Legg til en gruppe"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Rediger"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Slett"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "Brukerliste"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "Bruker hjemmekatalog"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "Bruker hjemmekatalog"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "Dette navnet eksisterer allerede i systemet"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Passord"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Ok"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "Bruker hjemmekatalog"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Innlogg"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Passord"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Passord:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Hjem"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Brukerliste"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Passord"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Grupper"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Gruppeliste"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "Klar"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Copyright � 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Avbryt"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Handlinger"
diff --git a/po/nl.po b/po/nl.po
index 680910c..411c49f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2002-08-24 22:17+0100\n"
 "Last-Translator: Reinout van Schouwen <reinout@cs.vu.nl>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -18,463 +18,459 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "Acties"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Bewerken"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Verwijderen"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Acties"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Bestand"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Voeg gebruiker toe"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Groep toevoegen"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Hulp"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "Info"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Gebruikers"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Groepen"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "Thuis-map gebruiker"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Aanmeldnaam"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Start tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "Gebruiker"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Groep"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Groepen"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Groep"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Voeg gebruiker toe"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Groep toevoegen"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Groep toevoegen"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Bewerken"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "Gebruikerslijst"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Hulp"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "Thuis-map gebruiker"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "Thuis-map gebruiker"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "Deze naam bestaat reeds op het systeem"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Wachtwoord"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "OK"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "Thuis-map gebruiker"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Aanmeldnaam"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Wachtwoord:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Thuismap"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Gebruikerslijst"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Wachtwoord"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Groepen"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Groepslijst"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "Wissen"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Copyright © 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Annuleren"
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Acties"
diff --git a/po/pl.po b/po/pl.po
index 7c3072b..51d5991 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2002-07-14 02:02+0200\n"
 "Last-Translator: Arkadiusz Lipiec <alipiec@elka.pw.edu.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -18,463 +18,459 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.5.5\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "Czynno�ci"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Edytuj"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Usu�"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Czynno�ci"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Plik"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Dodaj u�ytkownika"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Dodaj grup�"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Pomoc"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "O programie"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "U�ytkownicy"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Grupy"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "Katalog domowy u�ytkownika"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "U�ytkownik"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Uruchamianie tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "U�ytkownik"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Grupa"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Grupy"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Grupa"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Dodaj u�ytkownika"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Dodaj grup�"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Dodaj grup�"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Edytuj"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Usu�"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "Lista u�ytkownik�w"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "Katalog domowy u�ytkownika"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "Katalog domowy u�ytkownika"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "To nazwisko ju� istnieje w systemie"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Has�o"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Ok"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "Katalog domowy u�ytkownika"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "U�ytkownik"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Has�o"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Has�o:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Katalog domowy"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Lista u�ytkownik�w"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Has�o"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Grupy"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Lista grup"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "Czyste"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr ""
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Anuluj"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Czynno�ci"
diff --git a/po/pt.po b/po/pt.po
index 4525fd6..e66f48b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2-pt\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2003-06-24 12:31+0200\n"
 "Last-Translator: Jose JORGE <jjorge@free.fr>\n"
 "Language-Team: portugu�s <pt@li.org>\n"
@@ -21,207 +21,207 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr "Ferramenta de Gest�o dos Utilizadores Mandrake Linux"
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 msgid "/_Actions"
 msgstr "/_Ac��es"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 msgid "/_Delete"
 msgstr "/_Apagar"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr "/_Filtrar os utilizadores sistema"
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 msgid "/_Options"
 msgstr "/_Op��es"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 msgid "/_File"
 msgstr "/_Ficheiro"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr "/_Recarregar"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr "/_Sair"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 msgid "/_Add User"
 msgstr "/_Adicionar Utilizador"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 msgid "/Add _Group"
 msgstr "/Adicionar _Grupo"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr "/_Communicar um Erro"
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 msgid "/_About..."
 msgstr "/_Acerca..."
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Utilizadores"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 msgid "Group Users"
 msgstr "Utilizadores do Grupo"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr "Nome Completo"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "Home Directory"
 msgstr "Directoria Pessoal"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 msgid "Login Shell"
 msgstr "Linha de Commando"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr "Grupo Principal"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Iniciar tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "User ID"
 msgstr "ID Utilizador"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "User Name"
 msgstr "Nome do Utilizador"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 msgid "Group ID"
 msgstr "ID Grupo"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 msgid "Group Members"
 msgstr "Membros do Grupo"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 msgid "Group Name"
 msgstr "Nome do Grupo"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add User"
 msgstr "Adicionar Utilizador"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr "Adiciona um utilizador ao sistema"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 msgid "Add Group"
 msgstr "Adicionar Grupo"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 msgid "Add a group to the system"
 msgstr "Adiciona um grupo ao sistema"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Editar"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr "Edita a linha seleccionada"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Apagar"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr "Apaga a linha seleccionada"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr "Recarregar"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh the list"
 msgstr "Recarrega a lista"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr "Ajuda geral do userdrake"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr "Criar um Novo Utilizador"
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 msgid "Create home Directory"
 msgstr "Criar a Directoria pessoal"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 msgid "Home Directory: "
 msgstr "Directoria Pessoal : "
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 msgid "User already exists, please choose another User Name"
 msgstr ""
 "Este utilizador j� existe no sistema, escolha por favor outro Nome de "
 "Utilizador"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 msgid "Password Mismatch"
 msgstr "As senhas s�o diferentes"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
@@ -229,228 +229,224 @@ msgstr ""
 "Esta senha � demasiado simples. \n"
 " As boas senhas deveriam ter mais de 6 simbolos"
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Ok"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid " Remove Home Directory"
 msgstr " Apaga a Directoria Pessoal"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Login"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Senha"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 msgid "Confirm Password:"
 msgstr "Confirme a Senha :"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Directoria pessoal (home)"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 msgid "User Data"
 msgstr "Dados do Utilizador"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr "O utilizador alterou a senha em : "
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 msgid "Password Info"
 msgstr "Informa��o da Senha"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Grupos"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 msgid "Group Data"
 msgstr "Dados do Grupo"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 msgid "Close"
 msgstr "Fechar"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Copyright � 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
 #~ msgid "/Filter system users"
 #~ msgstr "/Filtrar os utilizadores sistema"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 02407fc..2ac9ade 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,8 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-pt_BR\n"
-"POT-Creation-Date: 2003-07-04 16:26+0200\n"
-"PO-Revision-Date: 2003-07-08 00:51-0300\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
+"PO-Revision-Date: 2003-07-09 15:58-0300\n"
 "Last-Translator: Clovis Nogueira Jr <linux_pt_BR@yahoogrupos.com.br>\n"
 "Language-Team: Portugues Brasileiro <pt@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,225 +21,205 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr "Ferramenta de Gerenciamento de Usu�rios Mandrake Linux"
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
-#, fuzzy
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 msgid "/_Actions"
 msgstr "A��es"
 
-#: ../userdrake_.c:79
-#, fuzzy
+#: ../userdrake_.c:65
 msgid "/_Edit"
 msgstr "Editar"
 
-#: ../userdrake_.c:80
-#, fuzzy
+#: ../userdrake_.c:66
 msgid "/_Delete"
 msgstr "Apagar"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr "Filtrar usu�rios do sistema"
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 msgid "/_Options"
 msgstr "Op��es"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
-#, fuzzy
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 msgid "/_File"
 msgstr "Arquivo"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr "Atualizar"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr "Encerrar"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
-#, fuzzy
+#: ../userdrake_.c:75
 msgid "/_Add User"
 msgstr "Adicionar usu�rio"
 
-#: ../userdrake_.c:90
-#, fuzzy
+#: ../userdrake_.c:76
 msgid "/Add _Group"
 msgstr "Adicionar grupo"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
-#, fuzzy
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 msgid "/_Help"
 msgstr "Ajuda"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr "Relat�rio de erros"
 
-#: ../userdrake_.c:99
-#, fuzzy
+#: ../userdrake_.c:87
 msgid "/_About..."
 msgstr "Sobre"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:117
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Usu�rios"
 
-#: ../userdrake_.c:118 ../userdrake_.c:615
-#, fuzzy
+#: ../userdrake_.c:106 ../userdrake_.c:602
 msgid "Group Users"
-msgstr "Grupos"
+msgstr "Grupo de Usu�rios"
 
-#: ../userdrake_.c:131 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr "Nome completo"
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 msgid "Home Directory"
 msgstr "Diret�rio do usu�rio"
 
-#: ../userdrake_.c:131 ../userdrake_.c:495
-#, fuzzy
+#: ../userdrake_.c:119 ../userdrake_.c:481
 msgid "Login Shell"
 msgstr "Login"
 
-#: ../userdrake_.c:131 ../userdrake_.c:568
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr "Grupo prim�rio"
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Iniciar tls"
 
-#: ../userdrake_.c:131
-#, fuzzy
+#: ../userdrake_.c:119
 msgid "User ID"
 msgstr "Usu�rio"
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 msgid "User Name"
 msgstr "Nome do usu�rio"
 
-#: ../userdrake_.c:137
-#, fuzzy
+#: ../userdrake_.c:125
 msgid "Group ID"
 msgstr "Grupo"
 
-#: ../userdrake_.c:137
-#, fuzzy
+#: ../userdrake_.c:125
 msgid "Group Members"
-msgstr "Grupos"
+msgstr "Membros do Grupo"
 
-#: ../userdrake_.c:137 ../userdrake_.c:506
+#: ../userdrake_.c:125 ../userdrake_.c:492
 msgid "Group Name"
 msgstr "Nome do grupo"
 
-#: ../userdrake_.c:143
-#, fuzzy
+#: ../userdrake_.c:131
 msgid "Add User"
 msgstr "Adicionar usu�rio"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr "Adiciona um usu�rio ao sistema"
 
-#: ../userdrake_.c:144
-#, fuzzy
+#: ../userdrake_.c:132
 msgid "Add Group"
 msgstr "Adicionar grupo"
 
-#: ../userdrake_.c:144
-#, fuzzy
+#: ../userdrake_.c:132
 msgid "Add a group to the system"
-msgstr "Adicionar um grupo"
+msgstr "Adicionar um grupo ao sistema"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Editar"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr "Editar linha selecionada"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Apagar"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr "Apagar linha selecionada"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:135
 msgid "Refresh the list"
 msgstr "Atualizar a lista de usu�rios"
 
-#: ../userdrake_.c:148
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr "Ajuda no UserDrake"
 
-#: ../userdrake_.c:148
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../userdrake_.c:175
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:175
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:210 ../userdrake_.c:344
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr "Criar novo usu�rio"
 
-#: ../userdrake_.c:217
-#, fuzzy
+#: ../userdrake_.c:205
 msgid "Create home Directory"
-msgstr "Diret�rio home do usu�rio"
+msgstr "Diret�rio principal do usu�rio"
 
-#: ../userdrake_.c:219
-#, fuzzy
+#: ../userdrake_.c:207
 msgid "Home Directory: "
-msgstr "Diret�rio home do usu�rio"
+msgstr "Diret�rio principal"
 
-#: ../userdrake_.c:222
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr "Criar grupo privado deste usu�rio"
 
-#: ../userdrake_.c:223
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr "Informe manualmente o ID deste usu�rio"
 
-#: ../userdrake_.c:234
-#, fuzzy
+#: ../userdrake_.c:222
 msgid "User already exists, please choose another User Name"
-msgstr "Esse nome j� existe no sistema"
+msgstr "Esse nome j� existe. Por favor escolha outro."
 
-#: ../userdrake_.c:236 ../userdrake_.c:647
-#, fuzzy
+#: ../userdrake_.c:224 ../userdrake_.c:634
 msgid "Password Mismatch"
-msgstr "Senha"
+msgstr "Senhas diferentes"
 
-#: ../userdrake_.c:237 ../userdrake_.c:649
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
@@ -247,7 +227,7 @@ msgstr ""
 "Esta senha � muito simples. \n"
 "Senhas seguras devem ter mais de 6 caracteres."
 
-#: ../userdrake_.c:248
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -257,61 +237,51 @@ msgstr ""
 "Voce tem certeza que quer isso?\n"
 "\n"
 
-#: ../userdrake_.c:248
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr "UID do usu�rio < 500"
 
-#: ../userdrake_.c:286 ../userdrake_.c:322 ../userdrake_.c:375
-#: ../userdrake_.c:753
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../userdrake_.c:286 ../userdrake_.c:318 ../userdrake_.c:375
-#: ../userdrake_.c:753 ../userdrake_.c:885
-msgid "Ok"
-msgstr "Ok"
-
-#: ../userdrake_.c:297
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr "UID"
 
-#: ../userdrake_.c:309
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr "Selecione um Grupo"
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr "Adicione usu�rio ao grupo"
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr "Adicione a um grupo existente"
 
-#: ../userdrake_.c:314
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "Um grupo com este nome j� existe. O que voce quer fazer?"
 
-#: ../userdrake_.c:335
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr "Sim"
 
-#: ../userdrake_.c:339
+#: ../userdrake_.c:328
 msgid "No"
 msgstr "N�o"
 
-#: ../userdrake_.c:350
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr "Informe manualmente o ID do grupo"
 
-#: ../userdrake_.c:361
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr "Este grupo j� existe. Por favor, escolha outro nome"
 
-#: ../userdrake_.c:365
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr "Identifica��o do Grupo � < de 500"
 
-#: ../userdrake_.c:365
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -321,20 +291,19 @@ msgstr ""
 "Voce tem certeza que quer isso?\n"
 "\n"
 
-#: ../userdrake_.c:380
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr "GID"
 
-#: ../userdrake_.c:431
-#, fuzzy
+#: ../userdrake_.c:419
 msgid " Remove Home Directory"
-msgstr "Diret�rio home do usu�rio"
+msgstr "Remove diret�rio principal do usu�rio"
 
-#: ../userdrake_.c:431
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr "Voce quer apagar o diret�rio do usu�rio e o arquivo de mensagens?"
 
-#: ../userdrake_.c:441
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -343,99 +312,91 @@ msgstr ""
 "%s � o grupo principal do usu�rio %s\n"
 "Primeiro apague o usu�rio"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Login"
 
-#: ../userdrake_.c:493
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Senha"
 
-#: ../userdrake_.c:494
-#, fuzzy
+#: ../userdrake_.c:480
 msgid "Confirm Password:"
-msgstr "Senha:"
+msgstr "Confirme a senha:"
 
-#: ../userdrake_.c:529
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Home"
 
-#: ../userdrake_.c:531
-#, fuzzy
+#: ../userdrake_.c:518
 msgid "User Data"
-msgstr "Lista de usu�rios"
+msgstr "Dados do usu�rio"
 
-#: ../userdrake_.c:535
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr "Permite vencimento da conta"
 
-#: ../userdrake_.c:537
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr "Conta termina em   MM/DD/YYYY ."
 
-#: ../userdrake_.c:543
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr "Trava a conta do usu�rio"
 
-#: ../userdrake_.c:544
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr "Informa��es da conta"
 
-#: ../userdrake_.c:549
-#, fuzzy
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr "�ltima mudan�a de senha"
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr "Permite vencimento da senha"
 
-#: ../userdrake_.c:556
-#, fuzzy
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr "Dias antes do vencimento"
 
-#: ../userdrake_.c:557
-#, fuzzy
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr "Dias depois do vencimento"
 
-#: ../userdrake_.c:558
-#, fuzzy
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr "Dias de alerta antes do vencimento"
 
-#: ../userdrake_.c:559
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr "Dias antes de conta inativa"
 
-#: ../userdrake_.c:561
-#, fuzzy
+#: ../userdrake_.c:548
 msgid "Password Info"
-msgstr "Senha"
+msgstr "Informa��es de Senha"
 
-#: ../userdrake_.c:565
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr "Selecione os grupos que este usu�rio poder� ser membro:"
 
-#: ../userdrake_.c:571
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Grupos"
 
-#: ../userdrake_.c:611
-#, fuzzy
+#: ../userdrake_.c:598
 msgid "Group Data"
 msgstr "Lista de grupos"
 
-#: ../userdrake_.c:614
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr "Selecione os usu�rios para juntar-se a este grupo:"
 
-#: ../userdrake_.c:678
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr "Por favor, selecione ao menos um grupo para este usu�rio"
 
-#: ../userdrake_.c:687
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
@@ -443,50 +404,49 @@ msgstr ""
 "Favor informar Ano, Mes e Dia\n"
 "de vencimento desta conta"
 
-#: ../userdrake_.c:694
+#: ../userdrake_.c:680
 #, fuzzy
 msgid "Please specify all field for password aging\n"
 msgstr "Favor especificar os campos de a��o da senha"
 
-#: ../userdrake_.c:736
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Voce n�o pode remover o usu�rio '%s' deste grupo prim�rio"
 
-#: ../userdrake_.c:848
-#, fuzzy
+#: ../userdrake_.c:827
 msgid "Close"
-msgstr "Limpar"
+msgstr "Fechar"
 
-#: ../userdrake_.c:854
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:860
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr "Autores:"
 
-#: ../userdrake_.c:866
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr "Gerenciamento de Usu�rios\n"
 
-#: ../userdrake_.c:867
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Copyright � 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:873
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr "O campo do nome est� vazio! Coloque um nome"
 
-#: ../userdrake_.c:874
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "O nome deve conter apenas caracteres min�sculos, n�meros,'-' e '_'"
 
-#: ../userdrake_.c:875
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr "Nome muito grande"
 
-#: ../userdrake_.c:879
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr "Erro"
 
@@ -496,18 +456,21 @@ msgstr "Erro"
 #~ msgid "/Options"
 #~ msgstr "Op��es"
 
-#, fuzzy
 #~ msgid "/Actions"
 #~ msgstr "A��es"
 
-#, fuzzy
 #~ msgid "/Edit"
 #~ msgstr "Editar"
 
-#, fuzzy
 #~ msgid "/Delete"
 #~ msgstr "Apagar"
 
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
 #~ msgid "Reload"
 #~ msgstr "Atualizar"
 
diff --git a/po/ro.po b/po/ro.po
index 3cc07d6..10fa703 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2-ro\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2003-06-25 21:05+0200\n"
 "Last-Translator: Harald Ersch <harald@ersch.ro>\n"
 "Language-Team: Romanian\n"
@@ -18,206 +18,206 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr "Unealta de administrare a utilizatorilor Mandrake Linux"
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 msgid "/_Actions"
 msgstr "/_Acţiuni"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 msgid "/_Edit"
 msgstr "/_Editează"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 msgid "/_Delete"
 msgstr "/_Şterge"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr "/_Filtrare utilizatori sistem"
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 msgid "/_Options"
 msgstr "/_Opţiuni"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 msgid "/_File"
 msgstr "/_Fişier"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr "/Actualiza_re"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr "/_Terminare"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 msgid "/_Add User"
 msgstr "/_Adaugă utilizator"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 msgid "/Add _Group"
 msgstr "/Adaugă _grup"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 msgid "/_Help"
 msgstr "/A_jutor"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr "/_Raportare eroare"
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 msgid "/_About..."
 msgstr "/_Despre..."
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Utilizatori"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 msgid "Group Users"
 msgstr "Grupuri de utilizatori"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr "Nume complet"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "Home Directory"
 msgstr "Directorul iniţial al utilizatorului"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 msgid "Login Shell"
 msgstr "Interpretor de comenzi"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr "Grup principal"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Porneşte TLS"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "User ID"
 msgstr "ID utilizator"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "User Name"
 msgstr "Nume utilizator"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 msgid "Group ID"
 msgstr "ID Grup"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 msgid "Group Members"
 msgstr "Membrii din grup"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 msgid "Group Name"
 msgstr "Nume grup"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add User"
 msgstr "Adaugă utilizator"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr "Adaugă un utilizator la sistem"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 msgid "Add Group"
 msgstr "Adaugă grup"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 msgid "Add a group to the system"
 msgstr "Adaugă un grup la sistem"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Editează"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr "Editează rândul selectat"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Şterge"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr "Şterge rândul selectat"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr "Actualizare"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh the list"
 msgstr "Actualizare listă utilizatori"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr "Ajutor general pentru Userdrake"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Ajutor"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr "Creează un utilizator nou"
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 msgid "Create home Directory"
 msgstr "Creează directorul iniţial al utilizatorului"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 msgid "Home Directory: "
 msgstr "Directorul iniţial al utilizatorului"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr "Creează un grup privat pentru utilizator"
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr "Specificare manuală ID utilizator"
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 msgid "User already exists, please choose another User Name"
 msgstr ""
 "Acest utilizator exista deja, vă rog să folosiţi un alt nume de utilizator"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 msgid "Password Mismatch"
 msgstr "Nepotrivire parolă"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
@@ -225,7 +225,7 @@ msgstr ""
 "Această parolă este prea simplă.\n"
 "Parolele  bune au mai mult de 6 caractere alfanumerice"
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -235,62 +235,52 @@ msgstr ""
 "Chiar doriţi acest lucru?\n"
 "\n"
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr "ID-ul utilizatorului este mai mic de 500"
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Renunţă"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "OK"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr "Selectare grup"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr "Adaugă la grupul 'users'"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr "Adaugă la un grup existent"
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 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_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr "Da"
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr "Nu"
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr "Specificare manuală ID grup"
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 "Grupul cu acest nume există deja, vă rog sa alegeţi un alt nume pentru grup."
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr "ID-ul grupului este mai mic de 500"
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -300,21 +290,21 @@ msgstr ""
 "Chiar doriţi acest lucru?\n"
 "\n"
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid " Remove Home Directory"
 msgstr " Şterge directorul iniţial al utilizatorului"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 "Doriţi ştergerea directorului iniţial al utilizatorului şi conţinutul "
 "căsuţei sale poştale?"
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -323,91 +313,91 @@ msgstr ""
 "%s este grup principal pentru utilizatorul %s\n"
 " Ştergeţi întâi utilizatorul"
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Logare"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Parolă"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 msgid "Confirm Password:"
 msgstr "Confirmare parolă:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Acasă"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 msgid "User Data"
 msgstr "Date utilizatori"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr "Activare expirare cont"
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr "Contul expiră   MM/DD/YYY"
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr "Blocare cont utilizator"
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr "Informaţii despre cont"
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr "Utilizatorul a modificat parola ultima dată în : "
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr "Activare expirare parolă"
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr "Zile înainte de permiterea modificării : "
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr "Zile înainte de cererea modificării : "
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr "Zile îde averizare inaintea termenului modificării : "
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr "Zile înaintea dezactivării contului : "
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 msgid "Password Info"
 msgstr "Informaţii despre parolă"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr "Selectaţi grupurile la care utilizatorul va aparţine:"
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Grupuri"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 msgid "Group Data"
 msgstr "Date despre grupuri"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr "Selectaţi utilizatorii ce vor aparţine acestui grup :"
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr "Vă rog să selectaţi cel putin un grup pt. utilizator"
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
@@ -415,53 +405,59 @@ msgstr ""
 "Vă rog să specificaţi anul, luna şi ziua\n"
 "de expirare a contului "
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 #, fuzzy
 msgid "Please specify all field for password aging\n"
 msgstr "Vă rog să specificaţi toate câmpurile legate de expirarea parolei"
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Nu se poate şterge utilizatorul '%s' din grupul său principal"
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 msgid "Close"
 msgstr "Închide"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 #, fuzzy
 msgid "Userdrake"
 msgstr "Userdrake2"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr "Autori: "
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr "Administrare utilizatori \n"
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Copyright (C) 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr "Câmpul Nume este gol, completaţi-l"
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Numele trebuie să conţină numai litere mici, numere, `-' şi `_'"
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr "Numele este prea lung"
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr "Eroare"
 
+#~ msgid "Cancel"
+#~ msgstr "Renunţă"
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
 #~ msgid "/Filter system users"
 #~ msgstr "/Filtrare utilizatori sistem"
 
diff --git a/po/ru.po b/po/ru.po
index 664f581..2cb7337 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-04 16:26+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2003-07-07 13:39+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <cooker-i18n@linux-mandrake.com>\n"
@@ -18,205 +18,205 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr "������� ��� ���������� �������������� Mandrake Linux"
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 msgid "/_Actions"
 msgstr "/_��������"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 msgid "/_Edit"
 msgstr "/_�������������"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 msgid "/_Delete"
 msgstr "/_�������"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr "/_������������� ������������� �������"
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 msgid "/_Options"
 msgstr "/_��������"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 msgid "/_File"
 msgstr "/_����"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr "/_��������"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr "/_�����"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 msgid "/_Add User"
 msgstr "/�������� _������������"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 msgid "/Add _Group"
 msgstr "/�������� _������"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 msgid "/_Help"
 msgstr "/_�������"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr "/_����� �� ������"
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 msgid "/_About..."
 msgstr "/_� ���������..."
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr "��������� ������"
 
-#: ../userdrake_.c:117
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "������������"
 
-#: ../userdrake_.c:118 ../userdrake_.c:615
+#: ../userdrake_.c:106 ../userdrake_.c:602
 msgid "Group Users"
 msgstr "������ �������������"
 
-#: ../userdrake_.c:131 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr "������ ���"
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 msgid "Home Directory"
 msgstr "�������� �������"
 
-#: ../userdrake_.c:131 ../userdrake_.c:495
+#: ../userdrake_.c:119 ../userdrake_.c:481
 msgid "Login Shell"
 msgstr "��������� ���������"
 
-#: ../userdrake_.c:131 ../userdrake_.c:568
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr "������� ������"
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 msgid "Status"
 msgstr "������"
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 msgid "User ID"
 msgstr "ID ������������"
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 msgid "User Name"
 msgstr "��� ������������"
 
-#: ../userdrake_.c:137
+#: ../userdrake_.c:125
 msgid "Group ID"
 msgstr "ID ������"
 
-#: ../userdrake_.c:137
+#: ../userdrake_.c:125
 msgid "Group Members"
 msgstr "����� ������"
 
-#: ../userdrake_.c:137 ../userdrake_.c:506
+#: ../userdrake_.c:125 ../userdrake_.c:492
 msgid "Group Name"
 msgstr "��� ������"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:131
 msgid "Add User"
 msgstr "�������� ������������"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr "�������� ������������ � �������"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:132
 msgid "Add Group"
 msgstr "�������� ������"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:132
 msgid "Add a group to the system"
 msgstr "�������� ������ � �������"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "�������������"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr "������������� ��������� ������"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "�������"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr "������� ��������� ������"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr "��������"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:135
 msgid "Refresh the list"
 msgstr "�������� ������"
 
-#: ../userdrake_.c:148
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr "������� ������� �� userdrake"
 
-#: ../userdrake_.c:148
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "�������"
 
-#: ../userdrake_.c:175
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr "���� �������� �����"
 
-#: ../userdrake_.c:175
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr "������������"
 
-#: ../userdrake_.c:210 ../userdrake_.c:344
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr "������� ������ ������������"
 
-#: ../userdrake_.c:217
+#: ../userdrake_.c:205
 msgid "Create home Directory"
 msgstr "������� �������� �������"
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:207
 msgid "Home Directory: "
 msgstr "�������� �������:"
 
-#: ../userdrake_.c:222
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr "������� ������ ������ ��� ������������"
 
-#: ../userdrake_.c:223
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr "������� ID ������������ �������"
 
-#: ../userdrake_.c:234
+#: ../userdrake_.c:222
 msgid "User already exists, please choose another User Name"
 msgstr ""
 "������������ ��� ����������, ����������, �������� ������ ��� ������������"
 
-#: ../userdrake_.c:236 ../userdrake_.c:647
+#: ../userdrake_.c:224 ../userdrake_.c:634
 msgid "Password Mismatch"
 msgstr "������ �� ���������"
 
-#: ../userdrake_.c:237 ../userdrake_.c:649
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
@@ -224,7 +224,7 @@ msgstr ""
 "������ ������� �����. \n"
 "������� ������ ������ ��������� > 6 ��������"
 
-#: ../userdrake_.c:248
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -234,61 +234,51 @@ msgstr ""
 "�� �������, ��� ������ ������� ���?\n"
 "\n"
 
-#: ../userdrake_.c:248
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr "UID ������������ < 500"
 
-#: ../userdrake_.c:286 ../userdrake_.c:322 ../userdrake_.c:375
-#: ../userdrake_.c:753
-msgid "Cancel"
-msgstr "������"
-
-#: ../userdrake_.c:286 ../userdrake_.c:318 ../userdrake_.c:375
-#: ../userdrake_.c:753 ../userdrake_.c:885
-msgid "Ok"
-msgstr "��"
-
-#: ../userdrake_.c:297
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake_.c:309
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr "����� ������"
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr "�������� ������������ � ������ 'users'"
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr "�������� � ������������ ������"
 
-#: ../userdrake_.c:314
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "������ � ����� ������ ��� ����������. ��� �� ������ �������?"
 
-#: ../userdrake_.c:335
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr "��"
 
-#: ../userdrake_.c:339
+#: ../userdrake_.c:328
 msgid "No"
 msgstr "���"
 
-#: ../userdrake_.c:350
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr "������� ID ������ �������"
 
-#: ../userdrake_.c:361
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr "������ ��� ����������, �����������, �������� ������ ��� ������"
 
-#: ../userdrake_.c:365
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr "GID ������ < 500"
 
-#: ../userdrake_.c:365
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -298,19 +288,19 @@ msgstr ""
 "�� �������, ��� ������ ������� ���?\n"
 "\n"
 
-#: ../userdrake_.c:380
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake_.c:431
+#: ../userdrake_.c:419
 msgid " Remove Home Directory"
 msgstr "������� �������� �������"
 
-#: ../userdrake_.c:431
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr "������ ������� �������� ������� ������������ � ����������� �����?"
 
-#: ../userdrake_.c:441
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -319,91 +309,91 @@ msgstr ""
 "%s �������� ������� ������� ������������ %s\n"
 "������� ������� ������������"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "�����"
 
-#: ../userdrake_.c:493
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "������"
 
-#: ../userdrake_.c:494
+#: ../userdrake_.c:480
 msgid "Confirm Password:"
 msgstr "������������� ������:"
 
-#: ../userdrake_.c:529
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "�������� �������"
 
-#: ../userdrake_.c:531
+#: ../userdrake_.c:518
 msgid "User Data"
 msgstr "������ ������������"
 
-#: ../userdrake_.c:535
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr "�������� ���� �������� ������� ������"
 
-#: ../userdrake_.c:537
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr "���� �������� ������� ������ �������� ��/��/����:"
 
-#: ../userdrake_.c:543
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr "������������� ������� ������ ������������"
 
-#: ../userdrake_.c:544
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr "���������� �� ������� ������"
 
-#: ../userdrake_.c:549
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr "��������� ��� ������������ ������ ������:"
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr "�������� ���� �������� ������"
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr "���������� ���� �� ���������� �����:"
 
-#: ../userdrake_.c:557
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr "���������� ���� �� ���������� �����:"
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr "���������� ���� �� �������������� � �����:"
 
-#: ../userdrake_.c:559
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr "���������� ���� �� ���������� ������� ������:"
 
-#: ../userdrake_.c:561
+#: ../userdrake_.c:548
 msgid "Password Info"
 msgstr "���������� � ������"
 
-#: ../userdrake_.c:565
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr "�������� ������, ������ ������� ����� ������������:"
 
-#: ../userdrake_.c:571
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "������"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:598
 msgid "Group Data"
 msgstr "������ ������"
 
-#: ../userdrake_.c:614
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr "�������� ������������� ��� ������������� � ���� ������:"
 
-#: ../userdrake_.c:678
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr "����������, �������� ��� ������������ �� ������� ���� ���� ������"
 
-#: ../userdrake_.c:687
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
@@ -411,47 +401,53 @@ msgstr ""
 "����������, ������� ���, ����� � ����\n"
 "����� �������� ������� ������"
 
-#: ../userdrake_.c:694
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr "����������, ������� ��� ���� ��� �������� ������\n"
 
-#: ../userdrake_.c:736
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "�� �� ������ ������� ������������ '%s' �� ��� ������� ������"
 
-#: ../userdrake_.c:848
+#: ../userdrake_.c:827
 msgid "Close"
 msgstr "�������"
 
-#: ../userdrake_.c:854
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:860
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr "������:"
 
-#: ../userdrake_.c:866
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr "���������� �������������� \n"
 
-#: ../userdrake_.c:867
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Copyright (C) 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:873
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr "���� ����� �� ���������, ����������, ������� ���"
 
-#: ../userdrake_.c:874
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "��� ������ ��������� ������ ������� ������� ��������, �����, `-' � `_'"
 
-#: ../userdrake_.c:875
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr "��� ������� �������"
 
-#: ../userdrake_.c:879
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr "������"
+
+#~ msgid "Cancel"
+#~ msgstr "������"
+
+#~ msgid "Ok"
+#~ msgstr "��"
diff --git a/po/sk.po b/po/sk.po
index eee9758..c993ccb 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2003-03-02 19:54--100\n"
 "Last-Translator: Tibor Pittich <Tibor.Pittich@phuture.sk>\n"
 "Language-Team: Slovak <i18n@mandrake.sk>\n"
@@ -15,463 +15,459 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "Akcie"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Upraviť"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Zmaž"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Akcie"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Súbor"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Pridať používateľa"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Pridať skupinu"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Pomoc"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "O ..."
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Používatelia"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Skupiny"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "Používateľov domovský adresár"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Login"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Spustiť tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "Používateľ"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Skupina"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Skupiny"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Skupina"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Pridať používateľa"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Pridať skupinu"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Pridať skupinu"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Upraviť"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Zmaž"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "Zoznam používateľov"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "Používateľov domovský adresár"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "Používateľov domovský adresár"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "Takéto meno už existuje"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Heslo"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Zruš"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Ok"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "Používateľov domovský adresár"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Login"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Heslo"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Heslo:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Domovský adresár"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Zoznam používateľov"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Heslo"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Skupiny"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Zoznam skupín"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "Vymazať"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Copyright © 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Zruš"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Akcie"
diff --git a/po/sl.po b/po/sl.po
index 8f3ec79..1a92c5e 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2002-08-05 14:06+0200\n"
 "Last-Translator: Gregor Pirnaver <gregor.pirnaver@email.si>\n"
 "Language-Team: Slovenščina <lugos-slo@lugos.si>\n"
@@ -17,464 +17,460 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "Akcije"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Uredi"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Zbriši"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Akcije"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Datoteka"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Dodaj uporabnika"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Dodaj skupino"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Pomoč"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "O userdrake"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Uporabniki"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Skupine"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "Domač direktorij uporabnika"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Uporabniško ime"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Zaženi tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "Uporabnik"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake - upravitelj uporabnikov"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Skupina"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Skupine"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Skupina"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Dodaj uporabnika"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Dodaj skupino"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Dodaj skupino"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Uredi"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Zbriši"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "Spisek uporabnikov"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Pomoč"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "Domač direktorij uporabnika"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "Domač direktorij uporabnika"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "To ime je na tem sistemu že uporabljeno"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Geslo"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Prekliči"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Potrdi"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "Domač direktorij uporabnika"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Uporabniško ime"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Geslo"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Geslo:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Dom"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Spisek uporabnikov"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Geslo"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Skupine"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Spisek skupine"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "Briši"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 #, fuzzy
 msgid "Userdrake"
 msgstr "Userdrake - upravitelj uporabnikov"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Avtorske pravice © 2003 MandrakeSoft."
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Prekliči"
+
+#~ msgid "Ok"
+#~ msgstr "Potrdi"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Akcije"
diff --git a/po/sq.po b/po/sq.po
index 2d8e90e..4296453 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\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"
@@ -17,206 +17,206 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr "Veg�l Qeveris�se p�r P�rdoruesit Linux Mandrake"
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 msgid "/_Actions"
 msgstr "/_Akcionet"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 msgid "/_Edit"
 msgstr "/_Boto"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 msgid "/_Delete"
 msgstr "/_Zhduke"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr "/_Filter i sistemit t� p�rdoruesve"
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 msgid "/_Options"
 msgstr "/_Opcionet"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 msgid "/_File"
 msgstr "/_Skedare"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr "/_Rifreskoje"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr "/_Braktise"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 msgid "/_Add User"
 msgstr "/_Shtoje nj� p�rdorues"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 msgid "/Add _Group"
 msgstr "/Shtoje nj� grup"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 msgid "/_Help"
 msgstr "/_Ndihm�"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr "/_Raport Bugi"
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 msgid "/_About..."
 msgstr "/_N� lidhje me..."
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "P�rdoruesit�"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 msgid "Group Users"
 msgstr "Grup P�rdoruesish"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr "Emri i Plot"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "Home Directory"
 msgstr "Repertori Home"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 msgid "Login Shell"
 msgstr "Login Shell"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr "Grupi Primar"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Nisja e tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "User ID"
 msgstr "ID i P�rdoruesit"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "User Name"
 msgstr "Emri i P�rdoruesit"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 msgid "Group ID"
 msgstr "Grup ID"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 msgid "Group Members"
 msgstr "An�tar�t e Grupit"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 msgid "Group Name"
 msgstr "Emri i Grupit"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add User"
 msgstr "Shtoje nj� P�rdorues"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr "Shtoje nj� p�rdorues n� sistem"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 msgid "Add Group"
 msgstr "Shtoje nj� Grup"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 msgid "Add a group to the system"
 msgstr "Shtoje nj� grup n� sistem"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Boto"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr "Botoje rreshtin e zgjedhur"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Zhduke"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr "Zhduke rreshtin e zgjedhur"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr "Rifreskoje"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh the list"
 msgstr "Rifreskoje list�n"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr "Ndihm� e p�rgjithshme n� userdrake"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Ndihm�"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr "Krijo nj� P�rdorues t� Ri"
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 msgid "Create home Directory"
 msgstr "Krijo Repertorin home"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 msgid "Home Directory: "
 msgstr "Repertori Home: "
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr "Kroji nj� grup privat p�r p�rdoruesin"
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr "Specifikoje ID e p�rdoruesit manuelisht"
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 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_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 msgid "Password Mismatch"
 msgstr "Parulla nuk P�rputhet"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
@@ -224,7 +224,7 @@ msgstr ""
 "Kjo parull� �sht� tejet e thjesht�. \n"
 " Nj� parull� e mir� duhet t� jet� prej > 6 karaktereve"
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -234,61 +234,51 @@ msgstr ""
 " A jeni i sigurt p�r k�t� veprim?\n"
 "\n"
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr "Uid i p�rdoruesit �sht� < 500"
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Anulo"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Ok"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr "Zgjedhe Grupin"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr "Shtoi n� 'p�rdoruesit' grup"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr "Shtoje n� grupin ekzistues"
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 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_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr "Po"
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr "Jo"
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr "Specifoje grupin e ID manuelisht"
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 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_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr " Grupi Gid �sht� < 500"
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -298,19 +288,19 @@ msgstr ""
 " A jeni i sigurt p�r k�t� veprim?\n"
 "\n"
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid " Remove Home Directory"
 msgstr " Zhduke Repetorin Home"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr "A d�shironi ta zhdukni repertorin home t� p�rdoruesve dhe mail spool?"
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -319,91 +309,91 @@ msgstr ""
 "%s �sht� grup primar p�r p�rdoruesin %s\n"
 " Zhduke p�rdoruesin para se t� vazhdosh"
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Login"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Parulla"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 msgid "Confirm Password:"
 msgstr "Konfirmoje Parull�n:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Repertori Home"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 msgid "User Data"
 msgstr "T� dh�nat e p�rdoruesit"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr "Mund�soje konton e afatizuar"
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr "Kontoja mbaron   MM/DD/YYYY :"
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr "Lidhe Konton e P�rdoruesit"
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr "Informcion mbi Konton"
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr "P�rdoruesi i fundit e ka ndrryshuar parull�n m� :"
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr "Mund�soje Mbarimin Afatzgjat�s t� Parull�s"
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr "Dit�t para se �sht� mund�suar ndryshimi :"
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr "Dit�s para se �sht� nevojitur ndryshimi :"
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr "Dit�r para se �sht� ndryshuar v�mendja :"
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr "Dit�t para se t� jet� dezaktivizuar kontoja :"
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 msgid "Password Info"
 msgstr "Informacion mbi Parull�n"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 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_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Grupet"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 msgid "Group Data"
 msgstr "T� dh�na t� Grupit"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr "Zgjedhi p�rdoruesit t� cil�t do ti bashkangjiten grupit :"
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr "Ju lutemi zgjedheni m� s� paku nj� grup p�r p�rdoruesin"
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
@@ -411,52 +401,58 @@ msgstr ""
 "Ju lutemi zgjedheni Vitin, Muajin dhe Dit�n \n"
 " p�r Mbarimin e afatit t� Kontos "
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 #, fuzzy
 msgid "Please specify all field for password aging\n"
 msgstr "Ju lutemi specifikoni t� gjitha fushat p�r parull� p�rs�ri"
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, 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_.c:824
+#: ../userdrake_.c:827
 msgid "Close"
 msgstr "Mbylle"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr "Autor�t: "
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr "Menagjer p�r P�rdorues \n"
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "E drejt� autori � 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr "Emri i fush�s �sht� zbraz�t ju lutemi furnizoni nj� em�r"
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Emri duhet t� p�rmbaj m� s� paku shkronja, numra, `-' dhe `_'"
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr "Emri �sht� shum� i gjat�"
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr "Gabim"
 
+#~ msgid "Cancel"
+#~ msgstr "Anulo"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
 #~ msgid "/Filter system users"
 #~ msgstr "/Filter i sistemit t� p�rdoruesve"
 
diff --git a/po/sr.po b/po/sr.po
index 85d777e..1fd6469 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2002-08-15 10:32GMT+1\n"
 "Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -17,463 +17,459 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "����je"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "������"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "�����"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "����je"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "����"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "����j ��������a"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "����j "
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "�����"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "�..."
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "���������"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "����e"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "���������� home ���������j��"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "���j��a"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "������� tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "��������"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "����a"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "����e"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "����a"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "����j ��������a"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "����j "
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "����j �����"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "������"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "�����"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "����� ��������a"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "�����"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "���������� home ���������j��"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "���������� home ���������j��"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "��� ��� �e� �����j� � �������"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "������a"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "�������"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "� ����"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "���������� home ���������j��"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "���j��a"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "������a"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "������a:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Home"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "����� ��������a"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "������a"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "����e"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "����� ����a"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "������"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr ""
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "�������"
+
+#~ msgid "Ok"
+#~ msgstr "� ����"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "����je"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 66df859..48d7a48 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2002-08-15 10:32GMT+1\n"
 "Last-Translator: Toma Jankovic_<tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -17,463 +17,459 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "Akcije"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Izmeni"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Bri�i"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Akcije"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Fajl"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Dodaj korisnika"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Dodaj "
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Pomo�"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "O..."
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Korisnici"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Grupe"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "Korisnikov home direktorijum"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Prijava"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Pokreni tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "Korisnik"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Grupa"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Grupe"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Grupa"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Dodaj korisnika"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Dodaj "
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Dodaj grupu"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Izmeni"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Bri�i"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "Lista korisnika"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Pomo�"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "Korisnikov home direktorijum"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "Korisnikov home direktorijum"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "Ovo ime ve� postoji u sistemu"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Lozinka"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Poni�ti"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "U redu"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "Korisnikov home direktorijum"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Prijava"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Lozinka"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Lozinka:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Home"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Lista korisnika"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Lozinka"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Grupe"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Lista grupa"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "O�isti"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr ""
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Poni�ti"
+
+#~ msgid "Ok"
+#~ msgstr "U redu"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Akcije"
diff --git a/po/sv.po b/po/sv.po
index 7847bc3..7983d99 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2002-08-02 13:18+0000\n"
 "Last-Translator: Mattias Newzella <newzella@linux.nu>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -17,463 +17,459 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "�tg�rder"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Redigera"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Ta bort"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "�tg�rder"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Arkiv"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "L�gg till anv�ndare"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "L�gg till grupp"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Hj�lp"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "Om"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Anv�ndare"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Grupper"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "Anv�ndarens hemkatalog"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Anv�ndarnamn"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Starta tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "Anv�ndare"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Grupp"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Grupper"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Grupp"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "L�gg till anv�ndare"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "L�gg till grupp"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "L�gg till grupp"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Redigera"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Ta bort"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "Anv�ndarlista"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Hj�lp"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "Anv�ndarens hemkatalog"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "Anv�ndarens hemkatalog"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "Detta namn finns redan i systemet"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "L�senord"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "OK"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "Anv�ndarens hemkatalog"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Anv�ndarnamn"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "L�senord"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "L�senord:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Hem"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Anv�ndarlista"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "L�senord"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Grupper"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Grupplista"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "Rensa"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Copyright � 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Avbryt"
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "�tg�rder"
diff --git a/po/ta.po b/po/ta.po
index 78f43eb..5c6fb75 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2002-08-17 17:54-0400\n"
 "Last-Translator: prabu <prabu_anand2000@yahoo.com>\n"
 "Language-Team:  <en@li.org>\n"
@@ -17,464 +17,460 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "செயல்கள்"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "மாற்றியமை"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "நீக்கு"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "செயல்கள்"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "கோப்பு"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "பயனரைச் சேர்"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "குழுவைச் சேர்க்கவும்"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "உதவி"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "பற்றி"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "பயனர்கள்"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "குழுக்கள்"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "பயனரின் தொடக்க அடைவு"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "தொடங்கல் "
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "இதனை துவக்கு"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "பயனர்"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "டிரேக்பயனர்"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "குழு"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "குழுக்கள்"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "குழு"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "பயனரைச் சேர்"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "குழுவைச் சேர்க்கவும்"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "குழுவைச் சேர்"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "மாற்றியமை"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "நீக்கு"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "பயனரின் பட்டியல்"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "உதவி"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "பயனரின் தொடக்க அடைவு"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "பயனரின் தொடக்க அடைவு"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "இப்பெயர் ஏற்கனவே பயன்பாட்டில் உள்ளது"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "கடவுச்சொல்"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "நீக்கு"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "சரி"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "பயனரின் தொடக்க அடைவு"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "தொடங்கல் "
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "கடவுச்சொல்"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "கடவுச்சொல்"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "ஆரம்பம்"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "பயனரின் பட்டியல்"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "கடவுச்சொல்"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "குழுக்கள்"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "குழு  பட்டியல்"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "துடை"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 #, fuzzy
 msgid "Userdrake"
 msgstr "டிரேக்பயனர்"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr ""
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "நீக்கு"
+
+#~ msgid "Ok"
+#~ msgstr "சரி"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "செயல்கள்"
diff --git a/po/tg.po b/po/tg.po
index 05f74e3..25645ef 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2002-12-19 16:07-0500\n"
 "Last-Translator: Roger Kovacs <rkovacs@khujandcomptech.dyn.tj>\n"
 "Language-Team: Tajik\n"
@@ -18,464 +18,460 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "Амалҳо"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Таҳрир"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Нобуд кардан"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Амалҳо"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Файл"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Иловаи корванд"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Иловаи гурӯҳ"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Ёрӣ"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "Дар бораи"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Корвандҳо"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Гурӯҳҳо"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "Феҳристи хонагии корванд"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Номи дохилӣ"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Саршавии tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "Корванд"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Гурӯҳ"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Гурӯҳҳо"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Гурӯҳ"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Иловаи корванд"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Иловаи гурӯҳ"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Иловаи гурӯҳ"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Таҳрир"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Нобуд кардан"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "Рӯйхати корвандҳо"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Ёрӣ"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "Феҳристи хонагии корванд"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "Феҳристи хонагии корванд"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "Ин ном аллакай дар систем ҳозираст"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Гузарвожа"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Бекор кардан"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Ok"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "Феҳристи хонагии корванд"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Номи дохилӣ"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Гузарвожа"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Гузарвожа:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Хона (мавқеи аввала)"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Рӯйхати корванд"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 #, fuzzy
 msgid "User last changed password on : "
 msgstr "Ивази гузарвожа намешавад"
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Гузарвожа"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Гурӯҳҳо"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Рӯйхати гурӯҳ"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "Тоза кунед"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Ҳуқуқи муаллифӣ © 2003 MandrakeSoft"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Бекор кардан"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Амалҳо"
diff --git a/po/tr.po b/po/tr.po
index 720ee3d..a6ffcaa 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2002-09-02 10:48+0300\n"
 "Last-Translator: �mer Fad�l USTA <omer_fad@hotmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -21,463 +21,459 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "Eylemler"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "D�zenle"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Sil"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Eylemler"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Dosya"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Kullan�c� ekle"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Grup ekle"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Yard�m"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "Hakk�nda"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Kullan�c�lar"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Gruplar"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "Kullan�c� ev dizini"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Giri�"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "tls'i ba�lat"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "Kullan�c�"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Grup"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Gruplar"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Grup"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Kullan�c� ekle"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Grup ekle"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Grup ekle"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "D�zenle"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Sil"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "Kullan�c�lar listesi"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Yard�m"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "Kullan�c� ev dizini"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "Kullan�c� ev dizini"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "Bu ad zaten sistemde var"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Parola"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Vazge�"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Tamam"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "Kullan�c� ev dizini"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Giri�"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Parola"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Parola:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Ev"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Kullan�c� listesi"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Parola"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Gruplar"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Grup listesi"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "Temizle"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Telif Hakk� � 2003 MandrakeSoft."
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Vazge�"
+
+#~ msgid "Ok"
+#~ msgstr "Tamam"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Eylemler"
diff --git a/po/uk.po b/po/uk.po
index 85772e0..c19f6d2 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-uk\n"
-"POT-Creation-Date: 2003-07-04 16:26+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2003-07-03 22:57+0300\n"
 "Last-Translator: Taras Boychuk <btr1@torba.com>\n"
 "Language-Team: ukrainian <uk@li.org>\n"
@@ -18,204 +18,204 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr "���������� ��������� ������������� Mandrake Linux"
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 msgid "/_Actions"
 msgstr "/䦧"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 msgid "/_Edit"
 msgstr "/���������"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 msgid "/_Delete"
 msgstr "/��������"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr "/���������� ��������� ���������ަ�"
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 msgid "/_Options"
 msgstr "/���������"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 msgid "/_File"
 msgstr "/����"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr "/��������"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr "/�����"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 msgid "/_Add User"
 msgstr "/������ �����������"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 msgid "/Add _Group"
 msgstr "/������ �����"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 msgid "/_Help"
 msgstr "/��צ���"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr "/�צ� ��� �������"
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 msgid "/_About..."
 msgstr "/��� ��������..."
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:117
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "���������ަ"
 
-#: ../userdrake_.c:118 ../userdrake_.c:615
+#: ../userdrake_.c:106 ../userdrake_.c:602
 msgid "Group Users"
 msgstr "���������� ���������ަ�"
 
-#: ../userdrake_.c:131 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr "����� �����"
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 msgid "Home Directory"
 msgstr "��ͦ��� �����������"
 
-#: ../userdrake_.c:131 ../userdrake_.c:495
+#: ../userdrake_.c:119 ../userdrake_.c:481
 msgid "Login Shell"
 msgstr "��������� ����� �Ť����æ�"
 
-#: ../userdrake_.c:131 ../userdrake_.c:568
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr "�������� �����"
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 msgid "Status"
 msgstr "������"
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 msgid "User ID"
 msgstr "��� �����������"
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 msgid "User Name"
 msgstr "��'� �����������"
 
-#: ../userdrake_.c:137
+#: ../userdrake_.c:125
 msgid "Group ID"
 msgstr "��� �����"
 
-#: ../userdrake_.c:137
+#: ../userdrake_.c:125
 msgid "Group Members"
 msgstr "����� �����"
 
-#: ../userdrake_.c:137 ../userdrake_.c:506
+#: ../userdrake_.c:125 ../userdrake_.c:492
 msgid "Group Name"
 msgstr "����� �����"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:131
 msgid "Add User"
 msgstr "������ �����������"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr "������ ����������� �� �������"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:132
 msgid "Add Group"
 msgstr "������ �����"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:132
 msgid "Add a group to the system"
 msgstr "������ ����� �� �������"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "���������"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr "��������� �������� �����"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "��������"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr "�������� �������� �����"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr "��������"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:135
 msgid "Refresh the list"
 msgstr "�������� ������"
 
-#: ../userdrake_.c:148
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr "�������� ��צ��� �� userdrake"
 
-#: ../userdrake_.c:148
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "��צ���"
 
-#: ../userdrake_.c:175
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr "���ͦ� ��˦������"
 
-#: ../userdrake_.c:175
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr "�����������"
 
-#: ../userdrake_.c:210 ../userdrake_.c:344
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr "�������� ������ �����������"
 
-#: ../userdrake_.c:217
+#: ../userdrake_.c:205
 msgid "Create home Directory"
 msgstr "�������� ��ͦ��� �����������"
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:207
 msgid "Home Directory: "
 msgstr "��ͦ��� �����������: "
 
-#: ../userdrake_.c:222
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr "�������� �������� ����� ��� �����������"
 
-#: ../userdrake_.c:223
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr "������ ��� ����������� ������"
 
-#: ../userdrake_.c:234
+#: ../userdrake_.c:222
 msgid "User already exists, please choose another User Name"
 msgstr "����� ���������� ��� �, ����-�����, ������� ������ ��'� �����������"
 
-#: ../userdrake_.c:236 ../userdrake_.c:647
+#: ../userdrake_.c:224 ../userdrake_.c:634
 msgid "Password Mismatch"
 msgstr "����̦ �� �Ц��������"
 
-#: ../userdrake_.c:237 ../userdrake_.c:649
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
@@ -223,7 +223,7 @@ msgstr ""
 "��� ������ ������� �������. \n"
 " ������� ������ ������� ���� > 6 �����̦�"
 
-#: ../userdrake_.c:248
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -233,61 +233,51 @@ msgstr ""
 " �� ������Φ, �� ������ ������� ���� ���?\n"
 "\n"
 
-#: ../userdrake_.c:248
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr "��� ����������� ������ �� 500"
 
-#: ../userdrake_.c:286 ../userdrake_.c:322 ../userdrake_.c:375
-#: ../userdrake_.c:753
-msgid "Cancel"
-msgstr "���������"
-
-#: ../userdrake_.c:286 ../userdrake_.c:318 ../userdrake_.c:375
-#: ../userdrake_.c:753 ../userdrake_.c:885
-msgid "Ok"
-msgstr "������"
-
-#: ../userdrake_.c:297
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr "��� �����������: "
 
-#: ../userdrake_.c:309
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr "����Ҧ�� �����"
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr "������ � ����� 'users'"
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr "������ � ������� �����"
 
-#: ../userdrake_.c:314
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "����� � ����� ������ ��� ���դ. �� � �� ��Ԧ�� �������?"
 
-#: ../userdrake_.c:335
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr "���"
 
-#: ../userdrake_.c:339
+#: ../userdrake_.c:328
 msgid "No"
 msgstr "�"
 
-#: ../userdrake_.c:350
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr "������ ��� ����� ������"
 
-#: ../userdrake_.c:361
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr "����� ��� ���դ, ����-�����, ���֦�� ������ ����� �����"
 
-#: ../userdrake_.c:365
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr "��� ����� ������ �� 500"
 
-#: ../userdrake_.c:365
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -297,19 +287,19 @@ msgstr ""
 " �� ������Φ, �� ������ ������� ���� ���?\n"
 "\n"
 
-#: ../userdrake_.c:380
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr "��� �����: "
 
-#: ../userdrake_.c:431
+#: ../userdrake_.c:419
 msgid " Remove Home Directory"
 msgstr " �������� ��ͦ��� �����������"
 
-#: ../userdrake_.c:431
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr "�� ������Φ, �� ������ ������ ��ͦ��� ����������� � ������� ��������?"
 
-#: ../userdrake_.c:441
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -318,91 +308,91 @@ msgstr ""
 "%s � ��������� ������ ��� ����������� %s\n"
 " �������� ����ަ�� �����������"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "��'�"
 
-#: ../userdrake_.c:493
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "������"
 
-#: ../userdrake_.c:494
+#: ../userdrake_.c:480
 msgid "Confirm Password:"
 msgstr "������Ħ�� ������:"
 
-#: ../userdrake_.c:529
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "��ͦ���"
 
-#: ../userdrake_.c:531
+#: ../userdrake_.c:518
 msgid "User Data"
 msgstr "��Φ �����������"
 
-#: ../userdrake_.c:535
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr "�צ������ ��������� �����˦�"
 
-#: ../userdrake_.c:537
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr "���ͦ� Ħ� ������� ��˦��դ����   MM/DD/YYYY :"
 
-#: ../userdrake_.c:543
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr "����������� ��̦� ���������ަ�"
 
-#: ../userdrake_.c:544
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr "�������æ� ��� ���������ަ�"
 
-#: ../userdrake_.c:549
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr "������� �ͦ�� ������ ������������ : "
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr "�צ������ ��������� ���ͦ�� Ħ� ������"
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr "��������� �Φ� ����� �ͦ��� :"
 
-#: ../userdrake_.c:557
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr "����Ȧ��� �Φ� ����� �ͦ��� :"
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr "�Φ� ������������ ����� �ͦ��� :"
 
-#: ../userdrake_.c:559
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr "�Φ� �� ���������� Ħ� ������� :"
 
-#: ../userdrake_.c:561
+#: ../userdrake_.c:548
 msgid "Password Info"
 msgstr "�������æ� ��� ������"
 
-#: ../userdrake_.c:565
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr "����Ҧ�� �����, ������ ���� ���� ����������:"
 
-#: ../userdrake_.c:571
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "�����"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:598
 msgid "Group Data"
 msgstr "��Φ �����"
 
-#: ../userdrake_.c:614
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr "����Ҧ�� ���������ަ�, ���� �������� � �� ����� :"
 
-#: ../userdrake_.c:678
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr "����-�����, ����Ҧ�� ��� ���� ����� ��� �����������"
 
-#: ../userdrake_.c:687
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
@@ -410,52 +400,58 @@ msgstr ""
 "����-�����, ������� Ҧ�, ͦ���� � ���� \n"
 " ��˦������ Ħ� ������� "
 
-#: ../userdrake_.c:694
+#: ../userdrake_.c:680
 #, fuzzy
 msgid "Please specify all field for password aging\n"
 msgstr "����-�����, �����Φ�� �Ӧ ���� ��� ���ͦ�� Ħ� ������"
 
-#: ../userdrake_.c:736
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "�� �� ������ �������� ����������� '%s' � ���� �������ϧ �����"
 
-#: ../userdrake_.c:848
+#: ../userdrake_.c:827
 msgid "Close"
 msgstr "�������"
 
-#: ../userdrake_.c:854
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:860
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr "������: "
 
-#: ../userdrake_.c:866
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr "��������� ������������� \n"
 
-#: ../userdrake_.c:867
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Copyright � 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:873
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr "���� � ������ �����Τ, ����-�����, ���Ħ�� �����."
 
-#: ../userdrake_.c:874
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "����� ���� ���������� Ԧ���� � ����� ̦���, ����, `-' � `_'"
 
-#: ../userdrake_.c:875
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr "����� ������� �����"
 
-#: ../userdrake_.c:879
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr "�������"
 
+#~ msgid "Cancel"
+#~ msgstr "���������"
+
+#~ msgid "Ok"
+#~ msgstr "������"
+
 #~ msgid "/Filter system users"
 #~ msgstr "/���������� ��������� ���������ަ�"
 
diff --git a/po/userdrake.pot b/po/userdrake.pot
index f01d4c8..3bbd394 100644
--- a/po/userdrake.pot
+++ b/po/userdrake.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-07-04 16:26+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,427 +15,417 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 msgid "/_Actions"
 msgstr ""
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 msgid "/_Edit"
 msgstr ""
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 msgid "/_Delete"
 msgstr ""
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 msgid "/_Options"
 msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 msgid "/_File"
 msgstr ""
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 msgid "/_Add User"
 msgstr ""
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 msgid "/Add _Group"
 msgstr ""
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 msgid "/_Help"
 msgstr ""
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 msgid "/_About..."
 msgstr ""
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:117
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr ""
 
-#: ../userdrake_.c:118 ../userdrake_.c:615
+#: ../userdrake_.c:106 ../userdrake_.c:602
 msgid "Group Users"
 msgstr ""
 
-#: ../userdrake_.c:131 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 msgid "Home Directory"
 msgstr ""
 
-#: ../userdrake_.c:131 ../userdrake_.c:495
+#: ../userdrake_.c:119 ../userdrake_.c:481
 msgid "Login Shell"
 msgstr ""
 
-#: ../userdrake_.c:131 ../userdrake_.c:568
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 msgid "Status"
 msgstr ""
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 msgid "User ID"
 msgstr ""
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 msgid "User Name"
 msgstr ""
 
-#: ../userdrake_.c:137
+#: ../userdrake_.c:125
 msgid "Group ID"
 msgstr ""
 
-#: ../userdrake_.c:137
+#: ../userdrake_.c:125
 msgid "Group Members"
 msgstr ""
 
-#: ../userdrake_.c:137 ../userdrake_.c:506
+#: ../userdrake_.c:125 ../userdrake_.c:492
 msgid "Group Name"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:131
 msgid "Add User"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:132
 msgid "Add Group"
 msgstr ""
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:132
 msgid "Add a group to the system"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:135
 msgid "Refresh the list"
 msgstr ""
 
-#: ../userdrake_.c:148
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:148
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr ""
 
-#: ../userdrake_.c:175
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:175
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:210 ../userdrake_.c:344
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:217
+#: ../userdrake_.c:205
 msgid "Create home Directory"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:207
 msgid "Home Directory: "
 msgstr ""
 
-#: ../userdrake_.c:222
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:223
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:234
+#: ../userdrake_.c:222
 msgid "User already exists, please choose another User Name"
 msgstr ""
 
-#: ../userdrake_.c:236 ../userdrake_.c:647
+#: ../userdrake_.c:224 ../userdrake_.c:634
 msgid "Password Mismatch"
 msgstr ""
 
-#: ../userdrake_.c:237 ../userdrake_.c:649
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:248
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:248
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:286 ../userdrake_.c:322 ../userdrake_.c:375
-#: ../userdrake_.c:753
-msgid "Cancel"
-msgstr ""
-
-#: ../userdrake_.c:286 ../userdrake_.c:318 ../userdrake_.c:375
-#: ../userdrake_.c:753 ../userdrake_.c:885
-msgid "Ok"
-msgstr ""
-
-#: ../userdrake_.c:297
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:309
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:314
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:335
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:339
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:350
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:361
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:365
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:365
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:380
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:431
+#: ../userdrake_.c:419
 msgid " Remove Home Directory"
 msgstr ""
 
-#: ../userdrake_.c:431
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:441
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr ""
 
-#: ../userdrake_.c:493
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr ""
 
-#: ../userdrake_.c:494
+#: ../userdrake_.c:480
 msgid "Confirm Password:"
 msgstr ""
 
-#: ../userdrake_.c:529
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr ""
 
-#: ../userdrake_.c:531
+#: ../userdrake_.c:518
 msgid "User Data"
 msgstr ""
 
-#: ../userdrake_.c:535
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:537
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:543
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:544
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:549
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:557
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:559
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:561
+#: ../userdrake_.c:548
 msgid "Password Info"
 msgstr ""
 
-#: ../userdrake_.c:565
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:571
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr ""
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:598
 msgid "Group Data"
 msgstr ""
 
-#: ../userdrake_.c:614
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:678
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:687
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:694
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:736
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:848
+#: ../userdrake_.c:827
 msgid "Close"
 msgstr ""
 
-#: ../userdrake_.c:854
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr ""
 
-#: ../userdrake_.c:860
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:866
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:867
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr ""
 
-#: ../userdrake_.c:873
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:874
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:875
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:879
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
diff --git a/po/uz.po b/po/uz.po
index 719a3b5..f807440 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2003-03-03 14:37+0000\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -18,464 +18,460 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "Amallar"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Tuzatish"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "O'chirish"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Amallar"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Fayl"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Foydalanuvchini qo'shish"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Guruhni qo'shish"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Yordam"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "Haqida"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Foydalanuvchilar"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Guruhlar"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "Foydalanuvchining uy direktoriyasi"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Foydalanuvchi"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "tls'ni boshlash"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "Foydalanuvchi"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake - foydalanuvchilarni boshqarish"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Guruh"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Guruhlar"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Guruh"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Foydalanuvchini qo'shish"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Guruhni qo'shish"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Guruhni qo'shish"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Tuzatish"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "O'chirish"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "Foydalanuvchilar ro'yxati"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Yordam"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "Foydalanuvchining uy direktoriyasi"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "Foydalanuvchining uy direktoriyasi"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "Bu guruhning nomi sistemada allaqachon mavjud!"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Maxfiy so'z"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Bekor qilish"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "Ok"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "Foydalanuvchining uy direktoriyasi"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Foydalanuvchi"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Maxfiy so'z"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Maxfiy so'z:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Uy direktoriya"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Foydalanuvchilarni ro'yxati"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Maxfiy so'z"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Guruhlar"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Guruhlar ro'yxati"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "Tozalash"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 #, fuzzy
 msgid "Userdrake"
 msgstr "Userdrake - foydalanuvchilarni boshqarish"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr ""
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Bekor qilish"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Amallar"
diff --git a/po/vi.po b/po/vi.po
index adab4e3..596c35e 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2002-10-25 21:43+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@linuxmail.org>\n"
 "Language-Team: Gnome-Vi Team <Gnomevi-list@lists.sourceforge.net>\n"
@@ -16,463 +16,459 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "Hành động"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "Biên soạn"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "Xóa"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "Hành động"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "Tệp"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "Thêm người dùng"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "Thêm nhóm"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "Trợ giúp"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "Nói về"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Người dùng"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "Nhóm"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "Thư mục home của người dùng"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "Đăng nhập"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "Chạy tls"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "Người dùng"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "UserDrake"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "Nhóm"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "Nhóm"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "Nhóm"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "Thêm người dùng"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "Thêm nhóm"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "Thêm nhóm"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Biên soạn"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Xóa"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "Danh sách người dùng"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Trợ giúp"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "Thư mục home của người dùng"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "Thư mục home của người dùng"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "Tên này đã có trong hệ thống rồi"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "Mật khẩu"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Bỏ qua"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "OK"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "Thư mục home của người dùng"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "Đăng nhập"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "Mật khẩu:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "Home"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "Danh sách người dùng"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "Mật khẩu"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Nhóm"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "Danh sách nhóm"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "Xoá sạch"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Bản quyền © 2003 MandrakeSoft."
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "Bỏ qua"
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "Hành động"
diff --git a/po/wa.po b/po/wa.po
index 8cc3a1b..0b23dfe 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2000-10-05 15:15+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@mandrakesoft.com>\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -22,204 +22,204 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr "Usteye di manaedjmint des uzeus di Mandrake"
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 msgid "/_Actions"
 msgstr "/_Accions"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 msgid "/_Edit"
 msgstr "/_Candj�"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 msgid "/_Delete"
 msgstr "/_Disfacer"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr "/_Passete po les uzeus sistinme"
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 msgid "/_Options"
 msgstr "/_Tchuzes"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 msgid "/_File"
 msgstr "/_Fitch�"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr "/_Rafrister"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr "/Mouss� _fo�"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 msgid "/_Add User"
 msgstr "/_Radjouter uzeu"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 msgid "/Add _Group"
 msgstr "/Radjouter _groupe"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 msgid "/_Help"
 msgstr "/_Aidance"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr "/_Rapoirter bug"
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 msgid "/_About..."
 msgstr "/� _dfait..."
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr "Mete en alaedje li passete"
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "Uzeus"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 msgid "Group Users"
 msgstr "Uzeus do groupe"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr "No en etir"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "Home Directory"
 msgstr "Ridant m�jhon"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 msgid "Login Shell"
 msgstr "Shell d'�elodjaedje"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr "Prumio�le groupe"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "Status"
 msgstr "Estat"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "User ID"
 msgstr "ID di l'�uzeu"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 msgid "User Name"
 msgstr "No di l'�uzeu"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 msgid "Group ID"
 msgstr "ID do groupe"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 msgid "Group Members"
 msgstr "Mimbes do groupe"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 msgid "Group Name"
 msgstr "No do groupe"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add User"
 msgstr "Radjouter uzeu"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr "Radjouter �n uzeu � sistinme"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 msgid "Add Group"
 msgstr "Radjouter groupe"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 msgid "Add a group to the system"
 msgstr "Radjouter on groupe � sistinme"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "Candj�"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr "Candj� l'�roye tchoezeye"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "Disfacer"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr "Disfacer l'�roye tchoezeye"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr "Rafrister"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh the list"
 msgstr "Rafrister l'�djiv�ye"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr "Aidance djenerike so userdrake"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "Aidance"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr "Ahiver on novea uzeu"
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 msgid "Create home Directory"
 msgstr "Ahiver l'�ridant m�jhon"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 msgid "Home Directory: "
 msgstr "Ridant m�jhon: "
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr "Ahiver on groupe priv� po l'�uzeu"
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr "Diner al mwin l'�idintifiant di l'�uzeu"
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 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_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 msgid "Password Mismatch"
 msgstr "Les screts n'�sont n�n les minmes"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
@@ -227,7 +227,7 @@ msgstr ""
 "Li scret est p�r trop simpe. \n"
 " On bon scret doet aveur pus di 6 caracteres"
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -237,62 +237,52 @@ msgstr ""
 "n'�est n�n ricmand�. Estoz seur del voleur f�?\n"
 "\n"
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr "L' UID est < 500"
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "Rinonc�"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "'l est bon"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr "Tchoezi groupe"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr "Radjouter � groupe �users�"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr "Radjouter � groupe k'�egzit�ye dedja"
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 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_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr "Oyi"
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr "Neni"
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr "Diner al mwin l'�idintifiant do groupe"
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 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_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr " Li GID est < 500"
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -302,19 +292,19 @@ msgstr ""
 "n'�est n�n ricmand�. Estoz seur del voleur f�?\n"
 "\n"
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid " Remove Home Directory"
 msgstr " Oister l'�ridant m�jhon"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr "Voloz vs oister li ridant m�jhon eyet l'�boesse �s emiles da l'�uzeu?"
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -323,143 +313,149 @@ msgstr ""
 "%s est l'�groupe prumio�le da l'�uzeu %s\n"
 " I vs f�t d'�aprume oister l'�uzeu"
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "No d'�elodjaedje"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "Sicret"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 msgid "Confirm Password:"
 msgstr "Acertinaedje do scret:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "M�jhon"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 msgid "User Data"
 msgstr "Din�yes di l'�uzeu"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr "Inform�cion do conte"
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr "L'�uzeu candja si scret pol dierin c�p li:"
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr "Djo�s dvant d'�poleur candj�:"
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr "Djo�s dvant dveur candj�:"
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr "Djo�s d'�adviertixhmint divant d'�diveur candj�:"
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr "Djo�s dvant ki l'�conte soeye djok�:"
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 msgid "Password Info"
 msgstr "Inform�cion sol sicret"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr "Tchoezixwhoz les groupes ki l'�uzeu nd� ser� mimbe:"
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "Groupes"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 msgid "Group Data"
 msgstr "Din�yes do groupe"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr "Tchoezixhoz les uzeus k'�iront dins �'�groupe chal:"
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr "Tchoezixhoz pol moens on groupe po l'�uzeu s'�i vs plait"
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "Vos n'�poloz n�n boidj� l'�uzeu �%s� fo� di s'�groupe prumio�le"
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 msgid "Close"
 msgstr "Cl�re"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr "Oteurs: "
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr "Manaedjmint des uzeus \n"
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Copyright � 2003 MandrakeSoft SA"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 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_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 "Li no n'�pout aveur ki des ptit�s letes, des chifes, li loyeure (�-�) et li "
 "caractere sorlign� (�_�)."
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr "Li no est p�r trop long"
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr "Aroke"
 
+#~ msgid "Cancel"
+#~ msgstr "Rinonc�"
+
+#~ msgid "Ok"
+#~ msgstr "'l est bon"
+
 #~ msgid "/Options"
 #~ msgstr "/Tchuzes"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e217a30..a2c6a19 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-04 16:26+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2003-07-05 19:30+0800\n"
 "Last-Translator: ShiyuTang <shiyutang@netscape.net>\n"
 "Language-Team: Chinese <zh@li.org>\n"
@@ -17,204 +17,204 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr "Mandrake Linux 用户管理工具"
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 msgid "/_Actions"
 msgstr "/动作(_A)"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 msgid "/_Delete"
 msgstr "/删除(_D)"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr "/过滤系统用户(_F)"
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr "/刷新(_R)"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr "/退出(_Q)"
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 msgid "/_Add User"
 msgstr "/添加用户(_A)"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 msgid "/Add _Group"
 msgstr "/添加组(_G)"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr "/报告错误(_R)"
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 msgid "/_About..."
 msgstr "/关于(_A)..."
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:117
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "用户"
 
-#: ../userdrake_.c:118 ../userdrake_.c:615
+#: ../userdrake_.c:106 ../userdrake_.c:602
 msgid "Group Users"
 msgstr "组用户"
 
-#: ../userdrake_.c:131 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr "全名"
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 msgid "Home Directory"
 msgstr "用户主目录"
 
-#: ../userdrake_.c:131 ../userdrake_.c:495
+#: ../userdrake_.c:119 ../userdrake_.c:481
 msgid "Login Shell"
 msgstr "登录 Shell"
 
-#: ../userdrake_.c:131 ../userdrake_.c:568
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr "主要的组"
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 msgid "Status"
 msgstr "状态"
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 msgid "User ID"
 msgstr "用户 ID"
 
-#: ../userdrake_.c:131
+#: ../userdrake_.c:119
 msgid "User Name"
 msgstr "用户名"
 
-#: ../userdrake_.c:137
+#: ../userdrake_.c:125
 msgid "Group ID"
 msgstr "组 ID"
 
-#: ../userdrake_.c:137
+#: ../userdrake_.c:125
 msgid "Group Members"
 msgstr "组成员"
 
-#: ../userdrake_.c:137 ../userdrake_.c:506
+#: ../userdrake_.c:125 ../userdrake_.c:492
 msgid "Group Name"
 msgstr "组名"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:131
 msgid "Add User"
 msgstr "添加用户"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr "添加一个用户到系统中"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:132
 msgid "Add Group"
 msgstr "添加组"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:132
 msgid "Add a group to the system"
 msgstr "添加一个组到系统中"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "编辑"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr "编辑所选的列"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "删除"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr "删除所选的列"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr "刷新"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:135
 msgid "Refresh the list"
 msgstr "用户列表"
 
-#: ../userdrake_.c:148
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr "“Drake 用户管理”的简要帮助"
 
-#: ../userdrake_.c:148
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "帮助"
 
-#: ../userdrake_.c:175
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr "截止"
 
-#: ../userdrake_.c:175
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr "锁定"
 
-#: ../userdrake_.c:210 ../userdrake_.c:344
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr "创建新用户"
 
-#: ../userdrake_.c:217
+#: ../userdrake_.c:205
 msgid "Create home Directory"
 msgstr "创建用户主目录"
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:207
 msgid "Home Directory: "
 msgstr "用户主目录："
 
-#: ../userdrake_.c:222
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr "为这个用户创建一个私有组"
 
-#: ../userdrake_.c:223
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr "手工指定用户 ID"
 
-#: ../userdrake_.c:234
+#: ../userdrake_.c:222
 msgid "User already exists, please choose another User Name"
 msgstr "用户已经存在，请使用其他用户名"
 
-#: ../userdrake_.c:236 ../userdrake_.c:647
+#: ../userdrake_.c:224 ../userdrake_.c:634
 msgid "Password Mismatch"
 msgstr "密码不相符"
 
-#: ../userdrake_.c:237 ../userdrake_.c:649
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
@@ -222,7 +222,7 @@ msgstr ""
 "这个密码太简单了。\n"
 "好的密码应该大于 6 个字符。"
 
-#: ../userdrake_.c:248
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -232,61 +232,51 @@ msgstr ""
 "你确定你要这么做吗？\n"
 "\n"
 
-#: ../userdrake_.c:248
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr "用户的 UID 小于 500"
 
-#: ../userdrake_.c:286 ../userdrake_.c:322 ../userdrake_.c:375
-#: ../userdrake_.c:753
-msgid "Cancel"
-msgstr "取消"
-
-#: ../userdrake_.c:286 ../userdrake_.c:318 ../userdrake_.c:375
-#: ../userdrake_.c:753 ../userdrake_.c:885
-msgid "Ok"
-msgstr "确定"
-
-#: ../userdrake_.c:297
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr "UID："
 
-#: ../userdrake_.c:309
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr "选择组"
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr "添加到这个用户的组"
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr "添加到已经存在的组"
 
-#: ../userdrake_.c:314
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "一个有该名字的组已经存在。你想要怎么做？"
 
-#: ../userdrake_.c:335
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr "是"
 
-#: ../userdrake_.c:339
+#: ../userdrake_.c:328
 msgid "No"
 msgstr "否"
 
-#: ../userdrake_.c:350
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr "手工指定组 ID"
 
-#: ../userdrake_.c:361
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr "组已经存在，请使用其他组名"
 
-#: ../userdrake_.c:365
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr "组的 GID 小于 500"
 
-#: ../userdrake_.c:365
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -296,19 +286,19 @@ msgstr ""
 "你确定你要这么做吗？\n"
 "\n"
 
-#: ../userdrake_.c:380
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr "GID："
 
-#: ../userdrake_.c:431
+#: ../userdrake_.c:419
 msgid " Remove Home Directory"
 msgstr "删除用户主目录"
 
-#: ../userdrake_.c:431
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr "你想要删除这个用户的用户主目录和邮件缓冲吗？"
 
-#: ../userdrake_.c:441
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -317,91 +307,91 @@ msgstr ""
 "%s 是用户 %s 的私有组\n"
 "先删除这个用户"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "登录名"
 
-#: ../userdrake_.c:493
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "密码"
 
-#: ../userdrake_.c:494
+#: ../userdrake_.c:480
 msgid "Confirm Password:"
 msgstr "确认密码："
 
-#: ../userdrake_.c:529
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "主目录"
 
-#: ../userdrake_.c:531
+#: ../userdrake_.c:518
 msgid "User Data"
 msgstr "用户数据"
 
-#: ../userdrake_.c:535
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr "启用账号期限"
 
-#: ../userdrake_.c:537
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr "账号期限到 MM/DD/YYYY ："
 
-#: ../userdrake_.c:543
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr "锁定用户账号"
 
-#: ../userdrake_.c:544
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr "账号信息"
 
-#: ../userdrake_.c:549
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr "用户最后一次修改密码在："
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr "启用密码期限"
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr "修改前，允许的日期："
 
-#: ../userdrake_.c:557
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr "修改前，必须的日期："
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr "修改前，警告的日期："
 
-#: ../userdrake_.c:559
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr "账号不被激活以前的日期："
 
-#: ../userdrake_.c:561
+#: ../userdrake_.c:548
 msgid "Password Info"
 msgstr "密码信息"
 
-#: ../userdrake_.c:565
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr "选择一个组，使这个用户将成为这个组的一个成员："
 
-#: ../userdrake_.c:571
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "组"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:598
 msgid "Group Data"
 msgstr "组数据"
 
-#: ../userdrake_.c:614
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr "选择要加入这个组的用户："
 
-#: ../userdrake_.c:678
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr "请为这个用户至少选择一个组"
 
-#: ../userdrake_.c:687
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
@@ -409,52 +399,58 @@ msgstr ""
 "请指定账号期限的\n"
 "年月日"
 
-#: ../userdrake_.c:694
+#: ../userdrake_.c:680
 #, fuzzy
 msgid "Please specify all field for password aging\n"
 msgstr "请指定密码时效的所有领域"
 
-#: ../userdrake_.c:736
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "你不能从用户“%s”的私有组中删除该用户"
 
-#: ../userdrake_.c:848
+#: ../userdrake_.c:827
 msgid "Close"
 msgstr "关闭"
 
-#: ../userdrake_.c:854
+#: ../userdrake_.c:833
 msgid "Userdrake"
 msgstr "Drake 用户管理（Userdrake）"
 
-#: ../userdrake_.c:860
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr "作者："
 
-#: ../userdrake_.c:866
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr "用户管理\n"
 
-#: ../userdrake_.c:867
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "版权所有 (C) 2003 MandrakeSoft SA"
 
-#: ../userdrake_.c:873
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr "名字栏是空着的，请提供一个名字"
 
-#: ../userdrake_.c:874
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "名字只能包含字母、数字、“-”和“_”"
 
-#: ../userdrake_.c:875
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr "名字太长了"
 
-#: ../userdrake_.c:879
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr "错误"
 
+#~ msgid "Cancel"
+#~ msgstr "取消"
+
+#~ msgid "Ok"
+#~ msgstr "确定"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "行动"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a1c1a23..3900db1 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-10 18:47+0200\n"
 "PO-Revision-Date: 2002-08-17 1:20+CST\n"
 "Last-Translator: Kenduest Lee <kenduest@i18n.linux.org.tw>\n"
 "Language-Team: Chinese <zh-l10n@linux.org.tw>\n"
@@ -18,464 +18,460 @@ msgstr ""
 "Content-Type: text/plain; charset=BIG5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:70
+#: ../userdrake_.c:56
 msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
-#: ../userdrake_.c:90
+#: ../userdrake_.c:65 ../userdrake_.c:66 ../userdrake_.c:74 ../userdrake_.c:75
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/_Actions"
 msgstr "����"
 
-#: ../userdrake_.c:79
+#: ../userdrake_.c:65
 #, fuzzy
 msgid "/_Edit"
 msgstr "�s��"
 
-#: ../userdrake_.c:80
+#: ../userdrake_.c:66
 #, fuzzy
 msgid "/_Delete"
 msgstr "�R��"
 
-#: ../userdrake_.c:81
+#: ../userdrake_.c:67
 msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:81 ../userdrake_.c:93
+#: ../userdrake_.c:67 ../userdrake_.c:79
 #, fuzzy
 msgid "/_Options"
 msgstr "����"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
+#: ../userdrake_.c:71 ../userdrake_.c:72 ../userdrake_.c:73
 #, fuzzy
 msgid "/_File"
 msgstr "�ɮ�"
 
-#: ../userdrake_.c:86
+#: ../userdrake_.c:72
 msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:87
+#: ../userdrake_.c:73
 msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:89
+#: ../userdrake_.c:75
 #, fuzzy
 msgid "/_Add User"
 msgstr "�s�W�ϥΪ�"
 
-#: ../userdrake_.c:90
+#: ../userdrake_.c:76
 #, fuzzy
 msgid "/Add _Group"
 msgstr "�s�W�s��"
 
-#: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
+#: ../userdrake_.c:84 ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
 #, fuzzy
 msgid "/_Help"
 msgstr "����"
 
-#: ../userdrake_.c:98
+#: ../userdrake_.c:86
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:99
+#: ../userdrake_.c:87
 #, fuzzy
 msgid "/_About..."
 msgstr "����"
 
-#: ../userdrake_.c:114
+#: ../userdrake_.c:102
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:105
 msgid "Users"
 msgstr "�ϥΪ�"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:106 ../userdrake_.c:602
 #, fuzzy
 msgid "Group Users"
 msgstr "�s��"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:119 ../userdrake_.c:478
 msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Home Directory"
 msgstr "�ϥΪ̥D�ؿ�"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:119 ../userdrake_.c:481
 #, fuzzy
 msgid "Login Shell"
 msgstr "�ϥΪ̦W��"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:119 ../userdrake_.c:555
 msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "Status"
 msgstr "TLS �[�K"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User ID"
 msgstr "�ϥΪ�"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:119
 #, fuzzy
 msgid "User Name"
 msgstr "Userdrake �ϥΪ̺޲z��"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group ID"
 msgstr "�s��"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:125
 #, fuzzy
 msgid "Group Members"
 msgstr "�s��"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:125 ../userdrake_.c:492
 #, fuzzy
 msgid "Group Name"
 msgstr "�s��"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 #, fuzzy
 msgid "Add User"
 msgstr "�s�W�ϥΪ�"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:131
 msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add Group"
 msgstr "�s�W�s��"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:132
 #, fuzzy
 msgid "Add a group to the system"
 msgstr "�s�W�s��"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit"
 msgstr "�s��"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:133
 msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete"
 msgstr "�R��"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:134
 msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:135
 #, fuzzy
 msgid "Refresh the list"
 msgstr "�ϥΪ̦C��"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Generic help on userdrake"
 msgstr ""
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:136
 msgid "Help"
 msgstr "����"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:163
 msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:198 ../userdrake_.c:333
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:205
 #, fuzzy
 msgid "Create home Directory"
 msgstr "�ϥΪ̥D�ؿ�"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:207
 #, fuzzy
 msgid "Home Directory: "
 msgstr "�ϥΪ̥D�ؿ�"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:210
 msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:211
 msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:222
 #, fuzzy
 msgid "User already exists, please choose another User Name"
 msgstr "�t�Τ��w�g���o�ӦW��"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:224 ../userdrake_.c:634
 #, fuzzy
 msgid "Password Mismatch"
 msgstr "�K�X"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:225 ../userdrake_.c:636
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:236
 msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
-msgid "Cancel"
-msgstr "����"
-
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
-msgid "Ok"
-msgstr "�T�w"
-
-#: ../userdrake_.c:294
+#: ../userdrake_.c:286
 msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:298
 msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:300
 msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:303
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:324
 msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:328
 msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:339
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:350
 msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:354
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
 msgstr ""
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:369
 msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 #, fuzzy
 msgid " Remove Home Directory"
 msgstr "�ϥΪ̥D�ؿ�"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:419
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr ""
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:429
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:477
 msgid "Login"
 msgstr "�ϥΪ̦W��"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:479
 msgid "Password"
 msgstr "�K�X"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:480
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "�K�X�G"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:516
 msgid "Home"
 msgstr "�a�ؿ�"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:518
 #, fuzzy
 msgid "User Data"
 msgstr "�ϥΪ̦C��"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:522
 msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:524
 msgid "Account expires   MM/DD/YYYY :"
 msgstr ""
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:530
 msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:531
 msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:536
 msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:540
 msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:543
 msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:544
 msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:545
 msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:546
 msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:548
 #, fuzzy
 msgid "Password Info"
 msgstr "�K�X"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:552
 msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:558
 msgid "Groups"
 msgstr "�s��"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:598
 #, fuzzy
 msgid "Group Data"
 msgstr "�s�զC��"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:601
 msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:664
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:673
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:680
 msgid "Please specify all field for password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:722
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:827
 #, fuzzy
 msgid "Close"
 msgstr "���X"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:833
 #, fuzzy
 msgid "Userdrake"
 msgstr "Userdrake �ϥΪ̺޲z��"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:839
 msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:845
 msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:846
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "���v�Ҧ� (C) 2003 MandrakeSoft�C"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:852
 msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:853
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:854
 msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:858
 msgid "Error"
 msgstr ""
 
+#~ msgid "Cancel"
+#~ msgstr "����"
+
+#~ msgid "Ok"
+#~ msgstr "�T�w"
+
 #, fuzzy
 #~ msgid "/Options"
 #~ msgstr "����"