updated pot file; changed the way the pot is generated to use perl_checker

61 files changed, 24025 insertions, 18740 deletions

diff --git a/po/Makefile b/po/Makefile
index da4bd31..9d7bcad 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -8,7 +8,6 @@ PL_FILES = $(shell cat POTFILES.in | sed 's,^,../,' )
 # C-like files to search translatable strings in
 #CFILES = 
 
-PL_CFILES = $(PL_FILES:%=%_.c)
 POFILES = $(shell ls *.po)
 MOFILES = $(POFILES:%.po=%.mo)
 LANGS = $(POFILES:%.po=%)
@@ -24,22 +23,20 @@ install: all
 	done
 
 clean:
-	rm -f *~ *.[oas] *.mo $(GOALS) TAGS $(MOFILES) $(PL_CFILES)
+	rm -f *~ *.[oas] *.mo $(GOALS) TAGS $(MOFILES)
 
 %.mo: %.po
 	msgfmt -o $@ $<
 
-$(PGOAL).pot: POTFILES.in $(PL_CFILES) $(CFILES)
-	xgettext -F -n --default-domain=$(PGOAL) \
-	--add-comments='-PO' \
-	--keyword=_ --keyword=__ --keyword=N_ --keyword=N \
-	--keyword=I_ --keyword=i18n \
-	--language=C $(PL_CFILES) $(CFILES)
-	mv $(PGOAL).po $@
-	@rm -rf $(PL_CFILES)
-
-$(PL_CFILES): %_.c: %
-	./fake_c.pl $< > $@
+$(PGOAL).pot: POTFILES.in $(PL_FILES) $(CFILES)
+	#xgettext -F -n --add-comments \
+	#--keyword=_ --keyword=__ --keyword=N_ --keyword=N \
+	#--keyword=gettext \
+	#--language=C -o placeholder.pot $(CFILES)
+	touch placeholder.pot
+	perl_checker -q --generate-pot $(PGOAL)_tmp.pot $(PL_FILES) || rm -f $(PGOAL)_tmp.pot
+	[ ! -e $(PGOAL)_tmp.pot ] || msgcat --use-first placeholder.pot $(PGOAL)_tmp.pot > $@
+	rm -f placeholder.pot $(PGOAL)_tmp.pot
 
 merge: $(PGOAL).pot
 	@for n in $(POFILES); do \
diff --git a/po/ar.po b/po/ar.po
index 0befd21..1ee9ecc 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-08-18 16:03-0300\n"
 "Last-Translator: Mohammed Gamal <f2c2001@yahoo.com>\n"
 "Language-Team: Arabic\n"
@@ -17,453 +17,554 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "أداة Mandrake Linux لإدارة المستخدمين"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_أحداث"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "جميع الحقوق محفوظة 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_تحرير"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "مستخدمو المجموعة"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_حذف"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/تن_قية مستخدمي النظام"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_خيارات"
+#: ../userdrake:1
+#, c-format
+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 ""
+"انشاء مجموعة بهوية أقل من 500 غير منصوح به.\n"
+" هل أنت متأكد أنك تريد فعل ذلك؟\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_ملف"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "غلاف (سطر أوامر) الدخول"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/تح_ديث"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "انشئ مجموعة خاصة بالمستخدم"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/_خروج"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "تحرير"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>خ"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "اضافة مستخدم الى النظام"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/_اضف مستخدم"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "معلومات الحساب"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/اضف م_جموعة"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "تحذير : جاري حذف المستخدم"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/مسا_عدة"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "خطأ"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/أ_رسل تقرير بالعيوب"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "أعضاء المجموعة"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_حول..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "أيام التحذير قبل التغيير :"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "طبّق المرشّح"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "حذف الصف المختار"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "المستخدمون"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "انشئ دليل خاص"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "المجموعات"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "هوية المستخدم: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "الإسم الكامل"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr "الإسم يجب أن يحتوي فقط على حروف صغيرة, أرقام, `-' و `_'"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "الدليل الخاص"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "غلاف (سطر أوامر) الدخول"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"كلمة المرور هذه بسيطة جداً. \n"
+" كلمات المرور الجيدة يجب أن تكون أكثر من 6 رموز"
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "المجموعة الأساسية"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "الأسام قبل التغيير المطلوب :"
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "الحالة"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "هل تريد فعلاًُ حذف المجموعة %s\n"
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "هوية المستخدم"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "فضلاً املأ جميع حقول تقادم كلمة المرور\n"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "اسم المستخدم"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "اضغط على الأيقونة لتغييرها"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "هوية المجموعة"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s مجموعة أساسية للمستخدم %s\n"
+" احذف المستخدم أولاً"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "أعضاء المجموعة"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/اضف م_جموعة"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "اسم المجموعة"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "لا يمكك حذف المستخدم '%s' من مجموعته الأساسية"
 
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr "اضف مستخدم"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "أداة Mandrake Linux لإدارة المستخدمين"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "اضافة مستخدم الى النظام"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "المجموعة موجودة مسبقاً, فضلاً اختر اسم آخر للمجموعة"
 
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "اضف مجموعة"
+#: ../userdrake:1
+#, c-format
+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 ""
+"انشاء مستخدم بهوية أصغر من 500 غير منصوح به.\n"
+" هل أنت متأكد أنك تريد فعل ذلك؟\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "المؤلفون: "
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "اضافة مجموعة الى النظام"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "تحرير"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "تحرير الصف المختار"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "الغاء"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "حذف الصف المختار"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "تحديث"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "تحديث القائمة"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "انتهت صلاحيته"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "تم اقفاله"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "اضغط على الأيقونة لتغييرها"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "انشئ مستخدم جديد"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "انشئ دليل خاص"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "المجموعات"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "الدليل الخاص: "
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "المجموعة الأساسية"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "انشئ مجموعة خاصة بالمستخدم"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "هوية المستخدم أصغر من 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "حدّد هوية المستخدم يدوياً"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "اقفال حساب المستخدم"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "المستخدم موجود مسبقاً, فضلاً اختر اسم مستخدم آخر"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
+"جاري حذف المستخدم %s\n"
+" قم كذلك بالمهامات التالية\n"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "الأيام قبل التغيير المسموح :"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "الدليل الخاص"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "كلمات المرور غير مطابقة"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"كلمة المرور هذه بسيطة جداً. \n"
-" كلمات المرور الجيدة يجب أن تكون أكثر من 6 رموز"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "المستخدم موجود مسبقاً, فضلاً اختر اسم مستخدم آخر"
 
-#: ../userdrake_.c:265
-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 ""
-"انشاء مستخدم بهوية أصغر من 500 غير منصوح به.\n"
-" هل أنت متأكد أنك تريد فعل ذلك؟\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
+msgstr "اضف مستخدم"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "هوية المستخدم أصغر من 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "هوية المستخدم: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "الحساب تنتهي صالحيته (يوم/شهر/سنة):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "اختر مجموعة"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_أحداث"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "أضف الى مجموعة 'المستخدمين'"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "أضف الى المجموعة الموجودة"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "حدّد هوية المستخدم يدوياً"
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "توجد مجموعة بهذا الإسم مسبقاً.  ماذا تريد أن تفعل؟"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/_ملف"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "نعم"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "الإسم طويل جداً"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "لا"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "اغلق"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "اسم المستخدم"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "الدليل الخاص: "
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/تح_ديث"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_تحرير"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>خ"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "حدّد هوية المجموعة يدوياً"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "المجموعة موجودة مسبقاً, فضلاً اختر اسم آخر للمجموعة"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "حقل الإسم فارغ فضلاً قم بتحديد اسم"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr " هوية المجموعة أصغر من 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "اسم الدخول"
 
-#: ../userdrake_.c:385
-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 ""
-"انشاء مجموعة بهوية أقل من 500 غير منصوح به.\n"
-" هل أنت متأكد أنك تريد فعل ذلك؟\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/_خروج"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "هوية المجموعة: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "توجد مجموعة بهذا الإسم مسبقاً.  ماذا تريد أن تفعل؟"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr "تحذير : جاري حذف المستخدم"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "الغاء"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"جاري حذف المستخدم %s\n"
-" قم كذلك بالمهامات التالية\n"
+"فضلا حدد سنة و شهر و يوم\n"
+" انتهاء صالحية الحساب "
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "احذف الدليل الخاص: %s"
+msgid "User Data"
+msgstr "بيانات المستخدم"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "احذف صندوق البريد :/var/spool/mail/%s"
+msgid "Refresh"
+msgstr "تحديث"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "الإسم الكامل"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "تحذير : جاري حذف المجموعة"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "هل تريد فعلاًُ حذف المجموعة %s\n"
+msgid " Group Gid is < 500"
+msgstr " هوية المجموعة أصغر من 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s مجموعة أساسية للمستخدم %s\n"
-" احذف المستخدم أولاً"
+msgid "Edit selected row"
+msgstr "تحرير الصف المختار"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "اسم الدخول"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "اسم المجموعة"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "الحالة"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "كلمة المرور"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "تأكيد كلمة المرور:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "تمكين انهاء صالحية كلمات المرور"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "الدليل الخاص"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "اختر المستخدمين الذين سيلحقون بالمجموعة :"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "بيانات المستخدم"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "المستخدمون"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "تمكين انهاء صالحية الحسابات"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "الأيام قبل انهاء الحساب :"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "الحساب تنتهي صالحيته (يوم/شهر/سنة):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "هوية المجموعة"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "اقفال حساب المستخدم"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "لا"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "معلومات الحساب"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_حول..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "قام المستخدم بتغيير كلمة مروره عند : "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_خيارات"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "تمكين انهاء صالحية كلمات المرور"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "هوية المستخدم"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "الأيام قبل التغيير المسموح :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "تمكين انهاء صالحية الحسابات"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "الأسام قبل التغيير المطلوب :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "احذف صندوق البريد :/var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "أيام التحذير قبل التغيير :"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "تحديث القائمة"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "الأيام قبل انهاء الحساب :"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/مسا_عدة"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "معلومات كلمة المرور"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "احذف الدليل الخاص: %s"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "ادارة المستخدمين \n"
+
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "اختر المجموعات التي سيصبح المستخدم عضواً فيها: "
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "بيانات المجموعة"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "اختر المستخدمين الذين سيلحقون بالمجموعة :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "تم اقفاله"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "مستخدمو المجموعة"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "اضف مجموعة"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "فضلاً اختر مجموعة واحدة على الأقل للمستخدم"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"فضلا حدد سنة و شهر و يوم\n"
-" انتهاء صالحية الحساب "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "قام المستخدم بتغيير كلمة مروره عند : "
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
-msgstr "فضلاً املأ جميع حقول تقادم كلمة المرور\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/أ_رسل تقرير بالعيوب"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "لا يمكك حذف المستخدم '%s' من مجموعته الأساسية"
+msgid "Yes"
+msgstr "نعم"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "اغلق"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "بيانات المجموعة"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "هوية المجموعة: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "المؤلفون: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "تأكيد كلمة المرور:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "ادارة المستخدمين \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/_اضف مستخدم"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "جميع الحقوق محفوظة 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/تن_قية مستخدمي النظام"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "حقل الإسم فارغ فضلاً قم بتحديد اسم"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "معلومات كلمة المرور"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "الإسم يجب أن يحتوي فقط على حروف صغيرة, أرقام, `-' و `_'"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "ابحث:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "الإسم طويل جداً"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "أضف الى المجموعة الموجودة"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "خطأ"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "اختر مجموعة"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "طبّق المرشّح"
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "مساعدة عامة حول userdrake"
diff --git a/po/az.po b/po/az.po
index 9a138e3..b9e9d02 100644
--- a/po/az.po
+++ b/po/az.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-az\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-08-06 23:56+0200\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <gnome@azitt.com>\n"
@@ -17,457 +17,557 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Mandrake Linux İstifadəçi İdarəsi Vasitəsi"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_Gedişatlar"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Təlif Hüququ © 2003 MandrakeSoft."
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_Düzəlt"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Qrup İstifadəçiləri"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_Sil"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Sistem istifadəçilərini filtrələ"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_Seçimlər"
+#: ../userdrake:1
+#, c-format
+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 ""
+"GID'i 500'dən az olan qrup yaradmaq məsləhət edilmir.\n"
+" Bunu həqiqətən də etmək istəyirsiniz?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_Fayl"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Giriş Qabığı"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/_Yenilə"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "İstifadəçi üçün xüsusi (private) qrup yarat"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/Çı_x"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Düzəlt"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "Sistemə istifadəçi əlavə et"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/_İstifadəçi Əlavə Et"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Hesab Mə'lumatı"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/_Qrup Əlavə Et"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "Xəbərdarlıq : İstifadəçi Silinir"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/_Yardım"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Xəta"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_Xəta Raportu Göndər"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "Qrupun Üzvləri"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_Haqqında..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "Dəyişdirmədən xəbərdarlıq əvvəlindəki gün :"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "Filtrəni tətbiq et"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Seçili sətiri sil"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "İstifadəçilər"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "Ev Cərgəsi Yarat"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Qruplar"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Tam Ad"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr ""
+"Ad ancaq kiçik hərfləri, ədədləri, `-' və `_' xarakterlərini daxil edə bilər"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Ev Cərgəsi"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Giriş Qabığı"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"Şifrə həddindən artıq qısadır. \n"
+"Məsləhət görülən şifrələrin 6 hərfdən böyük olmasıdır"
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Əsas Qrup"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "Dəyişdirmə məcburiyyəti əvvəlindəki gün :"
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Vəziyyət"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "Həqiqətən də %s qrupunu silmək istəyirsiniz?\n"
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "İstifadəçi ID'si"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Xahiş edirik, şifrə köhnəlməsinin bütün sahələrini tə'yin edin\n"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "İstifadəçi Adı"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "Dəyişdirmək üçün timsala tıqlayın"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "Qrup ID'si"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s, %s istifadəçisinin əsas qrupudur\n"
+" Əvvəlcə istifadəçini silin"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "Qrupun Üzvləri"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/_Qrup Əlavə Et"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Qrupun Adı"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "'%s' istifadəçisini onun əsas qrupundan çıxara bilməzsiniz"
 
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr ""
-"İstifadəçi\n"
-"Əlavə Et"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Mandrake Linux İstifadəçi İdarəsi Vasitəsi"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "Sistemə istifadəçi əlavə et"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "Bu qrup onsuz da mövcuddur, xahiş edirik başqa Qrup Adı seçin"
 
-#: ../userdrake_.c:136
-msgid "Add Group"
+#: ../userdrake:1
+#, c-format
+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 ""
-"Qrup\n"
-"Əlavə Et"
+"UID'i 500'dən az olan istifadəçi yaradmaq məsləhət edilmir.\n"
+" Bunu həqiqətən də etmək istəyirsiniz?\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Müəlliflər:"
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "Sistemə qrup əlavə et"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Düzəlt"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "Seçili sətiri düzəlt"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Sil"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Seçili sətiri sil"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Yenilə"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Siyahını təzələ"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "Vaxtı Keçib"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "Qıfıllı"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "Dəyişdirmək üçün timsala tıqlayın"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Yeni İstifadəçi Yarat"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "Ev Cərgəsi Yarat"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Qruplar"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Ev Cərgəsi:"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Əsas Qrup"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "İstifadəçi üçün xüsusi (private) qrup yarat"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "İstifadəçi Uid'i < 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "İstifadəçi ID'sini əllə müəyyən et"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "İstifadəçi Hesabını Qıfılla"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
-"Bu istifadəçi onsuz da mövcuddur, xahiş edirik başqa İstifadəçi Adı seçin"
+"%s istifadəçisi silinir\n"
+" Xahiş edirik, bunları da yerinə gətirin\n"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "Dəyişdirmə icazəsi əvvəlindəki gün :"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Ev"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "Şifrələr Uyğun Gəlmir"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
 msgstr ""
-"Şifrə həddindən artıq qısadır. \n"
-"Məsləhət görülən şifrələrin 6 hərfdən böyük olmasıdır"
+"Bu istifadəçi onsuz da mövcuddur, xahiş edirik başqa İstifadəçi Adı seçin"
 
-#: ../userdrake_.c:265
-msgid ""
-"Creating a user with a UID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
 msgstr ""
-"UID'i 500'dən az olan istifadəçi yaradmaq məsləhət edilmir.\n"
-" Bunu həqiqətən də etmək istəyirsiniz?\n"
-"\n"
+"İstifadəçi\n"
+"Əlavə Et"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "İstifadəçi Uid'i < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "Hesabın vaxtının keçməsi tarixi (YYYY-MM-DD):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "Qrupu Seç"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_Gedişatlar"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "'users' qrupuna qoy"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Mövcud qrupa qoy"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "İstifadəçi ID'sini əllə müəyyən et"
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "Bu adla onsuzda bir qrup mövcuddur. Nə etmək istəyirsiniz?"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/_Fayl"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Bəli"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "Ad çox uzundur"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "Xeyr"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Bağla"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "İstifadəçi Adı"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Ev Cərgəsi:"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/_Yenilə"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_Düzəlt"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "Qrup ID'sini əllə müəyyən et"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "Bu qrup onsuz da mövcuddur, xahiş edirik başqa Qrup Adı seçin"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "Ad sahəsi boşdur, xahiş edirik bir ad tə'yin edin"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr "Qrup Gid'i < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Giriş"
 
-#: ../userdrake_.c:385
-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 ""
-"GID'i 500'dən az olan qrup yaradmaq məsləhət edilmir.\n"
-" Bunu həqiqətən də etmək istəyirsiniz?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/Çı_x"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "Bu adla onsuzda bir qrup mövcuddur. Nə etmək istəyirsiniz?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr "Xəbərdarlıq : İstifadəçi Silinir"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Sil"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"%s istifadəçisi silinir\n"
-" Xahiş edirik, bunları da yerinə gətirin\n"
+"Xahiş edirik, hesabının vaxtının keçməsinin \n"
+" İl, Ay və Gününü tə'yin edin"
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "%s Ev Cərgəsini Sil"
+msgid "User Data"
+msgstr "İstifadəçi Datası"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "Poçt Qutusunu Sil :/var/spool/mail/%s"
+msgid "Refresh"
+msgstr "Yenilə"
+
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Tam Ad"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "Xəbərdarlıq : Qrup Silinir"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "Həqiqətən də %s qrupunu silmək istəyirsiniz?\n"
+msgid " Group Gid is < 500"
+msgstr "Qrup Gid'i < 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s, %s istifadəçisinin əsas qrupudur\n"
-" Əvvəlcə istifadəçini silin"
+msgid "Edit selected row"
+msgstr "Seçili sətiri düzəlt"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Giriş"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Qrupun Adı"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Vəziyyət"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Parol"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Şifrəni Təstiqləyin:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "Şifrənin Vaxtının Keçməsini Fəallaşdır"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Ev"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "Bu qrupa qoşulacaq istifadəçiləri seçin: "
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "İstifadəçi Datası"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "İstifadəçilər"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "Hesabın vaxtının keçməsini fəallaşdır"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "Hesabın qeyri-fəal olması əvvəlindəki gün :"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "Hesabın vaxtının keçməsi tarixi (YYYY-MM-DD):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "Qrup ID'si"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "İstifadəçi Hesabını Qıfılla"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "Xeyr"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Hesab Mə'lumatı"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_Haqqında..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "İstifadəçi şifrəsini ən son bu vaxtda dəyişib :"
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Seçimlər"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "Şifrənin Vaxtının Keçməsini Fəallaşdır"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "İstifadəçi ID'si"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "Dəyişdirmə icazəsi əvvəlindəki gün :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "Hesabın vaxtının keçməsini fəallaşdır"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "Dəyişdirmə məcburiyyəti əvvəlindəki gün :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "Poçt Qutusunu Sil :/var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "Dəyişdirmədən xəbərdarlıq əvvəlindəki gün :"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Siyahını təzələ"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "Hesabın qeyri-fəal olması əvvəlindəki gün :"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_Yardım"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Şifrə Mə'lumatı"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "%s Ev Cərgəsini Sil"
+
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "İstifadəçilərin İdarəsi \n"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "İstifadəçinin üzv olacağı qrupları seçin:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "Qrup Datası"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "Bu qrupa qoşulacaq istifadəçiləri seçin: "
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "Qıfıllı"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Qrup İstifadəçiləri"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr ""
+"Qrup\n"
+"Əlavə Et"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "Xahiş edirik, istifadəçi üçün ən az bir qrup seçin"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Xahiş edirik, hesabının vaxtının keçməsinin \n"
-" İl, Ay və Gününü tə'yin edin"
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "İstifadəçi şifrəsini ən son bu vaxtda dəyişib :"
 
-#: ../userdrake_.c:753
-#, fuzzy
-msgid "Please fill up all fields in password aging\n"
-msgstr "Xahiş edirik, şifrə köhnəlməsinin bütün sahələrini tə'yin edin\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Xəta Raportu Göndər"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "'%s' istifadəçisini onun əsas qrupundan çıxara bilməzsiniz"
+msgid "Yes"
+msgstr "Bəli"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Bağla"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Qrup Datası"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Müəlliflər:"
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Şifrəni Təstiqləyin:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "İstifadəçilərin İdarəsi \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/_İstifadəçi Əlavə Et"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Təlif Hüququ © 2003 MandrakeSoft."
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Sistem istifadəçilərini filtrələ"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "Ad sahəsi boşdur, xahiş edirik bir ad tə'yin edin"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "Şifrə Mə'lumatı"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr ""
-"Ad ancaq kiçik hərfləri, ədədləri, `-' və `_' xarakterlərini daxil edə bilər"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Axtar:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "Ad çox uzundur"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Mövcud qrupa qoy"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Xəta"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "Qrupu Seç"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "Filtrəni tətbiq et"
diff --git a/po/be.po b/po/be.po
index a040e22..3a3e116 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Userdrake\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-08-14 16:54+0300\n"
 "Last-Translator: Maxim Kuzmich <max_kuzm@tut.by>\n"
 "Language-Team: Belarusian\n"
@@ -13,449 +13,550 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Дастасаваньне для кіраваньня карыстальнікамі Mandrake Linux"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_Дзеяньні"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr ""
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_Рэдагаваць"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Карыстальнікі групы"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_Выдаліць"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Фільтраваць сыстэмных карыстальнікаў"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_Налады"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Стварэньне групы з GID меншым за 500 не рэкамэндавана.\n"
+" Ці вы ўпэўненыя ў тым што робіце?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_Файл"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr ""
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/_Аднавіць"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Стварыць прыватную групу для карыстальніка"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/_Выхад"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Рэдагаваць"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "Дадаць карыстальніка ў сыстэму"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/_Дадаць карыстальніка"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Інфармацыя запісу"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/Дадаць _групу"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "Папярэджаньне : Выдаленьне карыстальніка"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/_Дапамога"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Памылка"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_Паведаміць пра памылку"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "Сябры групы"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_Пра..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr ""
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "Ужыць фільтар"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Выдаліць вылучаны радок"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Карыстальнікі"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "Стварыць хатні каталёг"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Групы"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr ""
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Поўнае імя"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr ""
+"Імя павінна ўтрымліваць толькі маленькія лацінскія літары, лічбы, `-' ды `_'"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Хатні каталёг"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
 msgstr ""
+"Гэты пароль занадта просты. \n"
+" Добрыя паролі павінны быць большыя за 6 літараў"
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Асноўная група"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr ""
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Стан"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "Ці жадаеце выдаліць групу %s\n"
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "ID карыстальніка"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Імя карыстальніка"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "Націсніце на піктаграму каб зьмяніць яе"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "ID групы"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s асноўная група для карыстальніка %s\n"
+" Спачатку выдаліце гэтага карыстальніка"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "Сябры групы"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/Дадаць _групу"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Імя групы"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Вы ня можаце выдаліць карыстальніка '%s' зь ягонай асноўнай групы"
 
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr "Дадаць карыстальніка"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Дастасаваньне для кіраваньня карыстальнікамі Mandrake Linux"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "Дадаць карыстальніка ў сыстэму"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "Група ўжо існуе, пазначце другое імя для групы"
 
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "Дадаць групу"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Стварэньне карыстальніка з UID меншым за 500 не рэкамэндавана.\n"
+" Ці вы ўпэўнены, што хочаце зрабіць гэта?\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Аўтары: "
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "Дадаць групу ў сыстэму"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Рэдагаваць"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "Рэдагаваць вылучаны радок"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Выдаліць"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Выдаліць вылучаны радок"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Аднавіць"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Аднавіць сьпіс"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "Блакіраваны"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "Націсніце на піктаграму каб зьмяніць яе"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Стварыць новага карыстальніка"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "Стварыць хатні каталёг"
-
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Хатні каталёг: "
-
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Стварыць прыватную групу для карыстальніка"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Групы"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "Пазначыць карыстальніцкі ID"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Асноўная група"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "Карыстальнік ўжо існуе, пазначце другое Імя"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "Карыстальніцкі ID < 500"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
-msgid "Password Mismatch"
-msgstr "Несупадзеньне пароляў"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "Блакіраваць карыстальніцкі запіс"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
+#: ../userdrake:1
+#, c-format
 msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
-"Гэты пароль занадта просты. \n"
-" Добрыя паролі павінны быць большыя за 6 літараў"
+"Выдаленьне карыстальніка %s\n"
+" Таксама выканаць наступныя дзеі\n"
 
-#: ../userdrake_.c:265
-msgid ""
-"Creating a user with a UID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
 msgstr ""
-"Стварэньне карыстальніка з UID меншым за 500 не рэкамэндавана.\n"
-" Ці вы ўпэўнены, што хочаце зрабіць гэта?\n"
-"\n"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "Карыстальніцкі ID < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Хата"
 
-#: ../userdrake_.c:317
-msgid "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Password Mismatch"
+msgstr "Несупадзеньне пароляў"
+
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Карыстальнік ўжо існуе, пазначце другое Імя"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
+msgstr "Дадаць карыстальніка"
+
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
 msgstr ""
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "Выберыце групу"
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "Тэрмін дзеяньня выцякае (ГГГГ-ММ-ДД)"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_Дзеяньні"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "Дадаць у групу 'users'"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Дадаць у існуючую групу"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "Пазначыць карыстальніцкі ID"
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "Група з такім імём ўжо існуе. Што будзем рабіць?"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/_Файл"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Так"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "Імя занадта доўгае"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "Не"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Зачыніць"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Імя карыстальніка"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Хатні каталёг: "
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/_Аднавіць"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_Рэдагаваць"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "Пазначыць ID групы"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "Група ўжо існуе, пазначце другое імя для групы"
-
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr " ID групы меншы за 500"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "Поле \"Імя\" пустое. Пазначце яго"
 
-#: ../userdrake_.c:385
-msgid ""
-"Creating a group with a GID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
 msgstr ""
-"Стварэньне групы з GID меншым за 500 не рэкамэндавана.\n"
-" Ці вы ўпэўненыя ў тым што робіце?\n"
-"\n"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/_Выхад"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr "Папярэджаньне : Выдаленьне карыстальніка"
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "Група з такім імём ўжо існуе. Што будзем рабіць?"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Выдаліць"
+
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"Выдаленьне карыстальніка %s\n"
-" Таксама выканаць наступныя дзеі\n"
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Выдаліць хатні каталёг :%s"
+msgid "User Data"
+msgstr "Карыстальніцкія дадзеныя"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "Выдаліць паштовую скрыню: /var/spool/mail/%s"
+msgid "Refresh"
+msgstr "Аднавіць"
+
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Поўнае імя"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "Увага : Выдаленьне групы"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "Ці жадаеце выдаліць групу %s\n"
+msgid " Group Gid is < 500"
+msgstr " ID групы меншы за 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s асноўная група для карыстальніка %s\n"
-" Спачатку выдаліце гэтага карыстальніка"
+msgid "Edit selected row"
+msgstr "Рэдагаваць вылучаны радок"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Імя групы"
+
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Стан"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Пароль"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Яшчэ раз пароль:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "Дазволіць тэрмін дзеяньня паролю"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Хата"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "Пазначце карыстальнікаў каб аб'яднаць у гэтыю групу"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Карыстальніцкія дадзеныя"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Карыстальнікі"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "Дазволіць тэрмін дзеяньня запісу"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr ""
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "Тэрмін дзеяньня выцякае (ГГГГ-ММ-ДД)"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "ID групы"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "Блакіраваць карыстальніцкі запіс"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "Не"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Інфармацыя запісу"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_Пра..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "Карыстальнік змяняў пароль апошні раз: "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Налады"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "Дазволіць тэрмін дзеяньня паролю"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "ID карыстальніка"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "Дазволіць тэрмін дзеяньня запісу"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "Выдаліць паштовую скрыню: /var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Аднавіць сьпіс"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_Дапамога"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Інфармацыя пра пароль"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Выдаліць хатні каталёг :%s"
+
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr ""
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Выберыце групы сябром якіх будзе карыстальнік:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "Дадзеныя групы"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "Пазначце карыстальнікаў каб аб'яднаць у гэтыю групу"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "Блакіраваны"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Карыстальнікі групы"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "Дадаць групу"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "Пазначце ня менш адной групы для карыстальніка"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "Карыстальнік змяняў пароль апошні раз: "
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Паведаміць пра памылку"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Вы ня можаце выдаліць карыстальніка '%s' зь ягонай асноўнай групы"
+msgid "Yes"
+msgstr "Так"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Зачыніць"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Дадзеныя групы"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Аўтары: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Яшчэ раз пароль:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/_Дадаць карыстальніка"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Фільтраваць сыстэмных карыстальнікаў"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "Поле \"Імя\" пустое. Пазначце яго"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "Інфармацыя пра пароль"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
 msgstr ""
-"Імя павінна ўтрымліваць толькі маленькія лацінскія літары, лічбы, `-' ды `_'"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "Імя занадта доўгае"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Дадаць у існуючую групу"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Памылка"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "Выберыце групу"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "Ужыць фільтар"
diff --git a/po/bg.po b/po/bg.po
index 2ffeba5..fa0a09f 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-bg\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-08-19 01:07+0300\n"
 "Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -19,458 +19,559 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Мандрейк инструмент за работа с потребителски сметки"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_Действия"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright (C) 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_Промени"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Потребители в групата"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_Изтрий"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Филтрира системните потребители"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_Настройки"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Създаване на група с GID < 500 не е препоръчително\n"
+" Сигурен ли сте,че желаете да го направите ?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_Файл"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Влизане в системата"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/_Опресни"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Създава лична група за потребителя"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/_Изход"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Промени"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "Добавя потребител към системата"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/_Добави потребител"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Информация за сметка"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/Добави _група"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "Внимание: Изтриване на потребител"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/Помощ"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Грешка"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_Уведоми за грешка"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "Членове на група"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_Информация..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "Предупреждение (в дни) преди промяната:"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "Използва филтър"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Изтрива избраната редица"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Потребители"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "Създава домашна директория"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Групи"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Пълно име"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr ""
+"Името трябва да съдържа латински букви в долен регистър,цифри,`-' и `_'"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Домашна директория на потребител"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Влизане в системата"
-
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Основна група"
-
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Статус"
-
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "Потребителски номер"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"Паролата е твърде проста. \n"
+"Добри пароли са тези с поне 6 символа."
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Име на потребител"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "Дни преди да бъде наложена смяна:"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "Номер на група"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "Наистина ли желаете да изтриете група %s\n"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "Членове на група"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Моля попълнете всички полета за \"остаряване\" на паролата\n"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Име на група"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "Щракнете на иконата,за да я промените"
 
-# broken into two lines to avoid too large a button
-#: ../userdrake_.c:135
-msgid "Add User"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
 msgstr ""
-"Добави\n"
-"потребител"
-
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "Добавя потребител към системата"
-
-# broken into two lines to avoid too large a button
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "Добави група"
+"%s е основната група на потребител %s\n"
+" Изтрийте първо потребителя."
 
-#: ../userdrake_.c:136
-msgid "Add a group to the system"
-msgstr "Добавя група към системата"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/Добави _група"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Промени"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Не можете да махнете потребител %s от основната му група"
 
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "Редактира избраната редица"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Мандрейк инструмент за работа с потребителски сметки"
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Изтрий"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "Групата вече съществува,моля изберете друго име"
 
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Изтрива избраната редица"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Създаване на потребител с номер по-малък от 500 не е препоръчително.\n"
+"Сигурни ли сте,че го желаете ?\n"
+"\n"
 
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Опресни"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Автори:"
 
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Опресни списъка с потребителите"
+#: ../userdrake:1
+#, c-format
+msgid "Add a group to the system"
+msgstr "Добавя група към системата"
 
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "Просрочен"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "Заключен"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "Щракнете на иконата,за да я промените"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Създава нов потребител"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "Създава домашна директория"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Групи"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Домашна директория:"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Основна група"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Създава лична група за потребителя"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "Потребителският номер е по-малък от 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "Ръчно задаване на потребителски номер"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "Заключва потребителска сметка"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "Това име вече съществува в системата,моля изберете друго"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
+"Изтриване на потребител %s\n"
+" Също изпълни следните действия:\n"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "Дни преди да бъде разрешена смяна:"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Дом"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "Паролите не съвпадат"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"Паролата е твърде проста. \n"
-"Добри пароли са тези с поне 6 символа."
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Това име вече съществува в системата,моля изберете друго"
 
-#: ../userdrake_.c:265
-msgid ""
-"Creating a user with a UID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+# broken into two lines to avoid too large a button
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
 msgstr ""
-"Създаване на потребител с номер по-малък от 500 не е препоръчително.\n"
-"Сигурни ли сте,че го желаете ?\n"
-"\n"
+"Добави\n"
+"потребител"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "Потребителският номер е по-малък от 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "Сметката е валидна до (ГГГГ-ММ-ДД):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "Изберете група"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_Действия"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "Добавяне към група \"потребители\""
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Добавя към съществуваща група"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "Ръчно задаване на потребителски номер"
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "Група "
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/_Файл"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Да"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "Името е твърде дълго"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "Не"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Затвори"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Име на потребител"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Домашна директория:"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/_Опресни"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_Промени"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "Ръчно задаване на номер на група"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "Групата вече съществува,моля изберете друго име"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "Полето за име е празно,моля въведете нещо."
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr "ГИД е по-малък от 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Влизане в с-мата"
 
-#: ../userdrake_.c:385
-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 ""
-"Създаване на група с GID < 500 не е препоръчително\n"
-" Сигурен ли сте,че желаете да го направите ?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/_Изход"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "Група "
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr "Внимание: Изтриване на потребител"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Изтрий"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"Изтриване на потребител %s\n"
-" Също изпълни следните действия:\n"
+"Моля въведете година,месец и ден, \n"
+" до които важи сметката"
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Изтриване на  домашна директория : %s"
+msgid "User Data"
+msgstr "Потребителска информация"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "Изтриване на пощенска кутия: /var/spool/mail/%s"
+msgid "Refresh"
+msgstr "Опресни"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Пълно име"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "Внимание: Изтриване на група"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "Наистина ли желаете да изтриете група %s\n"
+msgid " Group Gid is < 500"
+msgstr "ГИД е по-малък от 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s е основната група на потребител %s\n"
-" Изтрийте първо потребителя."
+msgid "Edit selected row"
+msgstr "Редактира избраната редица"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Влизане в с-мата"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Име на група"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Статус"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Парола"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Потвърждение:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "Включва валидност на паролите"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Дом"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "Изберете потребители за тази група:"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Потребителска информация"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Потребители"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "Включва валидност на сметките"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "Дни преди сметката да стане неактивна"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "Сметката е валидна до (ГГГГ-ММ-ДД):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "Номер на група"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "Заключва потребителска сметка"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "Не"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Информация за сметка"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_Информация..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "Потребителят е сменил последно паролата си на : "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Настройки"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "Включва валидност на паролите"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "Потребителски номер"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "Дни преди да бъде разрешена смяна:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "Включва валидност на сметките"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "Дни преди да бъде наложена смяна:"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "Изтриване на пощенска кутия: /var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "Предупреждение (в дни) преди промяната:"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Опресни списъка с потребителите"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "Дни преди сметката да стане неактивна"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/Помощ"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Информация за паролите"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Изтриване на  домашна директория : %s"
+
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Работа със сметки \n"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Изберете към на кои групи ще бъде член потребителят:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "Информация за групите"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "Изберете потребители за тази група:"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "Заключен"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Потребители в групата"
+# broken into two lines to avoid too large a button
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "Добави група"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "Моля изберете поне една група за потребителя"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Моля въведете година,месец и ден, \n"
-" до които важи сметката"
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "Потребителят е сменил последно паролата си на : "
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
-msgstr "Моля попълнете всички полета за \"остаряване\" на паролата\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Уведоми за грешка"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Не можете да махнете потребител %s от основната му група"
+msgid "Yes"
+msgstr "Да"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Затвори"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Информация за групите"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Автори:"
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Потвърждение:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Работа със сметки \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/_Добави потребител"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright (C) 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Филтрира системните потребители"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "Полето за име е празно,моля въведете нещо."
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "Информация за паролите"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr ""
-"Името трябва да съдържа латински букви в долен регистър,цифри,`-' и `_'"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Търси:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "Името е твърде дълго"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Добавя към съществуваща група"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Грешка"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "Изберете група"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "Използва филтър"
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "Начална помощ за юзердрейк"
diff --git a/po/bs.po b/po/bs.po
index dec9b99..7e2dfca 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 11.08.2003. 20:43\n"
 "Last-Translator: Amila Akagić <bono@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -16,454 +16,554 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Alat za menadžement korisnika na Mandrake Linuxu"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_Akcije"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Autorska prava (C) 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_Edituj"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Korisnici grupe"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_Izbriši"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Filtriraj korisnike sistema"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_Opcije"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Ne preporučuje se kreiranje grupe sa GID-om manjim od 500.\n"
+" Da li ste sigurni da želite ovo uraditi?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_Datoteka"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Shell"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/_Osvježi"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Napravi privatnu grupu za korisnika"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/_Kraj"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Izmijeni"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "Dodaj korisnika na sistem"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/Dodaj _korisnika"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Podaci o računu"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/Dodaj _grupu"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "Upozorenje: Brišem korisnika"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/_Pomoć"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Greška"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_Prijavi grešku"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "Članovi grupe"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_O programu..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "Dana upozorenja prije promjene:"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "Primijeni filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Izbriši izabrani red"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Korisnici"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "Napravi početni direktorij"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Grupe"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Ime i prezime"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr "Ime mora sadržavati samo mala latinična slova, brojeve '-' i '_'"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Početni direktorij"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Shell"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"Ova šifra je previše jednostavna.\n"
+" Dobre šifre trebaju biti veće od 6 karaktera"
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Primarna grupa"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "Dana prije nego je promjena zahtjevana:"
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Status"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "Da li zaista želite izbrisatti grupu %s\n"
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "Korisnički ID"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Definišite sva polja sa starenje šifre\n"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Korisničko ime"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "Kliknite na ikonu da je promijenite"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "Grupni ID"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s je primarna grupa za korisnika %s\n"
+" Prvo uklonite korisnika"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "Članovi grupe"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/Dodaj _grupu"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Naziv grupe"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Ne možete ukloniti korisnika '%s' iz njegove primarne grupe"
 
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr "Dodaj korisnika"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Alat za menadžement korisnika na Mandrake Linuxu"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "Dodaj korisnika na sistem"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "Grupa već postoji, izaberite drugi naziv grupe"
 
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "Dodaj grupu"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Ne preporučuje se kreiranje korisnika sa UID-om ispod 500.\n"
+" Da li ste sigurni da želite uraditi ovo?\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Autori: "
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "Dodaj grupu na sistem"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Izmijeni"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "Izmijeni izabrani red"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Izbriši"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Izbriši izabrani red"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Osvježi"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Osvježi listu"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "Isteklo"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "Zaključano"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "Kliknite na ikonu da je promijenite"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Napravi novog korisnika"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "Napravi početni direktorij"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Grupe"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Početni direktorij: "
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Primarna grupa"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Napravi privatnu grupu za korisnika"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "Korisnički Uid je < 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "Ručno definišite korisnički ID"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "Zaključaj korisnički račun"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "Korisnik već postoji na sistemu. Izaberite drugo korisničko ime"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
+"Brišem korisnika %s\n"
+" Također slijedeće akcije će biti poduzete\n"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "Dana prije nego je dozvoljena promjena:"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Početni direktorij"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "Šifre nisu jednake"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"Ova šifra je previše jednostavna.\n"
-" Dobre šifre trebaju biti veće od 6 karaktera"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Korisnik već postoji na sistemu. Izaberite drugo korisničko ime"
 
-#: ../userdrake_.c:265
-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 ""
-"Ne preporučuje se kreiranje korisnika sa UID-om ispod 500.\n"
-" Da li ste sigurni da želite uraditi ovo?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
+msgstr "Dodaj korisnika"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "Korisnički Uid je < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "Račun ističe (DD-MM-YYYY):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "Izaberite grupu"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_Akcije"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "Dodaj u grupu 'users'"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Dodaj u postojeću grupu"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "Ručno definišite korisnički ID"
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "Grupa sa ovim nazivom već postoji. Šta želite uraditi?"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/_Datoteka"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Da"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "Ime je predugačko"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "Ne"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Zatvori"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Korisničko ime"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Početni direktorij: "
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/_Osvježi"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_Edituj"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "Ručno definiši ID grupe"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "Grupa već postoji, izaberite drugi naziv grupe"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "Polje za ime je prazno. Unesite ime"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr " Grupni Gid je < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Korisničko ime"
 
-#: ../userdrake_.c:385
-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 ""
-"Ne preporučuje se kreiranje grupe sa GID-om manjim od 500.\n"
-" Da li ste sigurni da želite ovo uraditi?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/_Kraj"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "Grupa sa ovim nazivom već postoji. Šta želite uraditi?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr "Upozorenje: Brišem korisnika"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Izbriši"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"Brišem korisnika %s\n"
-" Također slijedeće akcije će biti poduzete\n"
+"Definišite dan, mjesec i godinu\n"
+"kada će račun isteći"
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Izbriši početni direktorij: %s"
+msgid "User Data"
+msgstr "Podaci korisnika"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "Izbriši mailbox :/var/spool/mail/%s"
+msgid "Refresh"
+msgstr "Osvježi"
+
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Ime i prezime"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "Upozorenje: Brišem grupu"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "Da li zaista želite izbrisatti grupu %s\n"
+msgid " Group Gid is < 500"
+msgstr " Grupni Gid je < 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s je primarna grupa za korisnika %s\n"
-" Prvo uklonite korisnika"
+msgid "Edit selected row"
+msgstr "Izmijeni izabrani red"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Korisničko ime"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Naziv grupe"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Status"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Šifra"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Ponovo šifra:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "Uključi istek šifre"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Početni direktorij"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "Izaberite korisnike koji će se pridružiti grupi"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Podaci korisnika"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Korisnici"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "Uključi istek računa"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "Dana prije nego račun bude isključen:"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "Račun ističe (DD-MM-YYYY):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "Grupni ID"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "Zaključaj korisnički račun"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "Ne"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Podaci o računu"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_O programu..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "Korisnik je zadnji put promijeni šifru:"
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Opcije"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "Uključi istek šifre"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "Korisnički ID"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "Dana prije nego je dozvoljena promjena:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "Uključi istek računa"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "Dana prije nego je promjena zahtjevana:"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "Izbriši mailbox :/var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "Dana upozorenja prije promjene:"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Osvježi listu"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "Dana prije nego račun bude isključen:"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_Pomoć"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Podaci o šifri"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Izbriši početni direktorij: %s"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Menadžment korisnika \n"
+
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Izaberite grupe čiji će član korisnik biti"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "Podaci o grupi"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "Izaberite korisnike koji će se pridružiti grupi"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "Zaključano"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Korisnici grupe"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "Dodaj grupu"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "Izaberite bar jednu grupu za korisnika"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Definišite dan, mjesec i godinu\n"
-"kada će račun isteći"
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "Korisnik je zadnji put promijeni šifru:"
 
-#: ../userdrake_.c:753
-#, fuzzy
-msgid "Please fill up all fields in password aging\n"
-msgstr "Definišite sva polja sa starenje šifre\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Prijavi grešku"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Ne možete ukloniti korisnika '%s' iz njegove primarne grupe"
+msgid "Yes"
+msgstr "Da"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Zatvori"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Podaci o grupi"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Autori: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Ponovo šifra:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Menadžment korisnika \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/Dodaj _korisnika"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Autorska prava (C) 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Filtriraj korisnike sistema"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "Polje za ime je prazno. Unesite ime"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "Podaci o šifri"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "Ime mora sadržavati samo mala latinična slova, brojeve '-' i '_'"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Pretraga:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "Ime je predugačko"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Dodaj u postojeću grupu"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Greška"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "Izaberite grupu"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "Primijeni filter"
 
 #~ msgid "Help"
 #~ msgstr "Pomoć"
diff --git a/po/ca.po b/po/ca.po
index 6b639d4..bd7a9eb 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+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,469 +16,539 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr ""
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/_Actions"
-msgstr "Accions"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright � 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-#, fuzzy
-msgid "/_Edit"
-msgstr "Edita"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Users"
+msgstr "Grups"
 
-#: ../userdrake_.c:67
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "/_Delete"
 msgstr "Esborrar"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
+#: ../userdrake:1
+#, c-format
+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:68 ../userdrake_.c:80
-#, fuzzy
-msgid "/_Options"
-msgstr "Accions"
-
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-#, fuzzy
-msgid "/_File"
-msgstr "Fitxer"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Login Shell"
+msgstr "Login"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Edita"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:76
-#, fuzzy
-msgid "/_Add User"
-msgstr "Afegir usuari"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/Add _Group"
-msgstr "Afegir grup"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-#, fuzzy
-msgid "/_Help"
-msgstr "Ajuda"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Members"
+msgstr "Grups"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:88
-#, fuzzy
-msgid "/_About..."
-msgstr "Sobre"
-
-#: ../userdrake_.c:103
-msgid "Apply filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Usuaris"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Create Home Directory"
+msgstr "Directori home d�usuari"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Grups"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr ""
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Home Directory"
 msgstr "Directori home d�usuari"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-#, fuzzy
-msgid "Login Shell"
-msgstr "Login"
-
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "Status"
-msgstr "Inicia tls"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User ID"
-msgstr "Usuari"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User Name"
-msgstr "Userdrake"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group ID"
-msgstr "Grup"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr ""
 
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group Members"
-msgstr "Grups"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-#, fuzzy
-msgid "Group Name"
-msgstr "Grup"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-#, fuzzy
-msgid "Add User"
-msgstr "Afegir usuari"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr ""
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add Group"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/Add _Group"
 msgstr "Afegir grup"
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add a group to the system"
-msgstr "Afegir un grup"
-
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Edita"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr ""
 
-#: ../userdrake_.c:137
-msgid "Edit selected row"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Esborrar"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete selected row"
+#: ../userdrake:1
+#, c-format
+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:139
-msgid "Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:139
-#, fuzzy
-msgid "Refresh the list"
-msgstr "Llista de usuaris"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add a group to the system"
+msgstr "Afegir un grup"
 
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:168
-msgid "Locked"
+#: ../userdrake:1
+#, c-format
+msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Grups"
 
-#: ../userdrake_.c:225 ../userdrake_.c:364
-msgid "Create New User"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:232
-#, fuzzy
-msgid "Create Home Directory"
-msgstr "Directori home d�usuari"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr ""
 
-#: ../userdrake_.c:234
-#, fuzzy
-msgid "Home Directory: "
-msgstr "Directori home d�usuari"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr ""
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:251
-#, fuzzy
-msgid "User already exists, please choose another User Name"
-msgstr "Aquest nom ja existeix dins el sistema"
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Home"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Password Mismatch"
 msgstr "Contrasenya"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Aquest nom ja existeix dins el sistema"
 
-#: ../userdrake_.c:265
-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:1
+#, fuzzy, c-format
+msgid "Add User"
+msgstr "Afegir usuari"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Actions"
+msgstr "Accions"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_File"
+msgstr "Fitxer"
+
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:355
-msgid "Yes"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Close"
+msgstr "Buida"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User Name"
+msgstr "Userdrake"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Home Directory: "
+msgstr "Directori home d�usuari"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:359
-msgid "No"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Edit"
+msgstr "Edita"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Login"
 
-#: ../userdrake_.c:385
-msgid ""
-"Creating a group with a GID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:400
-msgid "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Esborrar"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, fuzzy, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Directori home d�usuari"
+msgid "User Data"
+msgstr "Llista d'usuaris"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
+msgid "Refresh"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
+msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
+msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Login"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Name"
+msgstr "Grup"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Status"
+msgstr "Inicia tls"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Contrasenya"
 
-#: ../userdrake_.c:553
-#, fuzzy
-msgid "Confirm Password:"
-msgstr "Contrasenya:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr ""
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Home"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr ""
 
-#: ../userdrake_.c:593
-#, fuzzy
-msgid "User Data"
-msgstr "Llista d'usuaris"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Usuaris"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group ID"
+msgstr "Grup"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
+#: ../userdrake:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_About..."
+msgstr "Sobre"
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Options"
+msgstr "Accions"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User ID"
+msgstr "Usuari"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Refresh the list"
+msgstr "Llista de usuaris"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Help"
+msgstr "Ajuda"
 
-#: ../userdrake_.c:622
-#, fuzzy
-msgid "Password Info"
-msgstr "Contrasenya"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Directori home d�usuari"
 
-#: ../userdrake_.c:626
-msgid "Select the groups that the user will be a member of:"
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:671
-#, fuzzy
-msgid "Group Data"
-msgstr "Llista de grups"
+#: ../userdrake:1
+#, c-format
+msgid "Select the groups that the user will be a member of:"
+msgstr ""
 
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:675
-#, fuzzy
-msgid "Group Users"
-msgstr "Grups"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add Group"
+msgstr "Afegir grup"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
+msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:900
-#, fuzzy
-msgid "Close"
-msgstr "Buida"
-
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Data"
+msgstr "Llista de grups"
 
-#: ../userdrake_.c:912
-msgid "Authors: "
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Confirm Password:"
+msgstr "Contrasenya:"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright � 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Add User"
+msgstr "Afegir usuari"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Password Info"
+msgstr "Contrasenya"
+
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Cerca:"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:931
-msgid "Error"
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
 msgstr ""
 
 #~ msgid "Help"
diff --git a/po/cs.po b/po/cs.po
index 5cea071..99941cf 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-cs\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-08-19 14:04GMT+0100\n"
 "Last-Translator: Radek Vybíral <Radek.Vybiral@vsb.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -19,453 +19,554 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Nástroj Mandrake Linux pro správu uživatelů"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_Akce"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright ©2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/Ú_pravy"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Seskupit uživatele"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/O_dstranit"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Filtrovat systémové uživatele"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/V_olby"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Vytváření skupin s GID menším než 500 se nedoporučuje.\n"
+"Jste si jisti, že to chcete udělat?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_Soubor"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Přihlašovací shell"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/O_bnovit"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Vytvořit pro uživatele samostatnou skupinu"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/_Konec"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Změnit"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "Přidat uživatele do systému"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/Přid_at uživatele"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Informace o účtu"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/Přidat s_kupinu"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "Varování: Odstraňuje se uživatel"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/Nápo_věda"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Chyba"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_Nahlásit chybu"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "Členové skupiny"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/O _aplikaci..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "Varovat dní před změnou:"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "Použít filtr"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Odstranit vybraný řádek"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Uživatelé"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "Vytvořit domovský adresář"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Skupiny"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Celé jméno"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr "Jméno musí obsahovat pouze malá písmena, číslice a znaky '-' a '_'"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Domovský adresář"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Přihlašovací shell"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"Toto heslo je příliš jednoduché.\n"
+" Správná hesla by měla být delší než 6 znaků"
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Primární skupina"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "Počet dní před vyžadováním změny:"
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Stav"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "Opravdu chcete odstranit skupinu %s\n"
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "ID uživatele"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Pro vypršení hesla vyplňte prosím všechna pole\n"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Jméno uživatele"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "Klepnutím na ikonu provedete změnu"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "ID skupiny"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s je primární skupina pro uživatele %s\n"
+"Odstraňte nejprve tohoto uživatele"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "Členové skupiny"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/Přidat s_kupinu"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Název skupiny"
+#: ../userdrake:1
+#, 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:135
-msgid "Add User"
-msgstr "Přidat uživatele"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Nástroj Mandrake Linux pro správu uživatelů"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "Přidat uživatele do systému"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "Skupina již existuje, vyberte prosím jiný název skupiny"
 
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "Přidat skupinu"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Vytváření uživatelů s UID menším než 500 se nedoporučuje.\n"
+"Jste si jisti, že to chcete udělat?\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Autoři:"
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "Přidat skupinu do systému"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Změnit"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "Upravit vybraný řádek"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Odstranit"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Odstranit vybraný řádek"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Obnovit"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Obnovit seznam"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "Vypršel"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "Zamkmutý"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "Klepnutím na ikonu provedete změnu"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Vytvořit nového uživatele"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "Vytvořit domovský adresář"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Skupiny"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Domovský adresář: "
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Primární skupina"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Vytvořit pro uživatele samostatnou skupinu"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "ID uživatele je menší než 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "Zadat ID uživatele ručně"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "Zamknout účet uživatele"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "Uživatel již existuje, vyberte prosím jiné uživatelské jméno"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
+"Odstraňuji uživatele %s\n"
+" Provádějí se také následující akce\n"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "Počet dní před povolením změny:"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Domovský adresář"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "Hesla se neshodují"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"Toto heslo je příliš jednoduché.\n"
-" Správná hesla by měla být delší než 6 znaků"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Uživatel již existuje, vyberte prosím jiné uživatelské jméno"
 
-#: ../userdrake_.c:265
-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 ""
-"Vytváření uživatelů s UID menším než 500 se nedoporučuje.\n"
-"Jste si jisti, že to chcete udělat?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
+msgstr "Přidat uživatele"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "ID uživatele je menší než 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "Účet vyprší   (RRRR-MM-DD):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "Vybrat skupinu"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_Akce"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "Přidat ke skupině 'users'"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Přidat k existující skupině"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "Zadat ID uživatele ručně"
 
-#: ../userdrake_.c:334
-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:1
+#, c-format
+msgid "/_File"
+msgstr "/_Soubor"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Ano"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "Jméno je příliš dlouhé"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "Ne"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Zavřít"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Jméno uživatele"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Domovský adresář: "
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/O_bnovit"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/Ú_pravy"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "Zadat ID skupiny ručně"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "Skupina již existuje, vyberte prosím jiný název skupiny"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "Pole se jménem je prázdné, zadejte prosím jméno"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr "GID skupiny je menší než 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Přihlášení"
 
-#: ../userdrake_.c:385
-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 ""
-"Vytváření skupin s GID menším než 500 se nedoporučuje.\n"
-"Jste si jisti, že to chcete udělat?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/_Konec"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "Skupina s tímto názvem již existuje. Co chcete udělat?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr "Varování: Odstraňuje se uživatel"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Odstranit"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"Odstraňuji uživatele %s\n"
-" Provádějí se také následující akce\n"
+"Zadejte prosím Rok, Měsíc a Den\n"
+"vypršení účtu"
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Smazání domovského adresáře: %s"
+msgid "User Data"
+msgstr "Data uživatele"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "Smazání poštovní schránky: /var/spool/mail/%s"
+msgid "Refresh"
+msgstr "Obnovit"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Celé jméno"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "Varování: Odstraňuje se skupina"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "Opravdu chcete odstranit skupinu %s\n"
+msgid " Group Gid is < 500"
+msgstr "GID skupiny je menší než 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s je primární skupina pro uživatele %s\n"
-"Odstraňte nejprve tohoto uživatele"
+msgid "Edit selected row"
+msgstr "Upravit vybraný řádek"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Přihlášení"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Název skupiny"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Stav"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Heslo"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Potvrdit heslo:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "Povolit vypršení hesla"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Domovský adresář"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "Vyberte uživatele, kteří se mají připojit k této skupině:"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Data uživatele"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Uživatelé"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "Povolit vypršení účtu"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "Počet dní před vypršením účtu:"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "Účet vyprší   (RRRR-MM-DD):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "ID skupiny"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "Zamknout účet uživatele"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "Ne"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Informace o účtu"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/O _aplikaci..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "Uživatel naposledy změnil heslo dne: "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/V_olby"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "Povolit vypršení hesla"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "ID uživatele"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "Počet dní před povolením změny:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "Povolit vypršení účtu"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "Počet dní před vyžadováním změny:"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "Smazání poštovní schránky: /var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "Varovat dní před změnou:"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Obnovit seznam"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "Počet dní před vypršením účtu:"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/Nápo_věda"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Informace o heslu"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Smazání domovského adresáře: %s"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Správa uživatelů\n"
+
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Vyberte skupiny, do kterých má uživatel patřit:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "Data skupiny"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "Vyberte uživatele, kteří se mají připojit k této skupině:"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "Zamkmutý"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Seskupit uživatele"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "Přidat skupinu"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "Vyberte prosím pro uživatele alespoň jednu skupinu"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Zadejte prosím Rok, Měsíc a Den\n"
-"vypršení účtu"
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "Uživatel naposledy změnil heslo dne: "
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
-msgstr "Pro vypršení hesla vyplňte prosím všechna pole\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Nahlásit chybu"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Nelze odstranit uživatele '%s' z jeho primární skupiny"
+msgid "Yes"
+msgstr "Ano"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Zavřít"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Data skupiny"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Autoři:"
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Potvrdit heslo:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Správa uživatelů\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/Přid_at uživatele"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright ©2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Filtrovat systémové uživatele"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "Pole se jménem je prázdné, zadejte prosím jméno"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "Informace o heslu"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "Jméno musí obsahovat pouze malá písmena, číslice a znaky '-' a '_'"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Hledat:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "Jméno je příliš dlouhé"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Přidat k existující skupině"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Chyba"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "Vybrat skupinu"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "Použít filtr"
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "Obecná nápověda k aplikaci UserDrake"
diff --git a/po/cy.po b/po/cy.po
index 8f7a51c..9739da1 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+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,469 +16,539 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr ""
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/_Actions"
-msgstr "Gweithredoedd"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Hawlfraint © 2003 MandrakeSoft."
 
-#: ../userdrake_.c:66
-#, fuzzy
-msgid "/_Edit"
-msgstr "Golygu"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Users"
+msgstr "Grwpiau"
 
-#: ../userdrake_.c:67
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "/_Delete"
 msgstr "Dileu"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
+#: ../userdrake:1
+#, c-format
+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:68 ../userdrake_.c:80
-#, fuzzy
-msgid "/_Options"
-msgstr "Gweithredoedd"
-
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-#, fuzzy
-msgid "/_File"
-msgstr "Ffeil"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Login Shell"
+msgstr "Mewngofnod"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Golygu"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:76
-#, fuzzy
-msgid "/_Add User"
-msgstr "Ychwanegu defnyddiwr"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/Add _Group"
-msgstr "Ychwanegu grwp"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-#, fuzzy
-msgid "/_Help"
-msgstr "Cymorth"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Members"
+msgstr "Grwpiau"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:88
-#, fuzzy
-msgid "/_About..."
-msgstr "Ynghylch"
-
-#: ../userdrake_.c:103
-msgid "Apply filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Defnyddwyr"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Create Home Directory"
+msgstr "Cyfeiriadur cartref defnyddiwr"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Grwpiau"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr ""
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Home Directory"
 msgstr "Cyfeiriadur cartref defnyddiwr"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-#, fuzzy
-msgid "Login Shell"
-msgstr "Mewngofnod"
-
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "Status"
-msgstr "Cychwyn tls"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User ID"
-msgstr "Defnyddiwr"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User Name"
-msgstr "Userdrake"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group ID"
-msgstr "Grwp"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group Members"
-msgstr "Grwpiau"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr ""
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-#, fuzzy
-msgid "Group Name"
-msgstr "Grwp"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-#, fuzzy
-msgid "Add User"
-msgstr "Ychwanegu defnyddiwr"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
 msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add Group"
-msgstr "Ychwanegu grwp"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add a group to the system"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/Add _Group"
 msgstr "Ychwanegu grwp"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Golygu"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr ""
 
-#: ../userdrake_.c:137
-msgid "Edit selected row"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Dileu"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete selected row"
+#: ../userdrake:1
+#, c-format
+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:139
-msgid "Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:139
-#, fuzzy
-msgid "Refresh the list"
-msgstr "Rhestr defnyddwyr"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add a group to the system"
+msgstr "Ychwanegu grwp"
 
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:168
-msgid "Locked"
+#: ../userdrake:1
+#, c-format
+msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Grwpiau"
 
-#: ../userdrake_.c:225 ../userdrake_.c:364
-msgid "Create New User"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:232
-#, fuzzy
-msgid "Create Home Directory"
-msgstr "Cyfeiriadur cartref defnyddiwr"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr ""
 
-#: ../userdrake_.c:234
-#, fuzzy
-msgid "Home Directory: "
-msgstr "Cyfeiriadur cartref defnyddiwr"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr ""
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:251
-#, fuzzy
-msgid "User already exists, please choose another User Name"
-msgstr "Mae'r enw hwn yn bodoli ar y system"
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Cartref"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Password Mismatch"
 msgstr "Cyfrinair"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Mae'r enw hwn yn bodoli ar y system"
 
-#: ../userdrake_.c:265
-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:1
+#, fuzzy, c-format
+msgid "Add User"
+msgstr "Ychwanegu defnyddiwr"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Actions"
+msgstr "Gweithredoedd"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_File"
+msgstr "Ffeil"
+
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:355
-msgid "Yes"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Close"
+msgstr "Cirio"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User Name"
+msgstr "Userdrake"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Home Directory: "
+msgstr "Cyfeiriadur cartref defnyddiwr"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:359
-msgid "No"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Edit"
+msgstr "Golygu"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Mewngofnod"
 
-#: ../userdrake_.c:385
-msgid ""
-"Creating a group with a GID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:400
-msgid "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Dileu"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, fuzzy, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Cyfeiriadur cartref defnyddiwr"
+msgid "User Data"
+msgstr "Rhestr defnyddwyr"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
+msgid "Refresh"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
+msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
+msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Mewngofnod"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Name"
+msgstr "Grwp"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Status"
+msgstr "Cychwyn tls"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Cyfrinair"
 
-#: ../userdrake_.c:553
-#, fuzzy
-msgid "Confirm Password:"
-msgstr "Cyfrinair:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr ""
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Cartref"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr ""
 
-#: ../userdrake_.c:593
-#, fuzzy
-msgid "User Data"
-msgstr "Rhestr defnyddwyr"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Defnyddwyr"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group ID"
+msgstr "Grwp"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
+#: ../userdrake:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_About..."
+msgstr "Ynghylch"
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Options"
+msgstr "Gweithredoedd"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User ID"
+msgstr "Defnyddiwr"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Refresh the list"
+msgstr "Rhestr defnyddwyr"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Help"
+msgstr "Cymorth"
 
-#: ../userdrake_.c:622
-#, fuzzy
-msgid "Password Info"
-msgstr "Cyfrinair"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Cyfeiriadur cartref defnyddiwr"
 
-#: ../userdrake_.c:626
-msgid "Select the groups that the user will be a member of:"
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:671
-#, fuzzy
-msgid "Group Data"
-msgstr "Rhestr grwpiau"
+#: ../userdrake:1
+#, c-format
+msgid "Select the groups that the user will be a member of:"
+msgstr ""
 
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:675
-#, fuzzy
-msgid "Group Users"
-msgstr "Grwpiau"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add Group"
+msgstr "Ychwanegu grwp"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
+msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:900
-#, fuzzy
-msgid "Close"
-msgstr "Cirio"
-
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Data"
+msgstr "Rhestr grwpiau"
 
-#: ../userdrake_.c:912
-msgid "Authors: "
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Confirm Password:"
+msgstr "Cyfrinair:"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Hawlfraint © 2003 MandrakeSoft."
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Add User"
+msgstr "Ychwanegu defnyddiwr"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Password Info"
+msgstr "Cyfrinair"
+
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Chwilio:"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:931
-msgid "Error"
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
 msgstr ""
 
 #~ msgid "Help"
diff --git a/po/da.po b/po/da.po
index 5d2825f..48104d3 100644
--- a/po/da.po
+++ b/po/da.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-08-18 19:55+0200\n"
 "Last-Translator: Keld Simonsen <keld@rap.dk>\n"
 "Language-Team:  <da@li.org>\n"
@@ -24,453 +24,554 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Mandrake Linux' v�rkt�j til brugeradministration"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_Handlinger"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright � 2003 MandrakeSoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_Redig�r"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Gruppebrugere"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_Slet"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Filtr�r systembrugere"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_Valgmuligheder"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Oprettelse af en gruppe med en GID under 500 er ikke anbefalet.\n"
+" Er du sikker p� at du  �nsker at g�re dette?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_Filer"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Login sk�l"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/_Genopfrisk"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Opret en privat gruppe for brugeren"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/_Afslut"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Redig�r"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "Tilf�j en bruger til systemet"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/Tilf�j _bruger"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Konto-information"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/Tilf�j _gruppe"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "Advarsel: Sletter bruger"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/_Hj�lp"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Fejl"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_Rapport�r fejl"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "Gruppemedlemmer"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_Om..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "Advarsel gives antal dage f�r �ndring: "
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "Udf�r filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Slet valgte r�kke"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Brugere"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "Opret hjemmekatalog"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Grupper"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Fulde navn"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr "Navnet m� kun indeholde sm� bogstaver, cifre ,'-' og '_'"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Hjemmekatalog"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Login sk�l"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"Denne adgangskode er for simpel. \n"
+" Gode adgangskoder b�r v�re p� 7 tegn eller mere"
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Prim�r gruppe"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "Dage f�r �ndring er kr�vet: "
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Status"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "Vil du virkelig slette gruppen %s\n"
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "Bruger-id"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Angiv venligst alle felter for for�ldelse af adgangskoder\n"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Brugernavn"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "Klik p� ikonen for at �ndre den"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "Gruppe-id"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s er en prim�r gruppe for bruger %s\n"
+" Fjern brugeren f�rst"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "Gruppemedlemmer"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/Tilf�j _gruppe"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Gruppenavn"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Du kan ikke fjerne bruger '%s' fra deres prim�re gruppe"
 
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr "Tilf�j bruger"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Mandrake Linux' v�rkt�j til brugeradministration"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "Tilf�j en bruger til systemet"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "Gruppe eksisterer allerede, v�lg venligst et andet gruppenavn"
 
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "Tilf�j gruppe"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Oprettelse af en bruger med en UID under 500 er ikke anbefalet.\n"
+"Er du sikker p� at du vil g�re dette?\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Forfattere: "
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "Tilf�j en gruppe til systemet"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Redig�r"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "Redig�r valgte r�kke"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Slet"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Slet valgte r�kke"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Genopfrisk"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Genopfrisk listen"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "Udl�bet"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "L�st"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "Klik p� ikonen for at �ndre den"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Opret ny bruger"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "Opret hjemmekatalog"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Grupper"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Hjemmekatalog;: "
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Prim�r gruppe"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Opret en privat gruppe for brugeren"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "Brugernes UID er mindre end 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "Angiv bruger-id manuelt"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "L�s brugerkonto"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "Brugeren findes allerede, v�lg venligst et andet brugernavn"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
+"Sletter bruger %s\n"
+" Udf�r ogs� de f�lgende de f�lgende handlinger\n"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "Dage f�r �ndring er tilladt: "
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Hjem"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "Adgangskode passer ikke"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"Denne adgangskode er for simpel. \n"
-" Gode adgangskoder b�r v�re p� 7 tegn eller mere"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Brugeren findes allerede, v�lg venligst et andet brugernavn"
 
-#: ../userdrake_.c:265
-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 ""
-"Oprettelse af en bruger med en UID under 500 er ikke anbefalet.\n"
-"Er du sikker p� at du vil g�re dette?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
+msgstr "Tilf�j bruger"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "Brugernes UID er mindre end 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "Kontoen udl�ber (����-MM-DD):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "V�lg gruppe"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_Handlinger"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "Tilf�j til 'users'-gruppen"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Tilf�j til eksisterende gruppe"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "Angiv bruger-id manuelt"
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "En gruppe med dette navn eksisterer allerede, Hvad �nsker du at g�re?"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/_Filer"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Ja"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "Navnet er for langt"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "Nej"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Luk"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Brugernavn"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Hjemmekatalog;: "
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/_Genopfrisk"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_Redig�r"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "Angiv gruppe-id manuelt"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "Gruppe eksisterer allerede, v�lg venligst et andet gruppenavn"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "Navnefelt er tomt, opgiv venligst et navn"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr "Gruppe-GID er mindre end 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Login"
 
-#: ../userdrake_.c:385
-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 ""
-"Oprettelse af en gruppe med en GID under 500 er ikke anbefalet.\n"
-" Er du sikker p� at du  �nsker at g�re dette?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/_Afslut"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "En gruppe med dette navn eksisterer allerede, Hvad �nsker du at g�re?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr "Advarsel: Sletter bruger"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Slet"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"Sletter bruger %s\n"
-" Udf�r ogs� de f�lgende de f�lgende handlinger\n"
+"Angiv venligst �r, m�ned og dag\n"
+" for udl�b af konto "
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Slet hjemmekatalog: %s "
+msgid "User Data"
+msgstr "Brugerdata"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "Slet postbakke :/var/spool/mail/%s"
+msgid "Refresh"
+msgstr "Genopfrisk"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Fulde navn"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "Advarsel: Sletter gruppe"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "Vil du virkelig slette gruppen %s\n"
+msgid " Group Gid is < 500"
+msgstr "Gruppe-GID er mindre end 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s er en prim�r gruppe for bruger %s\n"
-" Fjern brugeren f�rst"
+msgid "Edit selected row"
+msgstr "Redig�r valgte r�kke"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Login"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Gruppenavn"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Status"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Adgangskode"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Bekr�ft adgangskode:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "Aktiv�r udl�btid for adgangskoder"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Hjem"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "V�lg de brugere som skal tilf�jes i denne gruppe"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Brugerdata"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Brugere"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "Aktiv�r udl�b for konti"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "Dage f�r konto deaktiveres: "
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "Kontoen udl�ber (����-MM-DD):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "Gruppe-id"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "L�s brugerkonto"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "Nej"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Konto-information"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_Om..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "Bruger �ndrede sidst adgangskode den: "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Valgmuligheder"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "Aktiv�r udl�btid for adgangskoder"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "Bruger-id"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "Dage f�r �ndring er tilladt: "
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "Aktiv�r udl�b for konti"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "Dage f�r �ndring er kr�vet: "
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "Slet postbakke :/var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "Advarsel gives antal dage f�r �ndring: "
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Genopfrisk listen"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "Dage f�r konto deaktiveres: "
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_Hj�lp"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Info om adgangskode"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Slet hjemmekatalog: %s "
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Administration af brugere \n"
+
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "V�lg grupperne som brugeren vil v�re medlem af:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "Gruppedata"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "V�lg de brugere som skal tilf�jes i denne gruppe"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "L�st"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Gruppebrugere"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "Tilf�j gruppe"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "V�lg venligst mindst en gruppe for brugeren"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Angiv venligst �r, m�ned og dag\n"
-" for udl�b af konto "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "Bruger �ndrede sidst adgangskode den: "
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
-msgstr "Angiv venligst alle felter for for�ldelse af adgangskoder\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Rapport�r fejl"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Du kan ikke fjerne bruger '%s' fra deres prim�re gruppe"
+msgid "Yes"
+msgstr "Ja"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Luk"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Gruppedata"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Forfattere: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Bekr�ft adgangskode:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Administration af brugere \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/Tilf�j _bruger"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright � 2003 MandrakeSoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Filtr�r systembrugere"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "Navnefelt er tomt, opgiv venligst et navn"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "Info om adgangskode"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "Navnet m� kun indeholde sm� bogstaver, cifre ,'-' og '_'"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "S�g:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "Navnet er for langt"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Tilf�j til eksisterende gruppe"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Fejl"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "V�lg gruppe"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "Udf�r filter"
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "Generel hj�lp om Userdrake"
diff --git a/po/de.po b/po/de.po
index cd36945..03549c2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+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,470 +20,539 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr ""
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/_Actions"
-msgstr "Bearbeiten"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Urheberrecht © 2003 MandrakeSoft."
 
-#: ../userdrake_.c:66
-#, fuzzy
-msgid "/_Edit"
-msgstr "Ändern"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Users"
+msgstr "Gruppe(n)"
 
-#: ../userdrake_.c:67
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "/_Delete"
 msgstr "Löschen"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
+#: ../userdrake:1
+#, c-format
+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:68 ../userdrake_.c:80
-#, fuzzy
-msgid "/_Options"
-msgstr "Bearbeiten"
-
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-#, fuzzy
-msgid "/_File"
-msgstr "Datei"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Login Shell"
+msgstr "Benutzername"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Ändern"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:76
-#, fuzzy
-msgid "/_Add User"
-msgstr "Benutzer hinzufügen"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/Add _Group"
-msgstr "Gruppe hinzufügen"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-#, fuzzy
-msgid "/_Help"
-msgstr "Hilfe"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Members"
+msgstr "Gruppe(n)"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:88
-#, fuzzy
-msgid "/_About..."
-msgstr "Über"
-
-#: ../userdrake_.c:103
-msgid "Apply filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Benutzer"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Create Home Directory"
+msgstr "Homeverzeichnis"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Gruppe(n)"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr ""
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Home Directory"
 msgstr "Homeverzeichnis"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-#, fuzzy
-msgid "Login Shell"
-msgstr "Benutzername"
-
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "Status"
-msgstr "\"tls starten\""
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User ID"
-msgstr "Benutzer"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User Name"
-msgstr "UserDrake"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group ID"
-msgstr "Gruppe"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group Members"
-msgstr "Gruppe(n)"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr ""
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-#, fuzzy
-msgid "Group Name"
-msgstr "Gruppe"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-#, fuzzy
-msgid "Add User"
-msgstr "Benutzer hinzufügen"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
 msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add Group"
-msgstr "Gruppe hinzufügen"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add a group to the system"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/Add _Group"
 msgstr "Gruppe hinzufügen"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Ändern"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr ""
 
-#: ../userdrake_.c:137
-msgid "Edit selected row"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Löschen"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete selected row"
+#: ../userdrake:1
+#, c-format
+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:139
-msgid "Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:139
-#, fuzzy
-msgid "Refresh the list"
-msgstr "Benutzerliste"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add a group to the system"
+msgstr "Gruppe hinzufügen"
 
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:168
-msgid "Locked"
+#: ../userdrake:1
+#, c-format
+msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Gruppe(n)"
 
-#: ../userdrake_.c:225 ../userdrake_.c:364
-msgid "Create New User"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:232
-#, fuzzy
-msgid "Create Home Directory"
-msgstr "Homeverzeichnis"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr ""
 
-#: ../userdrake_.c:234
-#, fuzzy
-msgid "Home Directory: "
-msgstr "Homeverzeichnis"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr ""
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:251
-#, fuzzy
-msgid "User already exists, please choose another User Name"
-msgstr "Dieser Name existiert bereits im System."
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Homeverzeichnis"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Password Mismatch"
 msgstr "Passwort"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Dieser Name existiert bereits im System."
 
-#: ../userdrake_.c:265
-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:1
+#, fuzzy, c-format
+msgid "Add User"
+msgstr "Benutzer hinzufügen"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Actions"
+msgstr "Bearbeiten"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_File"
+msgstr "Datei"
+
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:355
-msgid "Yes"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Close"
+msgstr "Löschen"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User Name"
+msgstr "UserDrake"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Home Directory: "
+msgstr "Homeverzeichnis"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:359
-msgid "No"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Edit"
+msgstr "Ändern"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Benutzername"
 
-#: ../userdrake_.c:385
-msgid ""
-"Creating a group with a GID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:400
-msgid "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Löschen"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, fuzzy, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Homeverzeichnis"
+msgid "User Data"
+msgstr "Benutzerliste"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
+msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
+msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
+msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Benutzername"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Name"
+msgstr "Gruppe"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Status"
+msgstr "\"tls starten\""
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Passwort"
 
-#: ../userdrake_.c:553
-#, fuzzy
-msgid "Confirm Password:"
-msgstr "Passwort:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr ""
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Homeverzeichnis"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr ""
 
-#: ../userdrake_.c:593
-#, fuzzy
-msgid "User Data"
-msgstr "Benutzerliste"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Benutzer"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group ID"
+msgstr "Gruppe"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
+#: ../userdrake:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_About..."
+msgstr "Über"
 
-#: ../userdrake_.c:610
-#, fuzzy
-msgid "User last changed password on : "
-msgstr "Ich kann das Passwort nicht ändern."
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Options"
+msgstr "Bearbeiten"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User ID"
+msgstr "Benutzer"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Refresh the list"
+msgstr "Benutzerliste"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Help"
+msgstr "Hilfe"
 
-#: ../userdrake_.c:622
-#, fuzzy
-msgid "Password Info"
-msgstr "Passwort"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Homeverzeichnis"
 
-#: ../userdrake_.c:626
-msgid "Select the groups that the user will be a member of:"
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:671
-#, fuzzy
-msgid "Group Data"
-msgstr "Gruppenliste"
+#: ../userdrake:1
+#, c-format
+msgid "Select the groups that the user will be a member of:"
+msgstr ""
 
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:675
-#, fuzzy
-msgid "Group Users"
-msgstr "Gruppe(n)"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add Group"
+msgstr "Gruppe hinzufügen"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User last changed password on : "
+msgstr "Ich kann das Passwort nicht ändern."
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
+msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:900
-#, fuzzy
-msgid "Close"
-msgstr "Löschen"
-
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Data"
+msgstr "Gruppenliste"
 
-#: ../userdrake_.c:912
-msgid "Authors: "
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Confirm Password:"
+msgstr "Passwort:"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Urheberrecht © 2003 MandrakeSoft."
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Add User"
+msgstr "Benutzer hinzufügen"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Password Info"
+msgstr "Passwort"
+
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Suche:"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:931
-msgid "Error"
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
 msgstr ""
 
 #~ msgid "Help"
diff --git a/po/el.po b/po/el.po
index 3744585..0e0b133 100644
--- a/po/el.po
+++ b/po/el.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+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,469 +19,539 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr ""
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/_Actions"
-msgstr "���������"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright � 2003 MandrakeSoft SA"
 
-#: ../userdrake_.c:66
-#, fuzzy
-msgid "/_Edit"
-msgstr "�����������"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Users"
+msgstr "������"
 
-#: ../userdrake_.c:67
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "/_Delete"
 msgstr "��������"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
+#: ../userdrake:1
+#, c-format
+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:68 ../userdrake_.c:80
-#, fuzzy
-msgid "/_Options"
-msgstr "���������"
-
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-#, fuzzy
-msgid "/_File"
-msgstr "������"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Login Shell"
+msgstr "����������"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "�����������"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:76
-#, fuzzy
-msgid "/_Add User"
-msgstr "�������� ������"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/Add _Group"
-msgstr "�������� ������"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-#, fuzzy
-msgid "/_Help"
-msgstr "�������"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Members"
+msgstr "������"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:88
-#, fuzzy
-msgid "/_About..."
-msgstr "����"
-
-#: ../userdrake_.c:103
-msgid "Apply filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "�������"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Create Home Directory"
+msgstr "������� ������� ������"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "������"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr ""
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Home Directory"
 msgstr "������� ������� ������"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-#, fuzzy
-msgid "Login Shell"
-msgstr "����������"
-
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "Status"
-msgstr "�������� tls"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User ID"
-msgstr "�������"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User Name"
-msgstr "Userdrake"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group ID"
-msgstr "�����"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr ""
 
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group Members"
-msgstr "������"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-#, fuzzy
-msgid "Group Name"
-msgstr "�����"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-#, fuzzy
-msgid "Add User"
-msgstr "�������� ������"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr ""
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add Group"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/Add _Group"
 msgstr "�������� ������"
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add a group to the system"
-msgstr "�������� ���� ������"
-
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "�����������"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr ""
 
-#: ../userdrake_.c:137
-msgid "Edit selected row"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "��������"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete selected row"
+#: ../userdrake:1
+#, c-format
+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:139
-msgid "Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:139
-#, fuzzy
-msgid "Refresh the list"
-msgstr "����� �������"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add a group to the system"
+msgstr "�������� ���� ������"
 
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:168
-msgid "Locked"
+#: ../userdrake:1
+#, c-format
+msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "������"
 
-#: ../userdrake_.c:225 ../userdrake_.c:364
-msgid "Create New User"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:232
-#, fuzzy
-msgid "Create Home Directory"
-msgstr "������� ������� ������"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr ""
 
-#: ../userdrake_.c:234
-#, fuzzy
-msgid "Home Directory: "
-msgstr "������� ������� ������"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr ""
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:251
-#, fuzzy
-msgid "User already exists, please choose another User Name"
-msgstr "�� ����� ������� ��� ��� �������"
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "������� ���������"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Password Mismatch"
 msgstr "������� ���������"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "�� ����� ������� ��� ��� �������"
 
-#: ../userdrake_.c:265
-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:1
+#, fuzzy, c-format
+msgid "Add User"
+msgstr "�������� ������"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Actions"
+msgstr "���������"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_File"
+msgstr "������"
+
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:355
-msgid "Yes"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Close"
+msgstr "����������"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User Name"
+msgstr "Userdrake"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Home Directory: "
+msgstr "������� ������� ������"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:359
-msgid "No"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Edit"
+msgstr "�����������"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "����������"
 
-#: ../userdrake_.c:385
-msgid ""
-"Creating a group with a GID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:400
-msgid "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "��������"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, fuzzy, c-format
-msgid "Delete Home Directory :%s"
-msgstr "������� ������� ������"
+msgid "User Data"
+msgstr "����� �������"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
+msgid "Refresh"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
+msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
+msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "����������"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Name"
+msgstr "�����"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Status"
+msgstr "�������� tls"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "������� ���������"
 
-#: ../userdrake_.c:553
-#, fuzzy
-msgid "Confirm Password:"
-msgstr "������� ���������:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr ""
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "������� ���������"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr ""
 
-#: ../userdrake_.c:593
-#, fuzzy
-msgid "User Data"
-msgstr "����� �������"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "�������"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group ID"
+msgstr "�����"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
+#: ../userdrake:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_About..."
+msgstr "����"
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Options"
+msgstr "���������"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User ID"
+msgstr "�������"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Refresh the list"
+msgstr "����� �������"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Help"
+msgstr "�������"
 
-#: ../userdrake_.c:622
-#, fuzzy
-msgid "Password Info"
-msgstr "������� ���������"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Delete Home Directory :%s"
+msgstr "������� ������� ������"
 
-#: ../userdrake_.c:626
-msgid "Select the groups that the user will be a member of:"
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:671
-#, fuzzy
-msgid "Group Data"
-msgstr "����� ������"
+#: ../userdrake:1
+#, c-format
+msgid "Select the groups that the user will be a member of:"
+msgstr ""
 
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:675
-#, fuzzy
-msgid "Group Users"
-msgstr "������"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add Group"
+msgstr "�������� ������"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
+msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:900
-#, fuzzy
-msgid "Close"
-msgstr "����������"
-
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Data"
+msgstr "����� ������"
 
-#: ../userdrake_.c:912
-msgid "Authors: "
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Confirm Password:"
+msgstr "������� ���������:"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright � 2003 MandrakeSoft SA"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Add User"
+msgstr "�������� ������"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Password Info"
+msgstr "������� ���������"
+
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "���������:"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:931
-msgid "Error"
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
 msgstr ""
 
 #~ msgid "Help"
diff --git a/po/eo.po b/po/eo.po
index 213ea21..e806417 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-eo\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-07-26 16:27+0000\n"
 "Last-Translator: Vilhelmo Lutermano <vlutermano@free.fr>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -20,453 +20,552 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Mastrumilo por Mandrake Linux Uzuloj"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_Agoj"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Kopirajto (C) 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_Redaktu"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Grupo Uzuloj"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_Forigu"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Filtrilo uzuloj"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_Opcioj"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Krei grupon kun GID malpli ol 500 ne estas rekomendinda.\n"
+" Ĉu vi certas ke vi volas tion?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_Dosiero"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Salutnoma kampo"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/_Rekalkulu"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Kreu privatan grupon por la uzulo"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/_Finu"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Redaktu"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "Aldonu uzulon al la sistemo"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/_Aldonu uzulon"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Kont-informo"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/Aldonu _grupon"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/_Helpo"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Eraro"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_Raportu cimon"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "Grupanoj"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_Pri..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "Tagoj da avertado antaŭ ŝanĝo :"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Forigu selektitan linion"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Uzuloj"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Create Home Directory"
+msgstr "Kreu hejman dosierujon"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Grupoj"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Plena nomo"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr "La nomo devas havi nur minusklajn literojn, ciferojn,`-' kaj `_'"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Hejma dosierujo"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Salutnoma kampo"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"Tiu ĉi pasvorto estas tro simpla. \n"
+" Bonaj pasvortoj havu > 6 signojn"
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Primara grupo"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "Tagoj postulataj antaŭ ŝanĝo"
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Statuso"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "Uzula ID"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Bonvolu difini la tutan kampon por pasvort-aĝiĝo"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Uzul-nomo"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr ""
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "Grupa ID"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s estas primara grupo por uzulo %s\n"
+" Unue forigu la uzulon"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "Grupanoj"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/Aldonu _grupon"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Grupa nomo"
+#: ../userdrake:1
+#, 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:135
-msgid "Add User"
-msgstr "Aldonu uzulon"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Mastrumilo por Mandrake Linux Uzuloj"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "Aldonu uzulon al la sistemo"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "Grupo jam ekzistas, bonvolu elekti alian grupnomon"
 
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "Aldonu grupon"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Krei uzulon kun UID malpli ol 500 ne estas rekomendinda.\n"
+" Ĉu vi certas  ke vi volas tion?\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Aŭtoroj: "
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "Aldonu grupon al la sistemo"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Redaktu"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "Redaktu selektitan linion"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Forigu"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Forigu selektitan linion"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Rekalkulu"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Rekalkulu la liston"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "Eksvalida"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "Ŝlosita"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr ""
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Kreu novan uzulon"
 
-#: ../userdrake_.c:232
-#, fuzzy
-msgid "Create Home Directory"
-msgstr "Kreu hejman dosierujon"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Grupoj"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Hejma dosierujo"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Primara grupo"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Kreu privatan grupon por la uzulo"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "Uzula Uid estas < 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "Mane difinu uzul-ID"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "Ŝlosu la uzul-konton"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "Ĉi tiu nomo jam ekzistas, bonvolu elekti alian uzulnomon"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "Tagoj antaŭ ol ŝanĝo estas permesita :"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Hejmo"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "Pasvorta konfuzo"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"Tiu ĉi pasvorto estas tro simpla. \n"
-" Bonaj pasvortoj havu > 6 signojn"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Ĉi tiu nomo jam ekzistas, bonvolu elekti alian uzulnomon"
 
-#: ../userdrake_.c:265
-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 ""
-"Krei uzulon kun UID malpli ol 500 ne estas rekomendinda.\n"
-" Ĉu vi certas  ke vi volas tion?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
+msgstr "Aldonu uzulon"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "Uzula Uid estas < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "Konto eksvalidiĝos (YYYY-MM-DD) :"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "Elektu grupon"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_Agoj"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "Aldonu al la grupo 'uzuloj' ('users')"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Aldonu al la ekzistanta grupo"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "Mane difinu uzul-ID"
 
-#: ../userdrake_.c:334
-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:1
+#, c-format
+msgid "/_File"
+msgstr "/_Dosiero"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Jes"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "Nomo tro longas"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "Ne"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Fermu"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Uzul-nomo"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Hejma dosierujo"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/_Rekalkulu"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_Redaktu"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "Difinu grupan ID mane"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "Grupo jam ekzistas, bonvolu elekti alian grupnomon"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "Nomo-kampo malplenas, bonvolu enmeti nomon"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr "Gid de la grupo estas < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Salutnomo"
 
-#: ../userdrake_.c:385
-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 ""
-"Krei grupon kun GID malpli ol 500 ne estas rekomendinda.\n"
-" Ĉu vi certas ke vi volas tion?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/_Finu"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "Grupo kun tiu nomo jam ekzistas.  Kion vi ŝatus fari?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Forigu"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
+"Bonvolu difinu Jaron, Monaton kaj Tagon \n"
+" por kont-eksvalidiĝo "
 
-#: ../userdrake_.c:453
-#, fuzzy, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Kreu hejman dosierujon"
+#: ../userdrake:1
+#, c-format
+msgid "User Data"
+msgstr "Uzul-datumoj"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr ""
+msgid "Refresh"
+msgstr "Rekalkulu"
+
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Plena nomo"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr ""
+msgid " Group Gid is < 500"
+msgstr "Gid de la grupo estas < 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s estas primara grupo por uzulo %s\n"
-" Unue forigu la uzulon"
+msgid "Edit selected row"
+msgstr "Redaktu selektitan linion"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Salutnomo"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Grupa nomo"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Statuso"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Pasvorto"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Konfirmu pasvorton:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "Enŝaltu pasvort-eksvalidiĝon"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Hejmo"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "Selektu la uzulojn aniĝendajn al tiu grupo :"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Uzul-datumoj"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Uzuloj"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "Enŝaltu kont-eksvalidiĝon"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "Tagoj antaŭ malaktivigo de la konto :"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "Konto eksvalidiĝos (YYYY-MM-DD) :"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "Grupa ID"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "Ŝlosu la uzul-konton"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "Ne"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Kont-informo"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_Pri..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "Uzulo laste ŝanĝis pasvorton al : "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Opcioj"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "Enŝaltu pasvort-eksvalidiĝon"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "Uzula ID"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "Tagoj antaŭ ol ŝanĝo estas permesita :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "Enŝaltu kont-eksvalidiĝon"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "Tagoj postulataj antaŭ ŝanĝo"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr ""
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "Tagoj da avertado antaŭ ŝanĝo :"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Rekalkulu la liston"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "Tagoj antaŭ malaktivigo de la konto :"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_Helpo"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Pasvort-informo"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Kreu hejman dosierujon"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Uzul-mastrumado \n"
+
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Selektu la grupojn kies ano estu la uzulo:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "Grupo-datumoj"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "Selektu la uzulojn aniĝendajn al tiu grupo :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "Ŝlosita"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Grupo Uzuloj"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "Aldonu grupon"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "Bonvolu selekti almenaŭ unu grupon por la uzulo"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Bonvolu difinu Jaron, Monaton kaj Tagon \n"
-" por kont-eksvalidiĝo "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "Uzulo laste ŝanĝis pasvorton al : "
 
-#: ../userdrake_.c:753
-#, fuzzy
-msgid "Please fill up all fields in password aging\n"
-msgstr "Bonvolu difini la tutan kampon por pasvort-aĝiĝo"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Raportu cimon"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Vi ne povas forigi la uzulon '%s' de ties primara grupo"
+msgid "Yes"
+msgstr "Jes"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Fermu"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Grupo-datumoj"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Aŭtoroj: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Konfirmu pasvorton:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Uzul-mastrumado \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/_Aldonu uzulon"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Kopirajto (C) 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Filtrilo uzuloj"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "Nomo-kampo malplenas, bonvolu enmeti nomon"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "Pasvort-informo"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "La nomo devas havi nur minusklajn literojn, ciferojn,`-' kaj `_'"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Serĉu:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "Nomo tro longas"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Aldonu al la ekzistanta grupo"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Eraro"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "Elektu grupon"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr ""
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "Genera helpo pri userdrake"
diff --git a/po/es.po b/po/es.po
index 795cc60..03d052d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-07-30 08:10-0300\n"
 "Last-Translator: Fabian Mandelbaum <fabman@mandrakesoft.com>\n"
 "Language-Team: Espa�ol <es@li.org>\n"
@@ -21,456 +21,556 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.1\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Herramienta de administraci�n de usuarios de Mandrake Linux"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_Acciones"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright (C) 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_Editar"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Grupos de usuarios"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_Borrar"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Filtrar usuarios del sistema"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_Opciones"
+#: ../userdrake:1
+#, c-format
+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 ""
+"No se recomienda crear un grupo con GID menor a 500.\n"
+"�Est� seguro que desea hacer esto?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_Fichero"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Shell de login"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/_Refrescar"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Crear un grupo privado para el usuario"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/_Salir"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Editar"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>S"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "A�adir un usuario al sistema"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/_A�adir usuario"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Informaci�n de la cuenta"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/A�adir _Grupo"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "Advertencia: Borrando usuario"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/a_Yuda"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Error"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_Reportar bug"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "Miembros del grupo"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_Acerca de..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "D�as de advertencia antes del cambio :"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "Aplicar filtro"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Borrar fila seleccionada"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Usuarios"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "Crear directorio personal"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Grupos"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Nombre completo"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr "El nombre debe contener s�lo letras min�sculas, n�meros, `-' y `_'"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Directorio personal"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Shell de login"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"Esta contrase�a es demasiado simple. \n"
+" Las contrase�as buenas deber�an tener m�s de 6 caracteres"
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Grupo primario"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "D�as antes que se requiera el cambio :"
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Estado"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "�Realmente desea borrar el grupo %s?\n"
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "ID de usuario"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
+"Por favor, especifique todos los campos para la caducaci�n de la contrase�a\n"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Nombre de usuario"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "Haga clic sobre el icono para cambiarlo"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "ID de grupo"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s es un grupo primario para el usuario %s\n"
+"Quite primero al usuario"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "Miembros del grupo"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/A�adir _Grupo"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Nombre del grupo"
+#: ../userdrake:1
+#, 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:135
-msgid "Add User"
-msgstr "A�adir usuario"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Herramienta de administraci�n de usuarios de Mandrake Linux"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "A�adir un usuario al sistema"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "El grupo ya existe, por favor use otro nombre de grupo"
 
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "A�adir grupo"
+#: ../userdrake:1
+#, c-format
+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 ""
+"No se recomienda crear un usuario con UID menor a 500.\n"
+"�Est� seguro que desea hacer esto?\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Autores: "
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "A�adir un grupo al sistema"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Editar"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "Editar fila seleccionada"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Borrar"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Borrar fila seleccionada"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Refrescar"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Refrescar la lista"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "Expirado"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "Trabado"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "Haga clic sobre el icono para cambiarlo"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Crear usuario nuevo"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "Crear directorio personal"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Grupos"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Directorio personal: "
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Grupo primario"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Crear un grupo privado para el usuario"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "El UID del usuario es menor a 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "Especificar ID de usuario manualmente"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "Trabar cuenta de usuario"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
-"El usuario ya existe en el sistema, por favor use otro nombre de usuario"
+"Borrando usuario %s\n"
+" Realizando tambi�n lo siguiente\n"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "D�as antes que se permita el cambio :"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Directorio personal"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "No coincide la contrase�a"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
 msgstr ""
-"Esta contrase�a es demasiado simple. \n"
-" Las contrase�as buenas deber�an tener m�s de 6 caracteres"
+"El usuario ya existe en el sistema, por favor use otro nombre de usuario"
 
-#: ../userdrake_.c:265
-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 ""
-"No se recomienda crear un usuario con UID menor a 500.\n"
-"�Est� seguro que desea hacer esto?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
+msgstr "A�adir usuario"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "El UID del usuario es menor a 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "La cuenta expira (AAAA-MM-DD):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "Seleccione grupo"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_Acciones"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "A�adir al grupo 'users'"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "A�adir al grupo existente"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "Especificar ID de usuario manualmente"
 
-#: ../userdrake_.c:334
-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:1
+#, c-format
+msgid "/_File"
+msgstr "/_Fichero"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "S�"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "El nombre es muy largo"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "No"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Cerrar"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Nombre de usuario"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Directorio personal: "
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/_Refrescar"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_Editar"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>S"
+
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "Especificar ID de grupo manualmente"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "El grupo ya existe, por favor use otro nombre de grupo"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "El campo de nombre est� vac�o, por favor proporcione un nombre"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr "El GID del grupo es menor a 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Login"
 
-#: ../userdrake_.c:385
-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 ""
-"No se recomienda crear un grupo con GID menor a 500.\n"
-"�Est� seguro que desea hacer esto?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/_Salir"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "Ya existe un grupo con este nombre.  �Qu� desear�a hacer?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr "Advertencia: Borrando usuario"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Borrar"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"Borrando usuario %s\n"
-" Realizando tambi�n lo siguiente\n"
+"Por favor, especifique el a�o, mes y d�a\n"
+"para la expiraci�n de la cuenta"
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Borrar directorio personal: %s"
+msgid "User Data"
+msgstr "Datos del usuario"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "Borrar casilla de correo: /var/spool/mail/%s"
+msgid "Refresh"
+msgstr "Refrescar"
+
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Nombre completo"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "Advertencia : Borrando grupo"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "�Realmente desea borrar el grupo %s?\n"
+msgid " Group Gid is < 500"
+msgstr "El GID del grupo es menor a 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s es un grupo primario para el usuario %s\n"
-"Quite primero al usuario"
+msgid "Edit selected row"
+msgstr "Editar fila seleccionada"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Login"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Nombre del grupo"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Estado"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Contrase�a"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Confirmar contrase�a:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "Habilitar expiraci�n de contrase�a"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Directorio personal"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "Seleccione los usuarios que formar�n parte de este grupo:"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Datos del usuario"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Usuarios"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "Habilitar expiraci�n de cuenta"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "D�as antes que la cuenta se inactive :"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "La cuenta expira (AAAA-MM-DD):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "ID de grupo"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "Trabar cuenta de usuario"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "No"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Informaci�n de la cuenta"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_Acerca de..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "El usuario cambi� la contrase�a por �ltima vez el : "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Opciones"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "Habilitar expiraci�n de contrase�a"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "ID de usuario"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "D�as antes que se permita el cambio :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "Habilitar expiraci�n de cuenta"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "D�as antes que se requiera el cambio :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "Borrar casilla de correo: /var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "D�as de advertencia antes del cambio :"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Refrescar la lista"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "D�as antes que la cuenta se inactive :"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/a_Yuda"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Informaci�n de contrase�a"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Borrar directorio personal: %s"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Administraci�n de usuarios \n"
+
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Seleccione los grupos a los cuales pertenecer� el usuario:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "Datos del grupo"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "Seleccione los usuarios que formar�n parte de este grupo:"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "Trabado"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Grupos de usuarios"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "A�adir grupo"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "Por favor, seleccione al menos un grupo para el usuario"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Por favor, especifique el a�o, mes y d�a\n"
-"para la expiraci�n de la cuenta"
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "El usuario cambi� la contrase�a por �ltima vez el : "
 
-#: ../userdrake_.c:753
-#, fuzzy
-msgid "Please fill up all fields in password aging\n"
-msgstr ""
-"Por favor, especifique todos los campos para la caducaci�n de la contrase�a\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Reportar bug"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "No puede quitar al usuario '%s' de su grupo primario"
+msgid "Yes"
+msgstr "S�"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Cerrar"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Datos del grupo"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Autores: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Confirmar contrase�a:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Administraci�n de usuarios \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/_A�adir usuario"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright (C) 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Filtrar usuarios del sistema"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "El campo de nombre est� vac�o, por favor proporcione un nombre"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "Informaci�n de contrase�a"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "El nombre debe contener s�lo letras min�sculas, n�meros, `-' y `_'"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Buscar:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "El nombre es muy largo"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "A�adir al grupo existente"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Error"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "Seleccione grupo"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "Aplicar filtro"
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "Ayuda gen�rica sobre userdrake"
diff --git a/po/et.po b/po/et.po
index 9cda984..fcadb68 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-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-08-17 13:52+0300\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -15,450 +15,551 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Mandrake Linuxi kasutajate haldur"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_Tegevused"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Autoriõigus © 2003: Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_Muuda"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Grupikasutajad"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_Kustuta"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Filtreeri süsteemsed kasutajad"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_Seadistused"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Grupi loomine, mille GID on alla 500, ei ole soovitatav.\n"
+" Kas soovite seda kindlasti teha?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_Fail"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Käsurida"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/Vä_rskenda"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Kasutajale luuakse privaatgrupp"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/_Välju"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Muuda"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "Lisab süsteemi kasutaja"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/Lis_a kasutaja"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Konto info"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/Lisa _grupp"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "Hoiatus: kasutaja kustutamine"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/_Abi"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Viga"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_Veateade"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "Grupi liikmed"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_Misvärk"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "Päevi enne muutmise hoiatuse andmist :"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "Rakenda filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Kustutab valitud rea"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Kasutajad"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "Kodukataloogi loomine"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Grupid"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Täisnimi"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr "Nimi tohib sisaldada ainult väiketähti, numbreid ning märke '-' ja '_'"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Kodukataloog"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Käsurida"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"See parool on liiga lihtne. \n"
+" Korralik parool peaks koosnema vähemalt 6 sümbolist"
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Esmane grupp"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "Päevi enne muutmise nõudmist :"
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Staatus"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "Kas tõesti kustutada grupp %s?\n"
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "Kasutaja ID"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Palun täitke kõik parooli aegumise väljad\n"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Kasutajanimi"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "Ikooni muutmiseks klõpsake sellel"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "Grupi ID"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s on kasutaja %s esmane grupp\n"
+" Eemaldage esmalt kasutaja"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "Grupi liikmed"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/Lisa _grupp"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Grupi nimi"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Kasutajat '%s' ei saa eemaldada tema esmasest grupist"
 
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr "Lisa kasutaja"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Mandrake Linuxi kasutajate haldur"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "Lisab süsteemi kasutaja"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "Selline grupp on juba olemas, palun valige muu nimi"
 
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "Lisa grupp"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Kasutaja loomine, kelle UID on alla 500, ei ole soovitatav.\n"
+" Kas soovite seda kindlasti teha?\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Autorid: "
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "Lisab süsteemi grupi"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Muuda"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "Muudab valitud rida"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Kustuta"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Kustutab valitud rea"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Värskenda"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Värskendab nimekirja"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "Aegunud"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "Lukustatud"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "Ikooni muutmiseks klõpsake sellel"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Uue kasutaja loomine"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "Kodukataloogi loomine"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Grupid"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Kodukataloog: "
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Esmane grupp"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Kasutajale luuakse privaatgrupp"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "Kasutaja UID on väiksem kui 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "Kasutaja ID määratakse käsitsi"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "Kasutaja konto lukustamine"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "Selline kasutaja on juba olemas, palun valige muu nimi"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
+"Kasutaja %s kustutamine\n"
+" Ühtlasi võetakse ette järgmised tegevused\n"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "Päevi enne muutmise lubamist :"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Kodukataloog"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "Paroolid ei lange kokku"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"See parool on liiga lihtne. \n"
-" Korralik parool peaks koosnema vähemalt 6 sümbolist"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Selline kasutaja on juba olemas, palun valige muu nimi"
 
-#: ../userdrake_.c:265
-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 ""
-"Kasutaja loomine, kelle UID on alla 500, ei ole soovitatav.\n"
-" Kas soovite seda kindlasti teha?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
+msgstr "Lisa kasutaja"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "Kasutaja UID on väiksem kui 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "Konto aegub (YYYY-MM-DD):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "Vali grupp"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_Tegevused"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "Lisa gruppi 'users'"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Lisa olemasolevasse gruppi"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "Kasutaja ID määratakse käsitsi"
 
-#: ../userdrake_.c:334
-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:1
+#, c-format
+msgid "/_File"
+msgstr "/_Fail"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Jah"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "Nimi on liiga pikk"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "Ei"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Sulge"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Kasutajanimi"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Kodukataloog: "
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/Vä_rskenda"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_Muuda"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "Grupi ID määratakse käsitsi"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "Selline grupp on juba olemas, palun valige muu nimi"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "Nimeväli on tühi. Palun määrake nimi"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr " Grupi GID on väiksem kui 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Kasutajatunnus"
 
-#: ../userdrake_.c:385
-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 ""
-"Grupi loomine, mille GID on alla 500, ei ole soovitatav.\n"
-" Kas soovite seda kindlasti teha?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/_Välju"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "Sellise nimega grupp on juba olemas. Mida soovite ette võtta?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr "Hoiatus: kasutaja kustutamine"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Kustuta"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"Kasutaja %s kustutamine\n"
-" Ühtlasi võetakse ette järgmised tegevused\n"
+"Palun määrake konto aegumise \n"
+" aasta, kuu ja päev "
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Kustutatakse kodukataloog: %s"
+msgid "User Data"
+msgstr "Kasutaja andmed"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "Kustutatakse postkast: /var/spool/mail/%s"
+msgid "Refresh"
+msgstr "Värskenda"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Täisnimi"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "Hoiatus: grupi kustutamine"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "Kas tõesti kustutada grupp %s?\n"
+msgid " Group Gid is < 500"
+msgstr " Grupi GID on väiksem kui 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s on kasutaja %s esmane grupp\n"
-" Eemaldage esmalt kasutaja"
+msgid "Edit selected row"
+msgstr "Muudab valitud rida"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Kasutajatunnus"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Grupi nimi"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Staatus"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Parool"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Parool uuesti:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "Parooli aegumise lubamine"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Kodukataloog"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "Kasutajad, kes sellesse gruppi kuuluvad :"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Kasutaja andmed"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Kasutajad"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "Konto aegumise lubamine"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "Päevi enne konto tühistamist :"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "Konto aegub (YYYY-MM-DD):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "Grupi ID"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "Kasutaja konto lukustamine"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "Ei"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Konto info"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_Misvärk"
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "Kasutaja muutis viimati parooli : "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Seadistused"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "Parooli aegumise lubamine"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "Kasutaja ID"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "Päevi enne muutmise lubamist :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "Konto aegumise lubamine"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "Päevi enne muutmise nõudmist :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "Kustutatakse postkast: /var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "Päevi enne muutmise hoiatuse andmist :"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Värskendab nimekirja"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "Päevi enne konto tühistamist :"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_Abi"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Parooli info"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Kustutatakse kodukataloog: %s"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Kasutajate haldamine \n"
+
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Grupid, millesse see kasutaja kuulub:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "Grupi andmed"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "Kasutajad, kes sellesse gruppi kuuluvad :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "Lukustatud"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Grupikasutajad"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "Lisa grupp"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "Palun valige kasutajale vähemalt üks grupp"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Palun määrake konto aegumise \n"
-" aasta, kuu ja päev "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "Kasutaja muutis viimati parooli : "
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
-msgstr "Palun täitke kõik parooli aegumise väljad\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Veateade"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Kasutajat '%s' ei saa eemaldada tema esmasest grupist"
+msgid "Yes"
+msgstr "Jah"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Sulge"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Grupi andmed"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Autorid: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Parool uuesti:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Kasutajate haldamine \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/Lis_a kasutaja"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Autoriõigus © 2003: Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Filtreeri süsteemsed kasutajad"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "Nimeväli on tühi. Palun määrake nimi"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "Parooli info"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "Nimi tohib sisaldada ainult väiketähti, numbreid ning märke '-' ja '_'"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Otsi:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "Nimi on liiga pikk"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Lisa olemasolevasse gruppi"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Viga"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "Vali grupp"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "Rakenda filter"
diff --git a/po/eu.po b/po/eu.po
index 68115b9..fbc1517 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-08-17 23:55+0200\n"
 "Last-Translator: I�igo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: Euskara <linux-eu@chanae.alphanet.ch>\n"
@@ -18,454 +18,555 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Mandrake Linux Erabiltzaileen Kudeaketa Tresna"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_Ekintzak"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright � 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_Editatu"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Talde erabiltzaileak"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_Ezabatu"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Iragazi sistemaren erabiltzaileak"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_Aukerak"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Ez da gomendagarria GID < 500 duen talde bat sortzea.\n"
+"Ziur zaude hau egin nahi duzula?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_Fitxategia"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Erregistro Maskorra"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/_Berritu"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Erabiltzailearentzako talde pribatua sortu"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/_Irten"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Editatu"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<kontrol>I"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "Sistemara erabiltzaile bat erantsi"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/_Erabiltzailea gehitu"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Kontuaren Info"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/_Taldea gehitu"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "Oharra: Erabiltzailea ezabatzen"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/_Laguntza"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Okerra"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/Akatsa _txostendu"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "Taldeko Partadeak"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_Honi buruz..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "Egunak ohartarazten aldaketa aurretik: "
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "Iragazkia aplikatu"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Ezabatu aukeratutako errenkada"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Erabiltzaileak"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "Sortu Atariko Direktorioa"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Taldeak"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Izen Osoa"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr ""
+"Izenak soilik hizki latinoak txikiz, zenbakiak, `-' eta `_' izan behar ditu"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Atariko Direktorioa"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Erregistro Maskorra"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"Pasahitza sinpleegia da.\n"
+"Pasahitz onak > 6 karatere behar lituzke"
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Talde Primarioa"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "Egunak aldaketa eskatu aurretik: "
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Egoera"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "Benetan ezabatu nahi duzu %s taldea\n"
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "Erabiltzaile ID"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Mesedez, bete pasahitza galdu dadin eremu guztiak\n"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Erabiltzaile Izena"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "Klikatu ikonoan berau aldatzeko"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "Talde ID"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s, %s erabiltzailearentzako talde primarioa da\n"
+"Lehendabizi ezabatu erabiltzailea"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "Taldeko Partadeak"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/_Taldea gehitu"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Talde Izena"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Ezin duzu '%s' erabiltzailea bere talde primariotik kendu"
 
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr "Erabiltzaileak Erantsi"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Mandrake Linux Erabiltzaileen Kudeaketa Tresna"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "Sistemara erabiltzaile bat erantsi"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "Taldea dagoeneko badago, mesedez aukeratu beste talde izen bat"
 
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "Taldea Erantsi"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Ez da gomendagarria UID < 500 duen erabiltzaile bat sortzea.\n"
+"Ziur zaude hau egin nahi duzula?\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Egileak: "
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "Sistemara talde bat erantsi"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Editatu"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "Editatu aukeratutako errenkada"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Ezabatu"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Ezabatu aukeratutako errenkada"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Berritu"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Zerrenda berritu"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "Balio Galduta"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "Giltzatuta"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "Klikatu ikonoan berau aldatzeko"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Erabiltzaile berria sortu"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "Sortu Atariko Direktorioa"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Taldeak"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Atariko Direktorioa: "
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Talde Primarioa"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Erabiltzailearentzako talde pribatua sortu"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "Erabiltzaile UID < 500 da"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "Zehaztu eskuz erabiltzaile ID"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "Blokeatu Erabiltzaile Kontua"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "Izen hori dagoeneko badago, aukeratu bestu erabiltzaile izen bat"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
+"%s erabiltzailea ezabatzen\n"
+" Burutu ondorengo ekintzak ere\n"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "Egunak aldaketa baimendu aurretik: "
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Ataria"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "Pasahitza ez dator bat"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"Pasahitza sinpleegia da.\n"
-"Pasahitz onak > 6 karatere behar lituzke"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Izen hori dagoeneko badago, aukeratu bestu erabiltzaile izen bat"
 
-#: ../userdrake_.c:265
-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 ""
-"Ez da gomendagarria UID < 500 duen erabiltzaile bat sortzea.\n"
-"Ziur zaude hau egin nahi duzula?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
+msgstr "Erabiltzaileak Erantsi"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "Erabiltzaile UID < 500 da"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "Kontuak balioa galtzen du (UUUU-HH-EE): "
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "Taldea aukeratu"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_Ekintzak"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "Erantsi 'users' taldeari"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Erantsi dagoen taldera"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "Zehaztu eskuz erabiltzaile ID"
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "Izen hori duen taldea badago dagoeneko. Zer egin nahi zenuke?"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/_Fitxategia"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Bai"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "Izena luzeegia da"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "Ez"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Itxi"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Erabiltzaile Izena"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Atariko Direktorioa: "
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/_Berritu"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_Editatu"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<kontrol>I"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "Zehaztu eskuz talde ID"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "Taldea dagoeneko badago, mesedez aukeratu beste talde izen bat"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "Izen eremua hutsik dago, mesedez eman izen bat"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr "Talde GID < 500 da"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Erregistroa"
 
-#: ../userdrake_.c:385
-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 ""
-"Ez da gomendagarria GID < 500 duen talde bat sortzea.\n"
-"Ziur zaude hau egin nahi duzula?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/_Irten"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "Izen hori duen taldea badago dagoeneko. Zer egin nahi zenuke?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr "Oharra: Erabiltzailea ezabatzen"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Ezabatu"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"%s erabiltzailea ezabatzen\n"
-" Burutu ondorengo ekintzak ere\n"
+"Zehaztu kontuak balioa galduko duen \n"
+"urtea, hilabetea eta eguna"
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Ezabatu Atariko Direktorioa: %s"
+msgid "User Data"
+msgstr "Erabiltzailearen datuak"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "Ezabatu Postakutxa: /var/spool/mail/%s"
+msgid "Refresh"
+msgstr "Berritu"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Izen Osoa"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "Oharra: Taldea ezabatzen"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "Benetan ezabatu nahi duzu %s taldea\n"
+msgid " Group Gid is < 500"
+msgstr "Talde GID < 500 da"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s, %s erabiltzailearentzako talde primarioa da\n"
-"Lehendabizi ezabatu erabiltzailea"
+msgid "Edit selected row"
+msgstr "Editatu aukeratutako errenkada"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Erregistroa"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Talde Izena"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Egoera"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Pasahitza"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Pasahitza berretsi:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "Pasahitzaren balio-galtzea gaitu"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Ataria"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "Aukeratu talde honetara batuko diren erabiltzaileak: "
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Erabiltzailearen datuak"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Erabiltzaileak"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "Kontuaren balio-galtzea gaitu"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "Egunak kontua ezgaitu aurretik: "
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "Kontuak balioa galtzen du (UUUU-HH-EE): "
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "Talde ID"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "Blokeatu Erabiltzaile Kontua"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "Ez"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Kontuaren Info"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_Honi buruz..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "Erabiltzaileak pasahitza azkenekoz aldatu zuen: "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Aukerak"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "Pasahitzaren balio-galtzea gaitu"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "Erabiltzaile ID"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "Egunak aldaketa baimendu aurretik: "
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "Kontuaren balio-galtzea gaitu"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "Egunak aldaketa eskatu aurretik: "
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "Ezabatu Postakutxa: /var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "Egunak ohartarazten aldaketa aurretik: "
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Zerrenda berritu"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "Egunak kontua ezgaitu aurretik: "
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_Laguntza"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Pasahitzaren Info"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Ezabatu Atariko Direktorioa: %s"
+
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Erabiltzaileen Kudeaketa \n"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Hautatu erabiltzailea partaide izango duten taldeak: "
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "Talde datuak"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "Aukeratu talde honetara batuko diren erabiltzaileak: "
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "Giltzatuta"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Talde erabiltzaileak"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "Taldea Erantsi"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "Aukeratu talde bat gutxienez erabiltzailearentzako"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Zehaztu kontuak balioa galduko duen \n"
-"urtea, hilabetea eta eguna"
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "Erabiltzaileak pasahitza azkenekoz aldatu zuen: "
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
-msgstr "Mesedez, bete pasahitza galdu dadin eremu guztiak\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/Akatsa _txostendu"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Ezin duzu '%s' erabiltzailea bere talde primariotik kendu"
+msgid "Yes"
+msgstr "Bai"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Itxi"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Talde datuak"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Egileak: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Pasahitza berretsi:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Erabiltzaileen Kudeaketa \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/_Erabiltzailea gehitu"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright � 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Iragazi sistemaren erabiltzaileak"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "Izen eremua hutsik dago, mesedez eman izen bat"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "Pasahitzaren Info"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr ""
-"Izenak soilik hizki latinoak txikiz, zenbakiak, `-' eta `_' izan behar ditu"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Bilatu:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "Izena luzeegia da"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Erantsi dagoen taldera"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Okerra"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "Taldea aukeratu"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "Iragazkia aplikatu"
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "Userdrakeri buruzko laguntza generikoa"
diff --git a/po/fa.po b/po/fa.po
index 08eb3b7..248107f 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-fa\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
-"PO-Revision-Date: 2003-08-09 13:33+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
+"PO-Revision-Date: 2003-08-19 20:22+0200\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
 "Language-Team: Persian\n"
 "MIME-Version: 1.0\n"
@@ -16,454 +16,554 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "ابزار مدیریت کاربران لینوکس مان‌درایک"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_Actions"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright (C) 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_Edit"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "کاربران گروه"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_Delete"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Filter system users"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_Options"
+#: ../userdrake:1
+#, c-format
+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 ""
+"ایجاد کردن یک گروه با یک شناسه‌ی کوچکتر از ۵۰۰ پیشنهاد نمی‌شود. \n"
+"آیا مطمئن هستید که می‌خواهید این کار را انجام دهید؟\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_File"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "پوسته ورود"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/_Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "ایجاد یک گروه خصوصی برای کاربر"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/_Quit"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "ویرایش"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "افزودن یک کاربر به سیستم"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/_Add User"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "اطلاعات حساب"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/Add _Group"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "هشدار : حذف کاربر"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/راهنما"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "خطا"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_Report Bug"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "اعضای گروه"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_About..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "روزهای هشدار قبل از تغییر: "
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "گذاردن صافی"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "حذف ردیف انتخاب شده"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "کاربران"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "ایجاد شاخه‌ی خانه"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "گروه‌ها"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "نام کامل"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr "نام باید فقط حاوی حروف کوچک لاتین، اعداد، `-' و `_' باشد"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "شاخه خانه"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "پوسته ورود"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"این گذرواژه خیلی ساده است. \n"
+"گذرواژه خوب باید بیشتر از ۶ نویسه داشته باشد"
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "گروه مقدم"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "روزها قبل از آنکه تغییر لازم شود:"
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "وضعیت"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "آیا واقعاً می‌خواهید گروه %s را حذف نمایید\n"
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "شناسه‌ی کاربر"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "لطفاً تمام محوطه‌ها را در عمر گذرواژه پُر نمایید\n"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "نام کاربر"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "برای تغییر بر روی شمایل کلیک نمایید"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "شناسه‌ی گروه"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s یک گروه مقدم برای کاربر %s می‌باشد\n"
+" کاربر را اول بردارید"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "اعضای گروه"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/Add _Group"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "نام گروه"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "شما نمی‌توانید کاربر '%s' را از گروه مقدم‌شان بردارید"
 
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr "افزودن کاربر"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "ابزار مدیریت کاربران لینوکس مان‌درایک"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "افزودن یک کاربر به سیستم"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "گروه قبلاً وجود دارد، لطفاً نام دیگری برای گروه انتخاب نمایید"
 
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "افزودن گروه"
+#: ../userdrake:1
+#, c-format
+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 ""
+"ایجاد کردن یک کاربر با یک شناسه‌ی کوچکتر از ۵۰۰ پیشنهاد نمی‌شود. \n"
+"آیا مطمئن هستید که می‌خواهید این کار را انجام دهید؟\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "نگارندگان:"
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "افزودن یک گروه به سیستم"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "ویرایش"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "ویرایش ردیف انتخاب شده"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "حذف"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "حذف ردیف انتخاب شده"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "نوسازی"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "نوسازی لیست"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "منقضی شده است"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "قفل شده است"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "برای تغییر بر روی شمایل کلیک نمایید"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "ایجاد کاربر جدید"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "ایجاد شاخه‌ی خانه"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "گروه‌ها"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "شاخه خانه:"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "گروه مقدم"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "ایجاد یک گروه خصوصی برای کاربر"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "شناسه کاربر کوچکتر از ۵۰۰ است"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "تایین دستی شناسه‌ی کاربر"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "قفل کردن حساب کاربر"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "کاربر قبلا وجود دارد، لطفا یک نام کاربر دیگر انتخاب نمایید"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
+"حذف کردن کاربر %s\n"
+" عملیات بدنبال آمده را اجرا نمایید\n"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "روزها قبل از آنکه تغییر اجازه داده شود:"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "خانه"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "عدم تطابق گذرواژه"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"این گذرواژه خیلی ساده است. \n"
-"گذرواژه خوب باید بیشتر از ۶ نویسه داشته باشد"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "کاربر قبلا وجود دارد، لطفا یک نام کاربر دیگر انتخاب نمایید"
 
-#: ../userdrake_.c:265
-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 ""
-"ایجاد کردن یک کاربر با یک شناسه‌ی کوچکتر از ۵۰۰ پیشنهاد نمی‌شود. \n"
-"آیا مطمئن هستید که می‌خواهید این کار را انجام دهید؟\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
+msgstr "افزودن کاربر"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "شناسه کاربر کوچکتر از ۵۰۰ است"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "پایان یافتن حساب (YYYY-MM-DD):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "انتخاب گروه"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_Actions"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "افزودن به گروه کاربران"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "افزودن به گروه موجود"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "تایین دستی شناسه‌ی کاربر"
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "یک گروه با این نام قبلا وجود دارد. چکار دوست دارید بکنید؟"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/_File"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "بله"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "نام خیلی بلند است"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "نه"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "بستن"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "نام کاربر"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "شاخه خانه:"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/_Refresh"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_Edit"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "تایین دستی شناسه‌ی گروه"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "گروه قبلاً وجود دارد، لطفاً نام دیگری برای گروه انتخاب نمایید"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "محوطه‌ی نام خالی است لطفاً یک نام را عرضه نمایید"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr "شناسه گروه کوچکتر از ۵۰۰ است"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "ورود به سیستم"
 
-#: ../userdrake_.c:385
-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 ""
-"ایجاد کردن یک گروه با یک شناسه‌ی کوچکتر از ۵۰۰ پیشنهاد نمی‌شود. \n"
-"آیا مطمئن هستید که می‌خواهید این کار را انجام دهید؟\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/_Quit"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "یک گروه با این نام قبلا وجود دارد. چکار دوست دارید بکنید؟"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr "هشدار : حذف کاربر"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "حذف"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"حذف کردن کاربر %s\n"
-" عملیات بدنبال آمده را اجرا نمایید\n"
+"لطفاً سال، ماه و روز را برای انقضای \n"
+"حساب مشخص نمایید"
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "حذف شاخه‌ی خانه :%s"
+msgid "User Data"
+msgstr "داده کاربر"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "حذف جعبه پست : /var/spool/mail/%s"
+msgid "Refresh"
+msgstr "نوسازی"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "نام کامل"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "هشدار : حذف گروه"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "آیا واقعاً می‌خواهید گروه %s را حذف نمایید\n"
+msgid " Group Gid is < 500"
+msgstr "شناسه گروه کوچکتر از ۵۰۰ است"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s یک گروه مقدم برای کاربر %s می‌باشد\n"
-" کاربر را اول بردارید"
+msgid "Edit selected row"
+msgstr "ویرایش ردیف انتخاب شده"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "ورود به سیستم"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "نام گروه"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "وضعیت"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "گذرواژه"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "تایید گذرواژه:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "فعال کردن انقضای گذرواژه"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "خانه"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "انتخاب کاربران برای پیوستن به این گروه:"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "داده کاربر"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "کاربران"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "فعال کردن انقضای حساب"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "روزها قبل از آنکه حساب غیر فعال شود:"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "پایان یافتن حساب (YYYY-MM-DD):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "شناسه‌ی گروه"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "قفل کردن حساب کاربر"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "نه"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "اطلاعات حساب"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_About..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "تغییر گذرواژه آخرین بار در :"
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Options"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "فعال کردن انقضای گذرواژه"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "شناسه‌ی کاربر"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "روزها قبل از آنکه تغییر اجازه داده شود:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "فعال کردن انقضای حساب"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "روزها قبل از آنکه تغییر لازم شود:"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "حذف جعبه پست : /var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "روزهای هشدار قبل از تغییر: "
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "نوسازی لیست"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "روزها قبل از آنکه حساب غیر فعال شود:"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/راهنما"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "اطلاعات گذرواژه"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "حذف شاخه‌ی خانه :%s"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "مدیریت کاربران \n"
+
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "انتخاب گروهی که کاربر عضو آن خواهد شد:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "داده گروه"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "انتخاب کاربران برای پیوستن به این گروه:"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "قفل شده است"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "کاربران گروه"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "افزودن گروه"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "لطفاً حداقل یک گروه را برای کاربر انتخاب نمایید"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"لطفاً سال، ماه و روز را برای انقضای \n"
-"حساب مشخص نمایید"
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "تغییر گذرواژه آخرین بار در :"
 
-#: ../userdrake_.c:753
-#, fuzzy
-msgid "Please fill up all fields in password aging\n"
-msgstr "لطفاً تمام محوطه‌ها را برای عمر گذرواژه مشخص نمایید\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Report Bug"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "شما نمی‌توانید کاربر '%s' را از گروه مقدم‌شان بردارید"
+msgid "Yes"
+msgstr "بله"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "بستن"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "داده گروه"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "نگارندگان:"
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "تایید گذرواژه:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "مدیریت کاربران \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/_Add User"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright (C) 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Filter system users"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "محوطه‌ی نام خالی است لطفاً یک نام را عرضه نمایید"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "اطلاعات گذرواژه"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "نام باید فقط حاوی حروف کوچک لاتین، اعداد، `-' و `_' باشد"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "جستجو:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "نام خیلی بلند است"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "افزودن به گروه موجود"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "خطا"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "انتخاب گروه"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "گذاردن صافی"
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "کمک عمومی در userdrake"
diff --git a/po/fake_c.pl b/po/fake_c.pl
deleted file mode 100755
index 21cf25b..0000000
--- a/po/fake_c.pl
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/perl -lp
-
-s|^(__?\()| $1|;		# add a blank at the beginning (?!)
-
-s|_\(\[(.*),\s*(.*),\s*(.*)\]|ngettext($2,$3,$1)|; # special plural form handling
-
-s,\Qs/#.*//,,;			# ugly special case
-
-s,(^|[^\$])#([^+].*),"$1/*" . simpl($2) . "*/",e; 
-                                # rewrite comments to C format except for:
-                                # - ``#+ xxx'' comments which are kept
-                                # - ``$#xxx'' which are not comments
-
-s|//|/""/|g;			# ensure // or not understood as comments
-
-s|$|\\n\\|;			# multi-line strings not handled in C
-
-sub simpl {
-    local $_ = $_[0];
-    s,\*/,,g;
-    $_;
-}
diff --git a/po/fi.po b/po/fi.po
index fb233df..2d346fb 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-fi - MDK Release 9.2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-08-18 19:58+0300\n"
 "Last-Translator: Thomas Backlund <tmb@iki.fi>\n"
 "Language-Team: Finnish <cooker-i18n@linux-mandrake.com>\n"
@@ -19,453 +19,554 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Mandrake Linux käyttäjänhallintatyökalu"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/T_oiminnot"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright © 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_Muokkaa"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Ryhmän käyttäjät"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_Poista"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Suodata järjestelmäkäyttäjät"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_Valinnat"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Ryhmän, jonka GID on pienempi kuin 500, luominen ei ole suositeltua.\n"
+" Oletko varma että haluat tehdä tämän?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_Tiedosto"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Sisäänkirjautumistulkki"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/_Päivitä"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Luo yksityinen ryhmä käyttäjälle"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/_Lopeta"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Muokkaa"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>L"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "Lisää käyttäjä järjestelmään"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/Lisää _käyttäjä"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Käyttäjätilin tiedot"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/Lisää _ryhmä"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "Varoitus: Poistetaan käyttäjä"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/O_hje"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Virhe"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_Ilmoita virheestä"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "Ryhmän jäsenet"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/Tieto_ja"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "Päivät jolloin varoitetaan ennen vaihtoa : "
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "Suodata"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Poista valittu rivi"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Käyttäjät"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "Luo kotihakemisto"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Ryhmät"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Ryhmän käyttäjät"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr "Nimi voi muodostua pienistä kirjaimista, numeroista, `-' ja `_'"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Käyttäjän kotihakemisto"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Sisäänkirjautumistulkki"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"Tämä salasana on liian yksinkertainen.\n"
+" Hyvä salasana on ainakin yli kuusi merkkiä pitkä."
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Ensisijainen ryhmä"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "Päivät ennen kuin vaihtaminen vaaditaan : "
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Tila"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "Haluatko varmasti poistaa ryhmän %s\n"
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "Käyttäjä-ID"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Ole hyvä ja määritä kaikki kentät salasanan vanhenemiselle\n"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Käyttäjänimi"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "Klikkaa kuvaketta muttaaksesi sitä"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "Ryhmä-ID"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s on ensisijainen ryhmä käyttäjälle %s\n"
+" Poista käyttäjä ensin"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "Ryhmän jäsenet"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/Lisää _ryhmä"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Ryhmän nimi"
+#: ../userdrake:1
+#, 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:135
-msgid "Add User"
-msgstr "Lisää käyttäjä"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Mandrake Linux käyttäjänhallintatyökalu"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "Lisää käyttäjä järjestelmään"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "Ryhmä on jo olemassa, ole hyvä ja valitse toinen ryhmänimi"
 
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "Lisää ryhmä"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Käyttäjän, jonka UID on pienempi kuin 500, luominen ei ole suositeltua.\n"
+" Oletko varma että haluat tehdä tämän?\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Tekijät: "
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "Lisää ryhmä järjestelmään"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Muokkaa"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "Muokkaa valittua riviä"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Poista"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Poista valittu rivi"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Päivitä"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Päivitä lista"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "Vanhentunut"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "Lukittu"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "Klikkaa kuvaketta muttaaksesi sitä"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Luo uusi käyttäjä"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "Luo kotihakemisto"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Ryhmät"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Kotihakemisto: "
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Ensisijainen ryhmä"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Luo yksityinen ryhmä käyttäjälle"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "Käyttäjän UID on < 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "Määritä käyttäjän ID manuaalisesti"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "Lukitse käyttäjätili"
 
-#: ../userdrake_.c:251
-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:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
+"Poistetaan käyttäjä %s\n"
+" Suorita myös nämä tehtävät\n"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "Päivät ennen kuin vaihtaminen sallitaan : "
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Kotihakemisto"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "Salasana ei täsmää"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"Tämä salasana on liian yksinkertainen.\n"
-" Hyvä salasana on ainakin yli kuusi merkkiä pitkä."
+#: ../userdrake:1
+#, c-format
+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:265
-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 ""
-"Käyttäjän, jonka UID on pienempi kuin 500, luominen ei ole suositeltua.\n"
-" Oletko varma että haluat tehdä tämän?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
+msgstr "Lisää käyttäjä"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "Käyttäjän UID on < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "Käyttäjätili vanhenee  (YYYY-MM-DD)"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "Valitse ryhmä"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/T_oiminnot"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "Lisää ryhmään 'users'"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Lisää olemassaolevaan ryhmään"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "Määritä käyttäjän ID manuaalisesti"
 
-#: ../userdrake_.c:334
-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:1
+#, c-format
+msgid "/_File"
+msgstr "/_Tiedosto"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Kyllä"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "Nimi on liian pitkä"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "Ei"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Sulje"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Käyttäjänimi"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Kotihakemisto: "
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/_Päivitä"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_Muokkaa"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>L"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "Määritä ryhmä-ID manuaalisesti"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "Ryhmä on jo olemassa, ole hyvä ja valitse toinen ryhmänimi"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "Nimikenttä on tyhjä, ole hyvä ja määritä nimi"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr "Ryhmä-ID on < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Käyttäjätunnus"
 
-#: ../userdrake_.c:385
-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 ""
-"Ryhmän, jonka GID on pienempi kuin 500, luominen ei ole suositeltua.\n"
-" Oletko varma että haluat tehdä tämän?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/_Lopeta"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "Tällä nimellä oleva ryhmä on jo olemassa. Mitä haluat tehdä?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr "Varoitus: Poistetaan käyttäjä"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Poista"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"Poistetaan käyttäjä %s\n"
-" Suorita myös nämä tehtävät\n"
+"Ole hyvä ja määritä vuosi, kuukausi ja päivä\n"
+" käyttäjätilin vanhenemiselle "
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Poista kotihakemisto %s"
+msgid "User Data"
+msgstr "Käyttäjän tiedot"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "Poista sähköpostilaatikko /var/spool/mail/%s"
+msgid "Refresh"
+msgstr "Päivitä"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Ryhmän käyttäjät"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "Varoitus: Poistetaan ryhmä"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "Haluatko varmasti poistaa ryhmän %s\n"
+msgid " Group Gid is < 500"
+msgstr "Ryhmä-ID on < 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s on ensisijainen ryhmä käyttäjälle %s\n"
-" Poista käyttäjä ensin"
+msgid "Edit selected row"
+msgstr "Muokkaa valittua riviä"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Käyttäjätunnus"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Ryhmän nimi"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Tila"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Salasana"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Varmista salasana:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "Ota käyttöön salasanan vanheneminen"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Kotihakemisto"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "Valitse käyttäjät jotka kuuluvat tähän ryhmään:"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Käyttäjän tiedot"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Käyttäjät"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "Ota käyttöön käyttäjätilin vanheneminen"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "Päivät ennen kuin käyttäjätili käyttämätön : "
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "Käyttäjätili vanhenee  (YYYY-MM-DD)"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "Ryhmä-ID"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "Lukitse käyttäjätili"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "Ei"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Käyttäjätilin tiedot"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/Tieto_ja"
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "Käyttäjä vaihtoi viimeksi salasanaa : "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Valinnat"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "Ota käyttöön salasanan vanheneminen"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "Käyttäjä-ID"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "Päivät ennen kuin vaihtaminen sallitaan : "
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "Ota käyttöön käyttäjätilin vanheneminen"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "Päivät ennen kuin vaihtaminen vaaditaan : "
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "Poista sähköpostilaatikko /var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "Päivät jolloin varoitetaan ennen vaihtoa : "
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Päivitä lista"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "Päivät ennen kuin käyttäjätili käyttämätön : "
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/O_hje"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Salasanan tiedot"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Poista kotihakemisto %s"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Käyttäjänhallinta\n"
+
+#: ../userdrake:1
+#, c-format
 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:671
-msgid "Group Data"
-msgstr "Ryhmän tiedot"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "Valitse käyttäjät jotka kuuluvat tähän ryhmään:"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "Lukittu"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Ryhmän käyttäjät"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "Lisää ryhmä"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 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:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Ole hyvä ja määritä vuosi, kuukausi ja päivä\n"
-" käyttäjätilin vanhenemiselle "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "Käyttäjä vaihtoi viimeksi salasanaa : "
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
-msgstr "Ole hyvä ja määritä kaikki kentät salasanan vanhenemiselle\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Ilmoita virheestä"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, 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"
+msgid "Yes"
+msgstr "Kyllä"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Sulje"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Ryhmän tiedot"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Tekijät: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Varmista salasana:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Käyttäjänhallinta\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/Lisää _käyttäjä"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright © 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Suodata järjestelmäkäyttäjät"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "Nimikenttä on tyhjä, ole hyvä ja määritä nimi"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "Salasanan tiedot"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "Nimi voi muodostua pienistä kirjaimista, numeroista, `-' ja `_'"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Etsi:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "Nimi on liian pitkä"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Lisää olemassaolevaan ryhmään"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Virhe"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "Valitse ryhmä"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "Suodata"
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "Yleinen UserDraken ohje"
diff --git a/po/fr.po b/po/fr.po
index 8f1eb50..2bf061f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+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,456 +16,552 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Outil de gestion des utilisateurs de Mandrake Linux"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_Actions"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright � 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_�diter"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Users"
+msgstr "Membres du groupe"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_Effacer"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Filtrer les utilisateurs du syst�me"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_Options"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Cr�er un groupe avec un GID en-dessous de 500 est d�conseill�.\n"
+" �tes-vous s�r de vouloir le faire?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_Fichier"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Shell de d�marrage"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/_Rafra�chir"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Cr�er un groupe priv� pour l'utilisateur"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/_Quitter"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "�diter"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "Ajouter un utilisateur au syst�me"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/_Ajouter Utilisateur"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Info sur le compte"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/Ajouter _Groupe"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/_Aide"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Erreur"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_Rapporter un bogue"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "Membres du groupe"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_A propos..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "Nombre de jours avant l'avertissement :"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Retirer la ligne s�lectionn�e"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Utilisateurs"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Create Home Directory"
+msgstr "Cr�er le dossier personnel"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Groupes"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID:"
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Nom complet"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr "Le nom ne peut contenir que lettres minuscules, nombres, `-' et `_'"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Dossier personnel"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Shell de d�marrage"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"Ce mot de passe est trop simple. \n"
+" Les bons mots de passe doivent \n"
+" comporter plus 6 caract�res"
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Groupe primaire"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "Nombre de jours avant le changement :"
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Statut"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "ID utilisateur"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Veuillez indiquer tous les champs pour l'expiration du mot de passe"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Nom d'utilisateur"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr ""
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "ID Groupe"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s est un groupe primaire pour l'utilisateur %s\n"
+" Enlever l'utilisateur d'abord"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "Membres du groupe"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/Ajouter _Groupe"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Nom du groupe"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Vous ne pouvez pas supprimer l'utilisateur '%s' de son groupe primaire"
 
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr "Ajouter un utilisateur"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Outil de gestion des utilisateurs de Mandrake Linux"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "Ajouter un utilisateur au syst�me"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "Le groupe existe d�j�, veuillez choisir un autre nom de groupe"
 
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "Ajouter un groupe"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Cr�er un utilisateur avec un UID en-dessous de 500 est d�conseill�.\n"
+" �tes-vous s�r de vouloir le faire?\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Auteurs: "
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "Ajouter un groupe au syst�me"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "�diter"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "�diter la ligne s�lectionn�e"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Retirer"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Retirer la ligne s�lectionn�e"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Rafra�chir"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Rafra�chir la liste"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "Expir�"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "Verrouill�"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr ""
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Cr�er un nouvel utilisateur"
 
-#: ../userdrake_.c:232
-#, fuzzy
-msgid "Create Home Directory"
-msgstr "Cr�er le dossier personnel"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Groupes"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Dossier personnel:"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Groupe primaire"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Cr�er un groupe priv� pour l'utilisateur"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "L'identifiant utilisateur est inf�rieur � 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "Indiquer manuellement l'ID utilisateur"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "Bloquer le compte utilisateur"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "L'utilisateur existe d�j�, veuillez choisir un autre nom"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Dossier perso."
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "Mot de passe incorrect"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-#, fuzzy
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"Ce mot de passe est trop simple. \n"
-" Les bons mots de passe doivent \n"
-" comporter plus 6 caract�res"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "L'utilisateur existe d�j�, veuillez choisir un autre nom"
 
-#: ../userdrake_.c:265
-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 ""
-"Cr�er un utilisateur avec un UID en-dessous de 500 est d�conseill�.\n"
-" �tes-vous s�r de vouloir le faire?\n"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
+msgstr "Ajouter un utilisateur"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "L'identifiant utilisateur est inf�rieur � 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID:"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "Date d'expiration du compte  MM/JJ/AAAA"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "Choisir un groupe"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_Actions"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "Ajouter au groupe 'users'"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Ajouter au groupe existant"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "Indiquer manuellement l'ID utilisateur"
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "Un groupe avec ce nom existe d�j�. Que voulez-vous faire?"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/_Fichier"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Oui"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "Le nom est trop long"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "Non"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Fermer"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Nom d'utilisateur"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Dossier personnel:"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/_Rafra�chir"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_�diter"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "Indiquer un ID de groupe manuellement"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "Le groupe existe d�j�, veuillez choisir un autre nom de groupe"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "Le champ nom est vide veuillez fournir un nom"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr " L'identifiant de groupe est inf�rieur � 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Utilisateur"
 
-#: ../userdrake_.c:385
-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 ""
-"Cr�er un groupe avec un GID en-dessous de 500 est d�conseill�.\n"
-" �tes-vous s�r de vouloir le faire?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/_Quitter"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID:"
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "Un groupe avec ce nom existe d�j�. Que voulez-vous faire?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Retirer"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
+"Veuillez indiquer l'ann�e, le mois et le jour \n"
+" pour l'expiration du compte "
 
-#: ../userdrake_.c:453
-#, fuzzy, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Cr�er le dossier personnel"
+#: ../userdrake:1
+#, c-format
+msgid "User Data"
+msgstr "Donn�es utilisateur"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr ""
+msgid "Refresh"
+msgstr "Rafra�chir"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Nom complet"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr ""
+msgid " Group Gid is < 500"
+msgstr " L'identifiant de groupe est inf�rieur � 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s est un groupe primaire pour l'utilisateur %s\n"
-" Enlever l'utilisateur d'abord"
+msgid "Edit selected row"
+msgstr "�diter la ligne s�lectionn�e"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Utilisateur"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Nom du groupe"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Statut"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Mot de passe"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Confirmation du mot de passe�:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "Activer l'expiration du mot de passe"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Dossier perso."
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "Choisir les utilisateurs de ce groupe :"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Donn�es utilisateur"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Utilisateurs"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "Activer l'expiration du compte"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "Nombre de jours avant de d�sactiver le compte :"
 
-#: ../userdrake_.c:598
-#, fuzzy
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "Date d'expiration du compte  MM/JJ/AAAA"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "ID Groupe"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "Bloquer le compte utilisateur"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "Non"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Info sur le compte"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_A propos..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "L'utilisateur a chang� son mot de passe le : "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Options"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "Activer l'expiration du mot de passe"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "ID utilisateur"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "Activer l'expiration du compte"
+
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "Nombre de jours avant le changement :"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Rafra�chir la liste"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "Nombre de jours avant l'avertissement :"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_Aide"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "Nombre de jours avant de d�sactiver le compte :"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Cr�er le dossier personnel"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Information sur le mot de passe"
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Gestion Utilisateurs \n"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Choisir les groupes dont l'utilisateur sera membre :"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "Donn�es sur le groupe"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "Choisir les utilisateurs de ce groupe :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "Verrouill�"
 
-#: ../userdrake_.c:675
-#, fuzzy
-msgid "Group Users"
-msgstr "Membres du groupe"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "Ajouter un groupe"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "Veuillez choisir au moins un groupe pour l'utilisateur"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Veuillez indiquer l'ann�e, le mois et le jour \n"
-" pour l'expiration du compte "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "L'utilisateur a chang� son mot de passe le : "
 
-#: ../userdrake_.c:753
-#, fuzzy
-msgid "Please fill up all fields in password aging\n"
-msgstr "Veuillez indiquer tous les champs pour l'expiration du mot de passe"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Rapporter un bogue"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Vous ne pouvez pas supprimer l'utilisateur '%s' de son groupe primaire"
+msgid "Yes"
+msgstr "Oui"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Fermer"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Donn�es sur le groupe"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID:"
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Auteurs: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Confirmation du mot de passe�:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Gestion Utilisateurs \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/_Ajouter Utilisateur"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright � 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Filtrer les utilisateurs du syst�me"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "Le champ nom est vide veuillez fournir un nom"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "Information sur le mot de passe"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "Le nom ne peut contenir que lettres minuscules, nombres, `-' et `_'"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Chercher:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "Le nom est trop long"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Ajouter au groupe existant"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Erreur"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "Choisir un groupe"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr ""
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "Aide g�n�rique sur userdrake"
diff --git a/po/ga.po b/po/ga.po
index 99b3b24..efd3520 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+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,462 +16,539 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr ""
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Co�pcheart � 2003 Mandrakesoft."
 
-#: ../userdrake_.c:66
-#, fuzzy
-msgid "/_Edit"
-msgstr "Eagar"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Users"
+msgstr "Grupa�"
 
-#: ../userdrake_.c:67
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "/_Delete"
 msgstr "Scr�os"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
+#: ../userdrake:1
+#, c-format
+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:68 ../userdrake_.c:80
-msgid "/_Options"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Login Shell"
+msgstr "Logann"
+
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-#, fuzzy
-msgid "/_File"
-msgstr "Comhad"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Eagar"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
 msgstr ""
 
-#: ../userdrake_.c:76
-#, fuzzy
-msgid "/_Add User"
-msgstr "Suimigh �s�ideoir"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr ""
 
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/Add _Group"
-msgstr "Suimigh grupa"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Members"
+msgstr "Grupa�"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:88
-#, fuzzy
-msgid "/_About..."
-msgstr "Faoi"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Create Home Directory"
+msgstr "Eolaire Baile:"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "�s�ideoir�"
-
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Grupa�"
-
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Home Directory"
 msgstr "Eolaire Baile:"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-#, fuzzy
-msgid "Login Shell"
-msgstr "Logann"
-
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake_.c:122
-msgid "Status"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User ID"
-msgstr "�s�ideoir "
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User Name"
-msgstr "Userdrake"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group ID"
-msgstr "Grupa"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group Members"
-msgstr "Grupa�"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-#, fuzzy
-msgid "Group Name"
-msgstr "Grupa"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-#, fuzzy
-msgid "Add User"
-msgstr "Suimigh �s�ideoir"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr ""
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add Group"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/Add _Group"
 msgstr "Suimigh grupa"
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add a group to the system"
-msgstr "Cuir grupa"
-
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Eagar"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Scr�os"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:139
-msgid "Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:139
-msgid "Refresh the list"
+#: ../userdrake:1
+#, c-format
+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:168
-msgid "Expired"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add a group to the system"
+msgstr "Cuir grupa"
 
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
+#: ../userdrake:1
+#, c-format
+msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:232
-#, fuzzy
-msgid "Create Home Directory"
-msgstr "Eolaire Baile:"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Grupa�"
 
-#: ../userdrake_.c:234
-#, fuzzy
-msgid "Home Directory: "
-msgstr "Eolaire Baile:"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr ""
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
-#, fuzzy
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Baile"
+
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Password Mismatch"
 msgstr "Pasfhocal"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
 msgstr ""
 
-#: ../userdrake_.c:265
-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:1
+#, fuzzy, c-format
+msgid "Add User"
+msgstr "Suimigh �s�ideoir"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
 msgstr ""
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_File"
+msgstr "Comhad"
 
-#: ../userdrake_.c:355
-msgid "Yes"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:359
-msgid "No"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
 msgstr ""
 
-#: ../userdrake_.c:370
-msgid "Specify group ID manually"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User Name"
+msgstr "Userdrake"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Home Directory: "
+msgstr "Eolaire Baile:"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Edit"
+msgstr "Eagar"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid ""
-"Creating a group with a GID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:400
-msgid "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Logann"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Scr�os"
+
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, fuzzy, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Eolaire Baile:"
+msgid "User Data"
+msgstr "ID �s�ideoir"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
+msgid "Refresh"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
+msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
+msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Logann"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Name"
+msgstr "Grupa"
+
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr ""
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Pasfhocal"
 
-#: ../userdrake_.c:553
-#, fuzzy
-msgid "Confirm Password:"
-msgstr "Pasfhocal"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr ""
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Baile"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr ""
 
-#: ../userdrake_.c:593
-#, fuzzy
-msgid "User Data"
-msgstr "ID �s�ideoir"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "�s�ideoir�"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group ID"
+msgstr "Grupa"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
+#: ../userdrake:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_About..."
+msgstr "Faoi"
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
 msgstr ""
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User ID"
+msgstr "�s�ideoir "
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
 msgstr ""
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
 msgstr ""
 
-#: ../userdrake_.c:622
-#, fuzzy
-msgid "Password Info"
-msgstr "Pasfhocal"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Eolaire Baile:"
 
-#: ../userdrake_.c:626
-msgid "Select the groups that the user will be a member of:"
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:671
-#, fuzzy
-msgid "Group Data"
-msgstr "ID Grupa"
+#: ../userdrake:1
+#, c-format
+msgid "Select the groups that the user will be a member of:"
+msgstr ""
 
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:675
-#, fuzzy
-msgid "Group Users"
-msgstr "Grupa�"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add Group"
+msgstr "Suimigh grupa"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
+msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:900
-msgid "Close"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Data"
+msgstr "ID Grupa"
+
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Confirm Password:"
+msgstr "Pasfhocal"
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Add User"
+msgstr "Suimigh �s�ideoir"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Co�pcheart � 2003 Mandrakesoft."
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Password Info"
+msgstr "Pasfhocal"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Cuardaigh:"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:931
-msgid "Error"
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
 msgstr ""
 
 #, fuzzy
diff --git a/po/gl.po b/po/gl.po
index b5fa452..5ce319f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+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,468 +17,539 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr ""
 
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/_Actions"
-msgstr "Acci�ns"
-
-#: ../userdrake_.c:66
-#, fuzzy
-msgid "/_Edit"
-msgstr "Editar"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Users"
+msgstr "Grupos"
 
-#: ../userdrake_.c:67
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "/_Delete"
 msgstr "Borrar"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
+#: ../userdrake:1
+#, c-format
+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:68 ../userdrake_.c:80
-#, fuzzy
-msgid "/_Options"
-msgstr "Acci�ns"
-
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-#, fuzzy
-msgid "/_File"
-msgstr "Ficheiro"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Login Shell"
+msgstr "Nome de usuario"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Editar"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:76
-#, fuzzy
-msgid "/_Add User"
-msgstr "Engadir usuario"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/Add _Group"
-msgstr "Engadir grupo"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-#, fuzzy
-msgid "/_Help"
-msgstr "Axuda"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Members"
+msgstr "Grupos"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:88
-#, fuzzy
-msgid "/_About..."
-msgstr "Acerca"
-
-#: ../userdrake_.c:103
-msgid "Apply filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Usuarios"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Create Home Directory"
+msgstr "Directorio persoal do usuario"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Grupos"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr ""
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Home Directory"
 msgstr "Directorio persoal do usuario"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-#, fuzzy
-msgid "Login Shell"
-msgstr "Nome de usuario"
-
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake_.c:122
-msgid "Status"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User ID"
-msgstr "Usuario"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User Name"
-msgstr "Userdrake"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group ID"
-msgstr "Grupo"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group Members"
-msgstr "Grupos"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-#, fuzzy
-msgid "Group Name"
-msgstr "Grupo"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-#, fuzzy
-msgid "Add User"
-msgstr "Engadir usuario"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr ""
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add Group"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/Add _Group"
 msgstr "Engadir grupo"
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add a group to the system"
-msgstr "Engadir un grupo"
-
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Editar"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr ""
 
-#: ../userdrake_.c:137
-msgid "Edit selected row"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Borrar"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete selected row"
+#: ../userdrake:1
+#, c-format
+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:139
-msgid "Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:139
-#, fuzzy
-msgid "Refresh the list"
-msgstr "Lista de usuarios"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add a group to the system"
+msgstr "Engadir un grupo"
 
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:168
-msgid "Locked"
+#: ../userdrake:1
+#, c-format
+msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Grupos"
 
-#: ../userdrake_.c:225 ../userdrake_.c:364
-msgid "Create New User"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:232
-#, fuzzy
-msgid "Create Home Directory"
-msgstr "Directorio persoal do usuario"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr ""
 
-#: ../userdrake_.c:234
-#, fuzzy
-msgid "Home Directory: "
-msgstr "Directorio persoal do usuario"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr ""
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:251
-#, fuzzy
-msgid "User already exists, please choose another User Name"
-msgstr "Este nome xa existe no sistema"
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Dir. Persoal"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Password Mismatch"
 msgstr "Contrasinal"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Este nome xa existe no sistema"
 
-#: ../userdrake_.c:265
-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:1
+#, fuzzy, c-format
+msgid "Add User"
+msgstr "Engadir usuario"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Actions"
+msgstr "Acci�ns"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_File"
+msgstr "Ficheiro"
 
-#: ../userdrake_.c:355
-msgid "Yes"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:359
-msgid "No"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
 msgstr ""
 
-#: ../userdrake_.c:370
-msgid "Specify group ID manually"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User Name"
+msgstr "Userdrake"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Home Directory: "
+msgstr "Directorio persoal do usuario"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Edit"
+msgstr "Editar"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid ""
-"Creating a group with a GID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:400
-msgid "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Nome de usuario"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Borrar"
+
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, fuzzy, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Directorio persoal do usuario"
+msgid "User Data"
+msgstr "Lista de usuarios"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
+msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
+msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
+msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Nome de usuario"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Name"
+msgstr "Grupo"
+
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr ""
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Contrasinal"
 
-#: ../userdrake_.c:553
-#, fuzzy
-msgid "Confirm Password:"
-msgstr "Contrasinal"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr ""
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Dir. Persoal"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr ""
 
-#: ../userdrake_.c:593
-#, fuzzy
-msgid "User Data"
-msgstr "Lista de usuarios"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Usuarios"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group ID"
+msgstr "Grupo"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
+#: ../userdrake:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_About..."
+msgstr "Acerca"
 
-#: ../userdrake_.c:610
-#, fuzzy
-msgid "User last changed password on : "
-msgstr "Non pode mudar o contrasinal"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Options"
+msgstr "Acci�ns"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User ID"
+msgstr "Usuario"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Refresh the list"
+msgstr "Lista de usuarios"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Help"
+msgstr "Axuda"
 
-#: ../userdrake_.c:622
-#, fuzzy
-msgid "Password Info"
-msgstr "Contrasinal"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Directorio persoal do usuario"
 
-#: ../userdrake_.c:626
-msgid "Select the groups that the user will be a member of:"
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:671
-#, fuzzy
-msgid "Group Data"
-msgstr "Lista de grupos"
+#: ../userdrake:1
+#, c-format
+msgid "Select the groups that the user will be a member of:"
+msgstr ""
 
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:675
-#, fuzzy
-msgid "Group Users"
-msgstr "Grupos"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add Group"
+msgstr "Engadir grupo"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User last changed password on : "
+msgstr "Non pode mudar o contrasinal"
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
+msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:900
-msgid "Close"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Data"
+msgstr "Lista de grupos"
+
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Confirm Password:"
+msgstr "Contrasinal"
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Add User"
+msgstr "Engadir usuario"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Password Info"
+msgstr "Contrasinal"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Buscar:"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:931
-msgid "Error"
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
 msgstr ""
 
 #~ msgid "Help"
diff --git a/po/he.po b/po/he.po
index d32a6db..7534596 100644
--- a/po/he.po
+++ b/po/he.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-he\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-08-16 02:30+0300\n"
 "Last-Translator: el-cuco <cuco3001@yahoo.com>\n"
 "Language-Team: Hebrew\n"
@@ -21,452 +21,552 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "כלי לניהול משתמשים של Mandrake Linux"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_פעולות"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "כל הזכויות שמורות 2003 MandrakeSoft."
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_עריכה"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "קבוצות משתמשים"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_מחיקה"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/סמן משתמשי מערכת"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/אפשרויות"
+#: ../userdrake:1
+#, c-format
+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 ""
+"יצירת קבוצה עם זיהוי מתחת ל-500 לא מומלץ\n"
+"אתה בטח שאתה רוצה לעשות את זה?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_קובץ"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "שם מעטפת"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/_רענן"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "יצירת קבוצה פרטית עבור המשתמש"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/_יציאה"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "עריכה"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "הוספת משתמש למערכת"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/_הוספת משתמש"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "מידע על החשבון"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/הוספת קבוצה"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "הזהרה: מוחק משתמש"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/_עזרה"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "שגיאה"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_דווח על באג"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "חברים בקבוצה"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/אודות..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "ימים לפני הזהרה על תפוגת הססמה :"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "החל מסנן"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "מחיקה של עמודה מסומנת"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "משתמשים"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "יצירת ספריית הבית של המשתמש"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "קבוצות"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "זיהוי המשתמש (UID):"
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "שם מלא"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr "השם חייב להכיל רק אותיות לטיניות קטנות, מספרים, מקף וקו תחתי"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "ספריית הבית"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "שם מעטפת"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"הססמה היא פשוטה מדי\n"
+"ססמה טובה צריכה להכיל יותר מ-6 תווים."
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "קבוצה ראשונית"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "ימים לפני שחובה לשנות את הססמה:"
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "מצב"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "האם באמת למחוק את קבוצה %s\n"
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "זיהוי משתמש"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "נא לספק את הססמה הישנה בכל השדות\n"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "שם משתמש"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "לחץ על הצלמית בכדי לערוך את זה"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "זיהוי קבוצה"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr "%s היא קבוצה ראשונית עבור משתמש %s נא למחוק את המשתמש קודם לכן "
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "חברים בקבוצה"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/הוספת קבוצה"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "שם הקבוצה"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "אין אפשרות למחוק את משתמש %s מהקבוצה הראשית שלו"
 
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr "הוספת משתמש"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "כלי לניהול משתמשים של Mandrake Linux"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "הוספת משתמש למערכת"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "הקבוצה כבר קיימת, נא לבחור שם אחר לקבוצה"
 
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "הוספת קבוצה"
+#: ../userdrake:1
+#, c-format
+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 ""
+"יצירת משתמש עם זיהוי מתחת ל-500 לא מומלץ\n"
+"אתה בטח שאתה רוצה לעשות את זה?\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "כותבים"
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "הוספת קבוצה למערכת"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "עריכה"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "עריכת עמודה מסומנת"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "מחיקה"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "מחיקה של עמודה מסומנת"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "רענן"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "רענן רשימת משתמשים"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "פג"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "נעול"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "לחץ על הצלמית בכדי לערוך את זה"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "יצירת משתמש חדש"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "יצירת ספריית הבית של המשתמש"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "קבוצות"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "ספריית הבית של המשתמש"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "קבוצה ראשונית"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "יצירת קבוצה פרטית עבור המשתמש"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "זיהוי המשתמש קטן מ-500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "קבע את זיהוי המשתמש ידנית"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "נעל חשבון משתמש"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "שם זה כבר קיים במערכת, נא לבחור אחר"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
+"מחיקת משתמש %s\n"
+"תגרום גם לפעולות הבאות:\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "ימים לפני שניתן לשנות את הססמה:"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "ספריית הבית"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "ססמאות לא תואמת"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"הססמה היא פשוטה מדי\n"
-"ססמה טובה צריכה להכיל יותר מ-6 תווים."
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "שם זה כבר קיים במערכת, נא לבחור אחר"
 
-#: ../userdrake_.c:265
-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 ""
-"יצירת משתמש עם זיהוי מתחת ל-500 לא מומלץ\n"
-"אתה בטח שאתה רוצה לעשות את זה?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
+msgstr "הוספת משתמש"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "זיהוי המשתמש קטן מ-500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "זיהוי המשתמש (UID):"
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "החשבון פג בתאריך (שנה-חודש-יום):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "בחר קבוצה"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_פעולות"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "הוסף לקבוצת ה'משתמשים'"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "הוסף לקבוצה קיימת"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "קבע את זיהוי המשתמש ידנית"
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "קבוצה עם השם הזה כבר קיימת. מה רצונך לעשות?"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/_קובץ"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "כן"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "השם ארוך מדי"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "לא"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "סגור"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "שם משתמש"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "ספריית הבית של המשתמש"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/_רענן"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_עריכה"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "קבע את זיהוי הקבוצה ידנית"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "הקבוצה כבר קיימת, נא לבחור שם אחר לקבוצה"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "שדה השם ריק, נא לספק שם"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr "זיהוי הקבוצה קטן מ-500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "שם משתמש"
 
-#: ../userdrake_.c:385
-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 ""
-"יצירת קבוצה עם זיהוי מתחת ל-500 לא מומלץ\n"
-"אתה בטח שאתה רוצה לעשות את זה?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/_יציאה"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "זיהוי הקבוצה (GID):"
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "קבוצה עם השם הזה כבר קיימת. מה רצונך לעשות?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr "הזהרה: מוחק משתמש"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "מחיקה"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"מחיקת משתמש %s\n"
-"תגרום גם לפעולות הבאות:\n"
+"נא לקבוע שנה, חודש ויום\n"
+" עבור תפוגת החשבון "
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "מחיקת ספריית הבית של משתמש:  %s"
+msgid "User Data"
+msgstr "נתוני משתמש"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "מחיקת חשבון הדואר /var/spool/mail/%s"
+msgid "Refresh"
+msgstr "רענן"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "שם מלא"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "הזהרה: מוחק קבוצה"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "האם באמת למחוק את קבוצה %s\n"
+msgid " Group Gid is < 500"
+msgstr "זיהוי הקבוצה קטן מ-500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr "%s היא קבוצה ראשונית עבור משתמש %s נא למחוק את המשתמש קודם לכן "
+msgid "Edit selected row"
+msgstr "עריכת עמודה מסומנת"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "שם משתמש"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "שם הקבוצה"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "מצב"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "ססמה"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "אשר ססמה"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "אפשר ססמה מוגבלת בזמן"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "ספריית הבית"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "נא לבחור את המשתמשים שיצטרפו לקבוצה הזאת:"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "נתוני משתמש"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "משתמשים"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "אפשר חשבון מוגבל בזמן"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "ימים לפני נעילת חשבון לא פעיל :"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "החשבון פג בתאריך (שנה-חודש-יום):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "זיהוי קבוצה"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "נעל חשבון משתמש"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "לא"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "מידע על החשבון"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/אודות..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "ססמת החשבון שונתה לאחרונה בתאריך :"
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/אפשרויות"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "אפשר ססמה מוגבלת בזמן"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "זיהוי משתמש"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "ימים לפני שניתן לשנות את הססמה:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "אפשר חשבון מוגבל בזמן"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "ימים לפני שחובה לשנות את הססמה:"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "מחיקת חשבון הדואר /var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "ימים לפני הזהרה על תפוגת הססמה :"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "רענן רשימת משתמשים"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "ימים לפני נעילת חשבון לא פעיל :"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_עזרה"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "מידע על הססמה"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "מחיקת ספריית הבית של משתמש:  %s"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "ניהול משתמשים \n"
+
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "נא לבחור את הקבוצות שהחשבון יהיה חבר בהן :"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "מידע על קבוצות"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "נא לבחור את המשתמשים שיצטרפו לקבוצה הזאת:"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "נעול"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "קבוצות משתמשים"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "הוספת קבוצה"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "נא לבחור לפחות קבוצה אחת לפחות עבור המשתמש"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"נא לקבוע שנה, חודש ויום\n"
-" עבור תפוגת החשבון "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "ססמת החשבון שונתה לאחרונה בתאריך :"
 
-#: ../userdrake_.c:753
-#, fuzzy
-msgid "Please fill up all fields in password aging\n"
-msgstr "נא לספק את הססמה הישנה בכל השדות\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_דווח על באג"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "אין אפשרות למחוק את משתמש %s מהקבוצה הראשית שלו"
+msgid "Yes"
+msgstr "כן"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "סגור"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "מידע על קבוצות"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "זיהוי הקבוצה (GID):"
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "כותבים"
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "אשר ססמה"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "ניהול משתמשים \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/_הוספת משתמש"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "כל הזכויות שמורות 2003 MandrakeSoft."
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/סמן משתמשי מערכת"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "שדה השם ריק, נא לספק שם"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "מידע על הססמה"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "השם חייב להכיל רק אותיות לטיניות קטנות, מספרים, מקף וקו תחתי"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "חיפוש:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "השם ארוך מדי"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "הוסף לקבוצה קיימת"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "שגיאה"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "בחר קבוצה"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "החל מסנן"
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "עזרה בסיסית אודות userdrake"
diff --git a/po/hi.po b/po/hi.po
index fdc862c..dadc89d 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-hi\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
-"PO-Revision-Date: 2003-08-13 22:45+0530\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
+"PO-Revision-Date: 2003-08-19 22:45+0530\n"
 "Last-Translator: धनंजय शर्मा (Dhananjaya Sharma) <dysxhi@yahoo.co.in>\n"
 "Language-Team: हिन्दी, भारत (Hindi, India) <dysxhi@yahoo.co.in>\n"
 "MIME-Version: 1.0\n"
@@ -16,455 +16,555 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "मैनड्रैक लिनक्स उपयोगकर्ता प्रबंधन टूल"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/कार्य-कलाप(_A)"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "सर्वाधिकार © २००३ मैनड्रैकसॉफ़्ट एस०ऐ०"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/सम्पादित करें(_E)"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "समूह उपयोगकर्ता"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/मिटायें(_D)"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/प्रणाली उपयोगकर्ताओं को अलग करें(_F)"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/विकल्प(_O)"
+#: ../userdrake:1
+#, c-format
+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 ""
+"एक समूह निर्माण, जिसकी समूह पहचान संख्या ५०० से कम हो, की सलाह नहीं दी जाती है\n"
+"क्या आप वास्तव में ऐसा करना चाहते है?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/संचिका (_F)"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "सत्र-आरंभ कोश"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/पुनः ताजा करें (_R)"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "उपयोगकर्ता के लिए एक व्यक्तिगत समूह का निर्माण"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/निर्गम(_Q)"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "सम्पादन"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<कन्ट्रोल>क्यू <control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "एक उपयोग-कर्ता को प्रणाली में जोड़ना"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/उपयोग-कर्ता जोड़े(_A)"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "खाते के बारे में जानकारी"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/समूह जोड़े(_G)"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "चेतावनी : उपयोगकर्ता को हटाया जा रहा है"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/सहायता(_H)"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "त्रुटि"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/दोष के बारे में बतायें(_R)"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "समूह के सदस्य"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/के बारे में(_A)..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "दिन संख्या, जिसके पहिले परिवर्तन की चेतावनी मिलेगी :"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "फ़िल्टर लगायें"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "चयन की हुई पंक्ति को मिटाना"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "उपयोग-कर्ता"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "गृह स्थल निर्देशिका का निर्माण करें"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "समूह"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "उपयोगकर्ता पहचान संख्या: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "पूरा नाम"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr "नाम में सिर्फ़ लैटिन छोटे अक्षर, संख्याऐं, `-' और `_' शामिल होना चाहिए"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "गृह स्थल निर्देशिका"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "सत्र-आरंभ कोश"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"यह कूट-शब्द अति सरल है।\n"
+"अच्छे कूट-शब्द ६ अक्षरों से अधिक के होते है"
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "प्रधान समूह"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "दिन संख्या, जिसके पहिले परिवर्तन आवश्यक है :"
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "स्थिति"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "क्या आप वास्तव में %s समूह को हटाना चाहते है\n"
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "उपयोग-कर्ता पहचान संख्या"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "कृपया कूट-शब्द आयु के लिए सभी प्रविष्टियों को भरें\n"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "उपयोगकर्ता का नाम"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "आइकॉन को परिवर्तित करने के लिए, इस पर क्लिक करें"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "समूह पहचान संख्या"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s , उपयोगकर्ता %s के लिए, एक प्रधान समूह है\n"
+" उपयोगकर्ता को पहिले हटायें"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "समूह के सदस्य"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/समूह जोड़े(_G)"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "समूह का नाम"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "आप, '%s' उपयोगकर्ता को उसके प्रधान समूह से नहीं हटा सकते है"
 
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr "उपयोग-कर्ता जोड़ना"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "मैनड्रैक लिनक्स उपयोगकर्ता प्रबंधन टूल"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "एक उपयोग-कर्ता को प्रणाली में जोड़ना"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "समूह पहिले से विद्यमान है, कृपया अन्य समूह नाम का चयन करें"
 
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "समूह जोड़ना"
+#: ../userdrake:1
+#, c-format
+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 ""
+"एक उपयोगकर्ता का निर्माण, जिसकी उपयोगकर्ता पहचान संख्या ५०० से कम हो, की सलाह नहीं "
+"दी जाती है\n"
+"क्या आप वास्तव में ऐसा करना चाहते है?\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "लेखकों के नाम: "
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "एक समूह को प्रणाली में जोड़ना"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "सम्पादन"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "चयन की हुई पंक्ति का संपादन"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "मिटाना"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "चयन की हुई पंक्ति को मिटाना"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "पुनः ताजा करना"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "उपयोग-कर्ता सूची को पुनः ताजा करना"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "समाप्त हो चुका है"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "ताला-बन्द"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "आइकॉन को परिवर्तित करने के लिए, इस पर क्लिक करें"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "नये उपयोगकर्ता का निर्माण"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "गृह स्थल निर्देशिका का निर्माण करें"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "समूह"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "गृह स्थल निर्देशिका: "
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "प्रधान समूह"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "उपयोगकर्ता के लिए एक व्यक्तिगत समूह का निर्माण"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "उपयोगकर्ता की उपयोगकर्ता-पहचान-संख्या ५०० से कम है"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "उपयोगकर्ता पहचान संख्या को स्वमं निर्दिष्ट करना"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "उपयोगकर्ता खाते को लॉक करें"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "उपयोगकर्ता पहिले से विद्यमान है, कृपया अन्य उपयोगकर्ता नाम चुनें।"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
+"%s उपयोगकर्ता को हटाया जा रहा है\n"
+"साथ ही, निम्नलिखित क्रियायें भी की जा रही है\n"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "दिन संख्या, जिसके पहिले परिवर्तन की अनुमति है :"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "गॄह-स्थल"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "कूट-शब्द बेमेल"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"यह कूट-शब्द अति सरल है।\n"
-"अच्छे कूट-शब्द ६ अक्षरों से अधिक के होते है"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "उपयोगकर्ता पहिले से विद्यमान है, कृपया अन्य उपयोगकर्ता नाम चुनें।"
 
-#: ../userdrake_.c:265
-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 ""
-"एक उपयोगकर्ता का निर्माण, जिसकी उपयोगकर्ता पहचान संख्या ५०० से कम हो, की सलाह नहीं "
-"दी जाती है\n"
-"क्या आप वास्तव में ऐसा करना चाहते है?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
+msgstr "उपयोग-कर्ता जोड़ना"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "उपयोगकर्ता की उपयोगकर्ता-पहचान-संख्या ५०० से कम है"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "यूज़र-ड्रैक"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "उपयोगकर्ता पहचान संख्या: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "खाता समाप्ति की तिथि (वर्ष-ंमाह-दिवस) (YYYY-MM-DD):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "समूह चयन"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/कार्य-कलाप(_A)"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "'users' समूह में जोड़ना"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "विद्यमान समूह में जोड़ना"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "उपयोगकर्ता पहचान संख्या को स्वमं निर्दिष्ट करना"
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "इस नाम का एक समूह पहिले से विद्यमान है। आप क्या करना चाहेगें? "
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/संचिका (_F)"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "हाँ"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "नाम अत्याधिक लंबा है"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "ना"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "समाप्त"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "उपयोगकर्ता का नाम"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "गृह स्थल निर्देशिका: "
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/पुनः ताजा करें (_R)"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/सम्पादित करें(_E)"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<कन्ट्रोल>क्यू <control>Q"
+
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "समूह पहचान संख्या स्वमं निर्दिष्ट करें"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "समूह पहिले से विद्यमान है, कृपया अन्य समूह नाम का चयन करें"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "नाम क्षेत्र खाली है, कृपया एक नाम प्रदान करें"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr " समूह की समूह पहचान संख्या ५०० से कम है"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "सत्र-आरंभ"
 
-#: ../userdrake_.c:385
-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 ""
-"एक समूह निर्माण, जिसकी समूह पहचान संख्या ५०० से कम हो, की सलाह नहीं दी जाती है\n"
-"क्या आप वास्तव में ऐसा करना चाहते है?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/निर्गम(_Q)"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "समूह पहचान संख्या: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "इस नाम का एक समूह पहिले से विद्यमान है। आप क्या करना चाहेगें? "
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr "चेतावनी : उपयोगकर्ता को हटाया जा रहा है"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "मिटाना"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"%s उपयोगकर्ता को हटाया जा रहा है\n"
-"साथ ही, निम्नलिखित क्रियायें भी की जा रही है\n"
+"कृपया खाता समाप्ति के लिए \n"
+"वर्ष, माह और दिवस बतायें"
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "गृह स्थल निर्देशिका को हटायें  :%s"
+msgid "User Data"
+msgstr "उपयोग-कर्ता जानकारी"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "विपत्र-पेटी को हटायें :/var/spool/mail/%s"
+msgid "Refresh"
+msgstr "पुनः ताजा करना"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "पूरा नाम"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "चेतावनी : समूह को हटाया जा रहा है"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "क्या आप वास्तव में %s समूह को हटाना चाहते है\n"
+msgid " Group Gid is < 500"
+msgstr " समूह की समूह पहचान संख्या ५०० से कम है"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s , उपयोगकर्ता %s के लिए, एक प्रधान समूह है\n"
-" उपयोगकर्ता को पहिले हटायें"
+msgid "Edit selected row"
+msgstr "चयन की हुई पंक्ति का संपादन"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "सत्र-आरंभ"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "समूह का नाम"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "स्थिति"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "कूट-शब्द"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "कूट-शब्द की पुष्टि:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "कूट शब्द समाप्ति प्रक्रिया को सक्रिय करें"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "गॄह-स्थल"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "एस समूह में शामिल होने के लिए उपयोगकर्ताओं का चयन करें"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "उपयोग-कर्ता जानकारी"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "उपयोग-कर्ता"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "खाता समाप्ति प्रक्रिया को सक्रिय करें"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "दिन संख्या जिसके पहिले खाता निष्क्रिय होगा :"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "खाता समाप्ति की तिथि (वर्ष-ंमाह-दिवस) (YYYY-MM-DD):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "समूह पहचान संख्या"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "उपयोगकर्ता खाते को लॉक करें"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "ना"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "खाते के बारे में जानकारी"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/के बारे में(_A)..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "उपयोगकर्ता ने कूट शब्द को अंतिम बार इस तिथि को परिवर्तित किया था: "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/विकल्प(_O)"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "कूट शब्द समाप्ति प्रक्रिया को सक्रिय करें"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "उपयोग-कर्ता पहचान संख्या"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "दिन संख्या, जिसके पहिले परिवर्तन की अनुमति है :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "खाता समाप्ति प्रक्रिया को सक्रिय करें"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "दिन संख्या, जिसके पहिले परिवर्तन आवश्यक है :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "विपत्र-पेटी को हटायें :/var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "दिन संख्या, जिसके पहिले परिवर्तन की चेतावनी मिलेगी :"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "उपयोग-कर्ता सूची को पुनः ताजा करना"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "दिन संख्या जिसके पहिले खाता निष्क्रिय होगा :"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/सहायता(_H)"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "कूट-शब्द सूचना"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "गृह स्थल निर्देशिका को हटायें  :%s"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "उपयोगकर्ता प्रबंधन \n"
+
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "उन समूहों का चयन करें जिनका यह उपयोगकर्ता एक सदस्य होगा:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "समूह जानकारी"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "एस समूह में शामिल होने के लिए उपयोगकर्ताओं का चयन करें"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "ताला-बन्द"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "समूह उपयोगकर्ता"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "समूह जोड़ना"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "कृपया इस उपयोगकर्ता के लिए कम-से-कम एक समूह का चयन करें"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"कृपया खाता समाप्ति के लिए \n"
-"वर्ष, माह और दिवस बतायें"
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "उपयोगकर्ता ने कूट शब्द को अंतिम बार इस तिथि को परिवर्तित किया था: "
 
-#: ../userdrake_.c:753
-#, fuzzy
-msgid "Please fill up all fields in password aging\n"
-msgstr "कृपया कूट-शब्द आयु के लिए सभी क्षेत्रों के बारे में निर्दिष्ट करें\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/दोष के बारे में बतायें(_R)"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "आप, '%s' उपयोगकर्ता को उसके प्रधान समूह से नहीं हटा सकते है"
+msgid "Yes"
+msgstr "हाँ"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "समाप्त"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "समूह जानकारी"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "यूज़र-ड्रैक"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "समूह पहचान संख्या: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "लेखकों के नाम: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "कूट-शब्द की पुष्टि:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "उपयोगकर्ता प्रबंधन \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/उपयोग-कर्ता जोड़े(_A)"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "सर्वाधिकार © २००३ मैनड्रैकसॉफ़्ट एस०ऐ०"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/प्रणाली उपयोगकर्ताओं को अलग करें(_F)"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "नाम क्षेत्र खाली है, कृपया एक नाम प्रदान करें"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "कूट-शब्द सूचना"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "नाम में सिर्फ़ लैटिन छोटे अक्षर, संख्याऐं, `-' और `_' शामिल होना चाहिए"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "खोज:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "नाम अत्याधिक लंबा है"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "विद्यमान समूह में जोड़ना"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "त्रुटि"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "समूह चयन"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "फ़िल्टर लगायें"
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "यूज़रड्रैक पर सामान्य सहायता"
diff --git a/po/hr.po b/po/hr.po
index 00b7827..9c210a5 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+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,460 +17,539 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr ""
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/_Actions"
-msgstr "Radnje"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Autorska prava (C) 2003 MandrakeSoft."
 
-#: ../userdrake_.c:66
-#, fuzzy
-msgid "/_Edit"
-msgstr "Podesi"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Users"
+msgstr "Grupe"
 
-#: ../userdrake_.c:67
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "/_Delete"
 msgstr "Ukloni"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
+#: ../userdrake:1
+#, c-format
+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:68 ../userdrake_.c:80
-#, fuzzy
-msgid "/_Options"
-msgstr "Radnje"
-
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_Datoteka"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Login Shell"
+msgstr "Korisni�ka oznaka"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Podesi"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/Dodaj _korisnika"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/Dodaj _grupu"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/_Pomo�"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Members"
+msgstr "Grupe"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_O programu..."
-
-#: ../userdrake_.c:103
-msgid "Apply filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Korisnici"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Create Home Directory"
+msgstr "Korisnikov direktorij"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Grupe"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr ""
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Home Directory"
 msgstr "Korisnikov direktorij"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-#, fuzzy
-msgid "Login Shell"
-msgstr "Korisni�ka oznaka"
-
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake_.c:122
-msgid "Status"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User ID"
-msgstr "Korisnik"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User Name"
-msgstr "Userdrake"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group ID"
-msgstr "Grupa"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group Members"
-msgstr "Grupe"
-
-#: ../userdrake_.c:129 ../userdrake_.c:565
-#, fuzzy
-msgid "Group Name"
-msgstr "Grupa"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr "Dodaj korisnika"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
 msgstr ""
 
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "Dodaj grupu"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add a group to the system"
-msgstr "Dodaj grupu"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/Dodaj _grupu"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Podesi"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr ""
 
-#: ../userdrake_.c:137
-msgid "Edit selected row"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Ukloni"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete selected row"
+#: ../userdrake:1
+#, c-format
+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:139
-msgid "Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:139
-#, fuzzy
-msgid "Refresh the list"
-msgstr "Lista korisnika"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add a group to the system"
+msgstr "Dodaj grupu"
 
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:168
-msgid "Locked"
+#: ../userdrake:1
+#, c-format
+msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Grupe"
 
-#: ../userdrake_.c:225 ../userdrake_.c:364
-msgid "Create New User"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:232
-#, fuzzy
-msgid "Create Home Directory"
-msgstr "Korisnikov direktorij"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr ""
 
-#: ../userdrake_.c:234
-#, fuzzy
-msgid "Home Directory: "
-msgstr "Korisnikov direktorij"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr ""
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:251
-#, fuzzy
-msgid "User already exists, please choose another User Name"
-msgstr "Ovo ime ve� postoji u sustavu"
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Korisni�ki direktorij"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Password Mismatch"
 msgstr "Lozinka"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Ovo ime ve� postoji u sustavu"
 
-#: ../userdrake_.c:265
-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:1
+#, c-format
+msgid "Add User"
+msgstr "Dodaj korisnika"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Actions"
+msgstr "Radnje"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/_Datoteka"
 
-#: ../userdrake_.c:355
-msgid "Yes"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:359
-msgid "No"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
 msgstr ""
 
-#: ../userdrake_.c:370
-msgid "Specify group ID manually"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User Name"
+msgstr "Userdrake"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Home Directory: "
+msgstr "Korisnikov direktorij"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Edit"
+msgstr "Podesi"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid ""
-"Creating a group with a GID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:400
-msgid "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Korisni�ka oznaka"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Ukloni"
+
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, fuzzy, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Korisnikov direktorij"
+msgid "User Data"
+msgstr "Lista korisnika"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
+msgid "Refresh"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
+msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
+msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Korisni�ka oznaka"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Name"
+msgstr "Grupa"
+
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr ""
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Lozinka"
 
-#: ../userdrake_.c:553
-#, fuzzy
-msgid "Confirm Password:"
-msgstr "Lozinka"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr ""
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Korisni�ki direktorij"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr ""
 
-#: ../userdrake_.c:593
-#, fuzzy
-msgid "User Data"
-msgstr "Lista korisnika"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Korisnici"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group ID"
+msgstr "Grupa"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
+#: ../userdrake:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_O programu..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Options"
+msgstr "Radnje"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User ID"
+msgstr "Korisnik"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Refresh the list"
+msgstr "Lista korisnika"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_Pomo�"
 
-#: ../userdrake_.c:622
-#, fuzzy
-msgid "Password Info"
-msgstr "Lozinka"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Korisnikov direktorij"
 
-#: ../userdrake_.c:626
-msgid "Select the groups that the user will be a member of:"
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:671
-#, fuzzy
-msgid "Group Data"
-msgstr "Lista grupa"
+#: ../userdrake:1
+#, c-format
+msgid "Select the groups that the user will be a member of:"
+msgstr ""
 
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:675
-#, fuzzy
-msgid "Group Users"
-msgstr "Grupe"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "Dodaj grupu"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
+msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:900
-msgid "Close"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Data"
+msgstr "Lista grupa"
+
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Confirm Password:"
+msgstr "Lozinka"
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/Dodaj _korisnika"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Autorska prava (C) 2003 MandrakeSoft."
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Password Info"
+msgstr "Lozinka"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
 msgstr ""
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:931
-msgid "Error"
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
 msgstr ""
 
 #~ msgid "Help"
diff --git a/po/hu.po b/po/hu.po
index 35c30f3..0828084 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-hu\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-08-17 10:08+0200\n"
 "Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
 "Language-Team: Hungarian\n"
@@ -17,456 +17,557 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Mandrake Linux felhaszn�l�kezel� eszk�z"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/M�_veletek"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright (C) Mandrakesoft SA, 2003."
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/M�_dos�t�s"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Csoport felhaszn�l�i"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_T�rl�s"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/A r_endszerfelhaszn�l�k kisz�r�se"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/Be�_ll�t�sok"
+#: ../userdrake:1
+#, c-format
+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 ""
+"500-n�l kisebb azonos�t�j� csoportot nem aj�nlott l�trehozni.\n"
+" Biztosan ezt szeretn�?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_F�jl"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Parancs�rtelmez�"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/F_riss�t�s"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Priv�t csoport l�trehoz�sa a felhaszn�l�hoz"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/_Kil�p�s"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "M�dos�t�s"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "�j felhaszn�l� l�trehoz�sa"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/�j _felhaszn�l�"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "A felhaszn�l� jellemz�i"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/�j _csoport"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "Figyelmeztet�s: a felhaszn�l� t�rl�se"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/_Seg�ts�g"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Hiba t�rt�nt"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_Hibabejelent�s"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "A csoport tagjai"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/N�v_jegy..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "Figyelmeztet�s a jelsz�m�dos�t�sra ennyi nappal kor�bban:"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "Sz�r� alkalmaz�sa"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "A kijel�lt sor t�rl�se"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Felhaszn�l�k"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "Saj�t k�nyvt�r l�trehoz�sa"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Csoportok"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "Felhaszn�l�az.: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Teljes n�v"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr ""
+"A n�vben csak angol kisbet�k, sz�mjegyek, a '-' �s az '_' karakterek "
+"szerepelhetnek"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Saj�t k�nyvt�r"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Parancs�rtelmez�"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"A megadott jelsz� t�ls�gosan egyszer�. \n"
+" Legal�bb 7 karakter hossz� jelsz�t �rdemes v�lasztani."
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Els�dleges csoport"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "Jelsz�m�dos�t�s legk�s�bb ennyi nap m�lva:"
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "�llapot"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "Val�ban t�r�lni k�v�nja a(z) %s csoportot?\n"
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "Felhaszn�l�az."
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "A lej�rattal kapcsolatos �sszes mez�t ki kell t�lteni\n"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Felhaszn�l�n�v"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "Kattintson az ikonra annak megv�ltoztat�s�hoz"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "Csoportaz."
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"A(z) %s csoport a(z) %s felhaszn�l� els�dleges csoportja.\n"
+" El�sz�r a felhaszn�l�t kell t�r�lni"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "A csoport tagjai"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/�j _csoport"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "A csoport neve"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "A(z) '%s' felhaszn�l�n�v nem t�vol�that� el az els�dleges csoportj�b�l"
 
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr "�j felhaszn�l�"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Mandrake Linux felhaszn�l�kezel� eszk�z"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "�j felhaszn�l� l�trehoz�sa"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "Ilyen nev� csoport m�r l�tezik, v�lasszon m�s nevet."
 
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "�j csoport"
+#: ../userdrake:1
+#, c-format
+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 ""
+"500-n�l kisebb azonos�t�j� felhaszn�l�t nem aj�nlott l�trehozni.\n"
+" Biztosan ezt szeretn�?\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "A program szerz�i: "
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "�j csoport l�trehoz�sa"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "M�dos�t�s"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "A kijel�lt sor szerkeszt�se"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "T�rl�s"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "A kijel�lt sor t�rl�se"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Friss�t�s"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "A lista felfriss�t�se"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "Lej�rt"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "Z�rolt"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "Kattintson az ikonra annak megv�ltoztat�s�hoz"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "�j felhaszn�l� l�trehoz�sa"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "Saj�t k�nyvt�r l�trehoz�sa"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Csoportok"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "A saj�t k�nyvt�r: "
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Els�dleges csoport"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Priv�t csoport l�trehoz�sa a felhaszn�l�hoz"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "A felhaszn�l� azonos�t�ja kisebb 500-n�l"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "A felhaszn�l�azonos�t� megad�sa"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "A felhaszn�l�n�v z�rol�sa"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "M�r l�tezik ilyen nev� felhaszn�l�, v�lasszon m�s nevet."
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
+"\"%s\" felhaszn�l� t�rl�se\n"
+"A k�vetkez�k is v�gre lesznek hajtva:\n"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "Jelsz�m�dos�t�s legkor�bban ennyi nap m�lva:"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Saj�t k�nyvt�r"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "A jelszavak nem egyeznek meg"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"A megadott jelsz� t�ls�gosan egyszer�. \n"
-" Legal�bb 7 karakter hossz� jelsz�t �rdemes v�lasztani."
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "M�r l�tezik ilyen nev� felhaszn�l�, v�lasszon m�s nevet."
 
-#: ../userdrake_.c:265
-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 ""
-"500-n�l kisebb azonos�t�j� felhaszn�l�t nem aj�nlott l�trehozni.\n"
-" Biztosan ezt szeretn�?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
+msgstr "�j felhaszn�l�"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "A felhaszn�l� azonos�t�ja kisebb 500-n�l"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "Felhaszn�l�az.: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "A lej�r�s d�tuma (����-HH-NN):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "V�lasszon egy csoportot"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/M�_veletek"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "Hozz�ad�s a 'users' nev� csoporthoz"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Hozz�ad�s a m�r l�tez� csoporthoz"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "A felhaszn�l�azonos�t� megad�sa"
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "M�r l�tezik ilyen nev� csoport. Mit szeretne tenni?"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/_F�jl"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Igen"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "A megadott n�v t�l hossz�"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "Nem"
+# Connection Type: "Start tls", "ssl" vagy "Clear"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Bez�r�s"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Felhaszn�l�n�v"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "A saj�t k�nyvt�r: "
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/F_riss�t�s"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/M�_dos�t�s"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "A csoportazonos�t� megad�sa"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "Ilyen nev� csoport m�r l�tezik, v�lasszon m�s nevet."
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "A 'n�v' mez� nem lehet �res"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr " A csoportazonos�t� kisebb 500-n�l"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Bejelentkez�si n�v"
 
-#: ../userdrake_.c:385
-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 ""
-"500-n�l kisebb azonos�t�j� csoportot nem aj�nlott l�trehozni.\n"
-" Biztosan ezt szeretn�?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/_Kil�p�s"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "Csoportaz.: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "M�r l�tezik ilyen nev� csoport. Mit szeretne tenni?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr "Figyelmeztet�s: a felhaszn�l� t�rl�se"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "T�rl�s"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"\"%s\" felhaszn�l� t�rl�se\n"
-"A k�vetkez�k is v�gre lesznek hajtva:\n"
+"Adja meg a felhaszn�l�n�v lej�r�s�nak d�tum�t\n"
+" (�v, h�nap, nap) "
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Saj�t k�nyvt�r t�rl�se: %s"
+msgid "User Data"
+msgstr "Felhaszn�l�i adatok"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "Postal�da t�rl�se: /var/spool/mail/%s"
+msgid "Refresh"
+msgstr "Friss�t�s"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Teljes n�v"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "Figyelmeztet�s: a csoport t�rl�se"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "Val�ban t�r�lni k�v�nja a(z) %s csoportot?\n"
+msgid " Group Gid is < 500"
+msgstr " A csoportazonos�t� kisebb 500-n�l"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"A(z) %s csoport a(z) %s felhaszn�l� els�dleges csoportja.\n"
-" El�sz�r a felhaszn�l�t kell t�r�lni"
+msgid "Edit selected row"
+msgstr "A kijel�lt sor szerkeszt�se"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Bejelentkez�si n�v"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "A csoport neve"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "�llapot"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Jelsz�"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "M�g egyszer:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "A jelsz� lej�r�s�nak bekapcsol�sa"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Saj�t k�nyvt�r"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "V�lassza ki, mely felhaszn�l�kat szeretn� a csoporthoz adni:"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Felhaszn�l�i adatok"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Felhaszn�l�k"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "A felhaszn�l�nevek lej�r�s�nak bekapcsol�sa"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "A felhaszn�l�n�v letilt�sa ennyi nap eltelt�vel:"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "A lej�r�s d�tuma (����-HH-NN):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "Csoportaz."
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "A felhaszn�l�n�v z�rol�sa"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "Nem"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "A felhaszn�l� jellemz�i"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/N�v_jegy..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "A legut�bbi jelsz�v�ltoztat�s d�tuma: "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/Be�_ll�t�sok"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "A jelsz� lej�r�s�nak bekapcsol�sa"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "Felhaszn�l�az."
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "Jelsz�m�dos�t�s legkor�bban ennyi nap m�lva:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "A felhaszn�l�nevek lej�r�s�nak bekapcsol�sa"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "Jelsz�m�dos�t�s legk�s�bb ennyi nap m�lva:"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "Postal�da t�rl�se: /var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "Figyelmeztet�s a jelsz�m�dos�t�sra ennyi nappal kor�bban:"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "A lista felfriss�t�se"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "A felhaszn�l�n�v letilt�sa ennyi nap eltelt�vel:"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_Seg�ts�g"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "A jelsz� jellemz�i"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Saj�t k�nyvt�r t�rl�se: %s"
+
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Felhaszn�l�kezel�s \n"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "V�lassza ki, hogy a felhaszn�l� mely csoportokhoz tartozzon:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "A csoport adatai"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "V�lassza ki, mely felhaszn�l�kat szeretn� a csoporthoz adni:"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "Z�rolt"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Csoport felhaszn�l�i"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "�j csoport"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "Legal�bb egy csoportot ki kell v�lasztani"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Adja meg a felhaszn�l�n�v lej�r�s�nak d�tum�t\n"
-" (�v, h�nap, nap) "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "A legut�bbi jelsz�v�ltoztat�s d�tuma: "
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
-msgstr "A lej�rattal kapcsolatos �sszes mez�t ki kell t�lteni\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Hibabejelent�s"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "A(z) '%s' felhaszn�l�n�v nem t�vol�that� el az els�dleges csoportj�b�l"
+msgid "Yes"
+msgstr "Igen"
 
-# Connection Type: "Start tls", "ssl" vagy "Clear"
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Bez�r�s"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "A csoport adatai"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "Csoportaz.: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "A program szerz�i: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "M�g egyszer:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Felhaszn�l�kezel�s \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/�j _felhaszn�l�"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright (C) Mandrakesoft SA, 2003."
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/A r_endszerfelhaszn�l�k kisz�r�se"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "A 'n�v' mez� nem lehet �res"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "A jelsz� jellemz�i"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr ""
-"A n�vben csak angol kisbet�k, sz�mjegyek, a '-' �s az '_' karakterek "
-"szerepelhetnek"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Keres�s:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "A megadott n�v t�l hossz�"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Hozz�ad�s a m�r l�tez� csoporthoz"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Hiba t�rt�nt"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "V�lasszon egy csoportot"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "Sz�r� alkalmaz�sa"
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "�ltal�nos seg�ts�g a program haszn�lat�hoz"
diff --git a/po/id.po b/po/id.po
index c26849b..c4eb30a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-08-12 10:19+0900\n"
 "Last-Translator: Budi Rachmanto <rac@linux-mandrake.com>\n"
 "Language-Team: Bahasa Indonesia <id@li.org>\n"
@@ -16,457 +16,557 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Manajer Pengguna Linux Mandrake"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_Aksi"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Hakcipta (C) 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_Edit"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Pengguna Grup"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_Hapus"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Saring pengguna sistem"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_Opsi"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Membuat grup dg GID kurang dari 500 tak disarankan.\n"
+" Anda yakin ingin melakukannya?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_File"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Cangkang Login"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/Penyega_ran"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Buat grup privat utk pengguna"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/_Keluar"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Edit"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>K"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "Tambah pengguna ke sistem"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/T_ambah Pengguna"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Info Account"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/Tambah _Grup"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "Awas : Pengguna Dihapus"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/Per_tolongan"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Error"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_Laporan Kutu"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "Anggota Grup"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_Keterangan"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "Jumlah hari peringatan sebelum perubahan :"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "Terapkan filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Hapus baris terpilih"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Pengguna"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "Buat Direktori Rumah"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Grup"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Nama Lengkap"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr "Nama harus berisi hanya huruf kecil, angka, `-' dan `_'"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Direktori Rumah"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Cangkang Login"
-
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Grup Utama"
-
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Status"
-
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "ID Pengguna"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"Katasandi terlalu mudah.\n"
+" Yg baik harus lebih dari 6 karakter"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Nama Pengguna"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "Jumlah hari sebelum perubahan dibutuhkan :"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "ID Grup"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "Benar-benar ingin menghapus grup %s\n"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "Anggota Grup"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Tentukan semua isian utk umur katasandi\n"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Nama Grup"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "Klik ikon utk mengubahnya"
 
-# broken into two lines to avoid too large a button
-#: ../userdrake_.c:135
-msgid "Add User"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
 msgstr ""
-"Tambah\n"
-"Pengguna"
-
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "Tambah pengguna ke sistem"
-
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "Tambah Grup"
+"%s adalah grup utama pengguna %s\n"
+" Hapus dulu pengguna"
 
-#: ../userdrake_.c:136
-msgid "Add a group to the system"
-msgstr "Tambah grup ke sistem"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/Tambah _Grup"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Edit"
+#: ../userdrake:1
+#, 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:137
-msgid "Edit selected row"
-msgstr "Edit baris terpilih"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Manajer Pengguna Linux Mandrake"
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Hapus"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "Grup sudah ada, pilihlah Nama Grup lain"
 
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Hapus baris terpilih"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Membuat pengguna dg UID kurang dari 500 tak disarankan.\n"
+" Anda yakin ingin melakukannya?\n"
+"\n"
 
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Penyegaran"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Pengarang: "
 
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Segarkan daftar"
+#: ../userdrake:1
+#, c-format
+msgid "Add a group to the system"
+msgstr "Tambah grup ke sistem"
 
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "Kadaluarsa"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "Terkunci"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "Klik ikon utk mengubahnya"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Buat Pengguna Baru"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "Buat Direktori Rumah"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Grup"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Direktori Rumah:"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Grup Utama"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Buat grup privat utk pengguna"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "Uid pengguna < 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "Tentukan ID pengguna secara manual"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "Kunci Account Pengguna"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "Nama ini sudah dipakai, pilihlah nama lain"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
+"Pengguna %s sedang dihapus\n"
+" Aksi berikut juga dijalankan\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "Jumlah hari sebelum perubahan diizinkan :"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Rumah"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "Katasandi Tak Cocok"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"Katasandi terlalu mudah.\n"
-" Yg baik harus lebih dari 6 karakter"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Nama ini sudah dipakai, pilihlah nama lain"
 
-#: ../userdrake_.c:265
-msgid ""
-"Creating a user with a UID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+# broken into two lines to avoid too large a button
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
 msgstr ""
-"Membuat pengguna dg UID kurang dari 500 tak disarankan.\n"
-" Anda yakin ingin melakukannya?\n"
-"\n"
+"Tambah\n"
+"Pengguna"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "Uid pengguna < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "Account kadaluarsa (MM-DD-YYYY):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "Pilih Grup"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_Aksi"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "Tambah ke grup 'pengguna'"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Tambah ke grup yg telah ada"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "Tentukan ID pengguna secara manual"
 
-#: ../userdrake_.c:334
-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:1
+#, c-format
+msgid "/_File"
+msgstr "/_File"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Ya"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "Nama terlalu panjang"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "Tidak"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Tutup"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Nama Pengguna"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Direktori Rumah:"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/Penyega_ran"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_Edit"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>K"
+
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "Tentukan ID grup secara manual"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "Grup sudah ada, pilihlah Nama Grup lain"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "Isian nama kosong, berikanlah satu nama"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr " Gid grup < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Login"
 
-#: ../userdrake_.c:385
-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 ""
-"Membuat grup dg GID kurang dari 500 tak disarankan.\n"
-" Anda yakin ingin melakukannya?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/_Keluar"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+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:449
-msgid "Warning : Deleting User"
-msgstr "Awas : Pengguna Dihapus"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Hapus"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"Pengguna %s sedang dihapus\n"
-" Aksi berikut juga dijalankan\n"
+"Tentukan Tahun, Bulan dan Hari\n"
+" Kadaluarsa Account"
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Hapus Direktori rumah:%s"
+msgid "User Data"
+msgstr "Data Pengguna"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "Hapus Kotaksurat :/var/spool/mail/%s"
+msgid "Refresh"
+msgstr "Penyegaran"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Nama Lengkap"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "Awas : Grup Dihapus"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "Benar-benar ingin menghapus grup %s\n"
+msgid " Group Gid is < 500"
+msgstr " Gid grup < 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s adalah grup utama pengguna %s\n"
-" Hapus dulu pengguna"
+msgid "Edit selected row"
+msgstr "Edit baris terpilih"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Login"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Nama Grup"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Status"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Katakunci"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Konfirmasi Katasandi:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "Aktifkan Kadaluarsa Katasandi"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Rumah"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "Pilih pengguna yg bergabung dg grup ini :"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Data Pengguna"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Pengguna"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "Aktifkan kadaluarsa account"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "Jumlah hari sebelum account non-aktif :"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "Account kadaluarsa (MM-DD-YYYY):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "ID Grup"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "Kunci Account Pengguna"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "Tidak"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Info Account"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_Keterangan"
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "Katasandi diubah terakhir pada : "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Opsi"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "Aktifkan Kadaluarsa Katasandi"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "ID Pengguna"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "Jumlah hari sebelum perubahan diizinkan :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "Aktifkan kadaluarsa account"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "Jumlah hari sebelum perubahan dibutuhkan :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "Hapus Kotaksurat :/var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "Jumlah hari peringatan sebelum perubahan :"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Segarkan daftar"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "Jumlah hari sebelum account non-aktif :"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/Per_tolongan"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Info Katasandi"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Hapus Direktori rumah:%s"
+
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Manajemen Pengguna \n"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Pilihlah grup-grup yg akan diikuti pengguna:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "Data Grup"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "Pilih pengguna yg bergabung dg grup ini :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "Terkunci"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Pengguna Grup"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "Tambah Grup"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "Pilihlah setidaknya satu grup utk pengguna"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Tentukan Tahun, Bulan dan Hari\n"
-" Kadaluarsa Account"
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "Katasandi diubah terakhir pada : "
 
-#: ../userdrake_.c:753
-#, fuzzy
-msgid "Please fill up all fields in password aging\n"
-msgstr "Tentukan semua isian utk umur katasandi\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Laporan Kutu"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Anda tak dapat menghapus pengguna '%s' dari grup utama mereka"
+msgid "Yes"
+msgstr "Ya"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Tutup"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Data Grup"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Pengarang: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Konfirmasi Katasandi:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Manajemen Pengguna \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/T_ambah Pengguna"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Hakcipta (C) 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Saring pengguna sistem"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "Isian nama kosong, berikanlah satu nama"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "Info Katasandi"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "Nama harus berisi hanya huruf kecil, angka, `-' dan `_'"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Cari:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "Nama terlalu panjang"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Tambah ke grup yg telah ada"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Error"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "Pilih Grup"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "Terapkan filter"
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "Pertolongan userdrake"
diff --git a/po/it.po b/po/it.po
index a9d670d..24562a5 100644
--- a/po/it.po
+++ b/po/it.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+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,469 +22,539 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr ""
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/_Actions"
-msgstr "Azioni"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright � 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-#, fuzzy
-msgid "/_Edit"
-msgstr "Modifica"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Users"
+msgstr "Gruppi"
 
-#: ../userdrake_.c:67
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "/_Delete"
 msgstr "Elimina"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
+#: ../userdrake:1
+#, c-format
+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:68 ../userdrake_.c:80
-#, fuzzy
-msgid "/_Options"
-msgstr "Azioni"
-
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-#, fuzzy
-msgid "/_File"
-msgstr "File"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Login Shell"
+msgstr "Login"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Modifica"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:76
-#, fuzzy
-msgid "/_Add User"
-msgstr "Aggiungi utente"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/Add _Group"
-msgstr "Aggiungi gruppo"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-#, fuzzy
-msgid "/_Help"
-msgstr "Aiuto"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Members"
+msgstr "Gruppi"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:88
-#, fuzzy
-msgid "/_About..."
-msgstr "A proposito"
-
-#: ../userdrake_.c:103
-msgid "Apply filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Utenti"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Create Home Directory"
+msgstr "Directory home dell'utente"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Gruppi"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr ""
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Home Directory"
 msgstr "Directory home dell'utente"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-#, fuzzy
-msgid "Login Shell"
-msgstr "Login"
-
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "Status"
-msgstr "Avvia tls"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User ID"
-msgstr "Utente"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User Name"
-msgstr "Userdrake"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group ID"
-msgstr "Gruppo"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr ""
 
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group Members"
-msgstr "Gruppi"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-#, fuzzy
-msgid "Group Name"
-msgstr "Gruppo"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-#, fuzzy
-msgid "Add User"
-msgstr "Aggiungi utente"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr ""
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add Group"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/Add _Group"
 msgstr "Aggiungi gruppo"
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add a group to the system"
-msgstr "Aggiungi un gruppo"
-
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Modifica"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr ""
 
-#: ../userdrake_.c:137
-msgid "Edit selected row"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Elimina"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete selected row"
+#: ../userdrake:1
+#, c-format
+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:139
-msgid "Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:139
-#, fuzzy
-msgid "Refresh the list"
-msgstr "Lista degli utenti"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add a group to the system"
+msgstr "Aggiungi un gruppo"
 
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:168
-msgid "Locked"
+#: ../userdrake:1
+#, c-format
+msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Gruppi"
 
-#: ../userdrake_.c:225 ../userdrake_.c:364
-msgid "Create New User"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:232
-#, fuzzy
-msgid "Create Home Directory"
-msgstr "Directory home dell'utente"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr ""
 
-#: ../userdrake_.c:234
-#, fuzzy
-msgid "Home Directory: "
-msgstr "Directory home dell'utente"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr ""
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:251
-#, fuzzy
-msgid "User already exists, please choose another User Name"
-msgstr "Questo nome � gi� presente nel sistema"
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Home"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Password Mismatch"
 msgstr "Password"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Questo nome � gi� presente nel sistema"
 
-#: ../userdrake_.c:265
-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:1
+#, fuzzy, c-format
+msgid "Add User"
+msgstr "Aggiungi utente"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Actions"
+msgstr "Azioni"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_File"
+msgstr "File"
+
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:355
-msgid "Yes"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Close"
+msgstr "Pulisci"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User Name"
+msgstr "Userdrake"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Home Directory: "
+msgstr "Directory home dell'utente"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:359
-msgid "No"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Edit"
+msgstr "Modifica"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Login"
 
-#: ../userdrake_.c:385
-msgid ""
-"Creating a group with a GID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:400
-msgid "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Elimina"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, fuzzy, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Directory home dell'utente"
+msgid "User Data"
+msgstr "Lista degli utenti"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
+msgid "Refresh"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
+msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
+msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Login"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Name"
+msgstr "Gruppo"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Status"
+msgstr "Avvia tls"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Password"
 
-#: ../userdrake_.c:553
-#, fuzzy
-msgid "Confirm Password:"
-msgstr "Password:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr ""
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Home"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr ""
 
-#: ../userdrake_.c:593
-#, fuzzy
-msgid "User Data"
-msgstr "Lista degli utenti"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Utenti"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group ID"
+msgstr "Gruppo"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
+#: ../userdrake:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_About..."
+msgstr "A proposito"
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Options"
+msgstr "Azioni"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User ID"
+msgstr "Utente"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Refresh the list"
+msgstr "Lista degli utenti"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Help"
+msgstr "Aiuto"
 
-#: ../userdrake_.c:622
-#, fuzzy
-msgid "Password Info"
-msgstr "Password"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Directory home dell'utente"
 
-#: ../userdrake_.c:626
-msgid "Select the groups that the user will be a member of:"
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:671
-#, fuzzy
-msgid "Group Data"
-msgstr "Lista dei gruppi"
+#: ../userdrake:1
+#, c-format
+msgid "Select the groups that the user will be a member of:"
+msgstr ""
 
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:675
-#, fuzzy
-msgid "Group Users"
-msgstr "Gruppi"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add Group"
+msgstr "Aggiungi gruppo"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
+msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:900
-#, fuzzy
-msgid "Close"
-msgstr "Pulisci"
-
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Data"
+msgstr "Lista dei gruppi"
 
-#: ../userdrake_.c:912
-msgid "Authors: "
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Confirm Password:"
+msgstr "Password:"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright � 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Add User"
+msgstr "Aggiungi utente"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Password Info"
+msgstr "Password"
+
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Cerca:"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:931
-msgid "Error"
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
 msgstr ""
 
 #~ msgid "Help"
diff --git a/po/ja.po b/po/ja.po
index 1e6925c..38959df 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-ja\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-07-27 18:59+0900\n"
 "Last-Translator: UTUMI Hirosi <*>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -20,454 +20,552 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Mandrake Linuxのユーザ管理ツール"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/アクション(_A)"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright (C) 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/編集(_E)"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "グループユーザ"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/削除(_D)"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/システムユーザをフィルタ(_F)"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/オプション(_O)"
+#: ../userdrake:1
+#, c-format
+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 ""
+"GIDが500以下のグループを作成するのはおすすめできません。\n"
+" 本当に作成しますか？\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/ファイル(_F)"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "ログインシェル"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/更新(_R)"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "ユーザのプライベートグループを作成"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/終了(_Q)"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "編集"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "システムにユーザを追加"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/ユーザを追加(_A)"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "アカウントの情報"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/グループを追加(_G)"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/ヘルプ(_H)"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "エラー"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/バグを報告(_R)"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "グループのメンバ"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_About.."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "変更前に警告する日数 :"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "フィルタを適用"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "選択した欄を削除"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "ユーザ"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Create Home Directory"
+msgstr "ホームディレクトリを作成"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "グループ"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "フルネーム"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr "名前は小文字,数字,`-',`_'で入力してください"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "ホームディレクトリ"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "ログインシェル"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"このパスワードは簡単すぎます。 \n"
+" パスワードは６文字以上にしてください"
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "第１グループ"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "変更を求めるまでの日数 :"
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "状態"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "ユーザのID"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "パスワード期限の全ての欄を埋めてください\n"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "ユーザ名"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr ""
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "グループのID"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s はユーザ %s の第１グループです。\n"
+" 先にユーザを削除してください"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "グループのメンバ"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/グループを追加(_G)"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "グループ名"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "ユーザ '%s' を第１グループから削除することはできません"
 
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr "ユーザを追加"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Mandrake Linuxのユーザ管理ツール"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "システムにユーザを追加"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "グループは既に存在します。別のグループ名を選んでください"
 
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "グループを追加"
+#: ../userdrake:1
+#, c-format
+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 ""
+"UIDが500以下のユーザを作成するのはおすすめできません。\n"
+"本当に作成しますか？\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "作者: "
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "システムにグループを追加"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "編集"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "選択した欄を編集"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "削除"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "選択した欄を削除"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "更新"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "リストを更新"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "期限切れ"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "ロック"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr ""
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "新規ユーザを作成"
 
-#: ../userdrake_.c:232
-#, fuzzy
-msgid "Create Home Directory"
-msgstr "ホームディレクトリを作成"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "グループ"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "ホームディレクトリ: "
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "第１グループ"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "ユーザのプライベートグループを作成"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "ユーザのUIDが500以下です"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "ユーザのIDを手動で指定"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "ユーザのアカウントをロック"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "その名前は既に使われています。別のユーザ名を選んでください"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "変更を許可するまでの日数 :"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "ホーム"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "パスワードが合っていません"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"このパスワードは簡単すぎます。 \n"
-" パスワードは６文字以上にしてください"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "その名前は既に使われています。別のユーザ名を選んでください"
 
-#: ../userdrake_.c:265
-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 ""
-"UIDが500以下のユーザを作成するのはおすすめできません。\n"
-"本当に作成しますか？\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
+msgstr "ユーザを追加"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "ユーザのUIDが500以下です"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "アカウントの期限 [(例) 2008-08-27]:"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "グループを選択"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/アクション(_A)"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "'ユーザ'のグループに追加"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "既存のグループに追加"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "ユーザのIDを手動で指定"
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "このグループ名は既に存在します。どうしますか？"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/ファイル(_F)"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "はい"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "名前が長すぎます"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "いいえ"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "閉じる"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "ユーザ名"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "ホームディレクトリ: "
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/更新(_R)"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/編集(_E)"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "グループのIDを手動で指定"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "グループは既に存在します。別のグループ名を選んでください"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "名前欄が空白です。入力してください"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr " グループのGIDが500以下です"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "ログイン"
 
-#: ../userdrake_.c:385
-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 ""
-"GIDが500以下のグループを作成するのはおすすめできません。\n"
-" 本当に作成しますか？\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/終了(_Q)"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "このグループ名は既に存在します。どうしますか？"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "削除"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
+"アカウントの期限として \n"
+"年,月,日を指定してください "
 
-#: ../userdrake_.c:453
-#, fuzzy, c-format
-msgid "Delete Home Directory :%s"
-msgstr "ホームディレクトリを作成"
+#: ../userdrake:1
+#, c-format
+msgid "User Data"
+msgstr "ユーザのデータ"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr ""
+msgid "Refresh"
+msgstr "更新"
+
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "フルネーム"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr ""
+msgid " Group Gid is < 500"
+msgstr " グループのGIDが500以下です"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s はユーザ %s の第１グループです。\n"
-" 先にユーザを削除してください"
+msgid "Edit selected row"
+msgstr "選択した欄を編集"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "ログイン"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "グループ名"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "状態"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "パスワード"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "パスワードを確認:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "パスワードの期限を有効にする"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "ホーム"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "このグループに参加するユーザを選んでください :"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "ユーザのデータ"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "ユーザ"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "アカウントの期限を有効にする"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "アカウントを無効にするまでの日数 :"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "アカウントの期限 [(例) 2008-08-27]:"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "グループのID"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "ユーザのアカウントをロック"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "いいえ"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "アカウントの情報"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_About.."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "ユーザのパスワードの最終変更 : "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/オプション(_O)"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "パスワードの期限を有効にする"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "ユーザのID"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "変更を許可するまでの日数 :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "アカウントの期限を有効にする"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "変更を求めるまでの日数 :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr ""
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "変更前に警告する日数 :"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "リストを更新"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "アカウントを無効にするまでの日数 :"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/ヘルプ(_H)"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "パスワードの情報"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Delete Home Directory :%s"
+msgstr "ホームディレクトリを作成"
+
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "ユーザの管理 \n"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "ユーザが所属するグループを選んでください:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "グループのデータ"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "このグループに参加するユーザを選んでください :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "ロック"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "グループユーザ"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "グループを追加"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "ユーザ１人につき少なくとも１つのグループを選んでください"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"アカウントの期限として \n"
-"年,月,日を指定してください "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "ユーザのパスワードの最終変更 : "
 
-#: ../userdrake_.c:753
-#, fuzzy
-msgid "Please fill up all fields in password aging\n"
-msgstr "パスワード期限の全ての欄を埋めてください\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/バグを報告(_R)"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "ユーザ '%s' を第１グループから削除することはできません"
+msgid "Yes"
+msgstr "はい"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "閉じる"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "グループのデータ"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "作者: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "パスワードを確認:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "ユーザの管理 \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/ユーザを追加(_A)"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright (C) 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/システムユーザをフィルタ(_F)"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "名前欄が空白です。入力してください"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "パスワードの情報"
 
-#: ../userdrake_.c:926
-#, fuzzy
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "名前は小文字,数字,`-',`_'で入力してください"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Search:"
+msgstr "検索"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "名前が長すぎます"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "既存のグループに追加"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "エラー"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "グループを選択"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "フィルタを適用"
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "userdrakeのヘルプ"
diff --git a/po/ka.po b/po/ka.po
index 497b1eb..44da6fa 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+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,467 +17,539 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr ""
 
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/_Actions"
-msgstr "დამუშავება"
-
-#: ../userdrake_.c:66
-#, fuzzy
-msgid "/_Edit"
-msgstr "დამუშავება"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Users"
+msgstr "ჯგუფ(ებ)ი"
 
-#: ../userdrake_.c:67
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "/_Delete"
 msgstr "წაშლა"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
+#: ../userdrake:1
+#, c-format
+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:68 ../userdrake_.c:80
-#, fuzzy
-msgid "/_Options"
-msgstr "დამუშავება"
-
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-#, fuzzy
-msgid "/_File"
-msgstr "ფაილი"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Login Shell"
+msgstr "მომხმარებელი"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "დამუშავება"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:76
-#, fuzzy
-msgid "/_Add User"
-msgstr "მომხმარებლის დამატება"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/Add _Group"
-msgstr "ჯგუფის დამატება"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-#, fuzzy
-msgid "/_Help"
-msgstr "დახმარება"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Members"
+msgstr "ჯგუფ(ებ)ი"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:88
-#, fuzzy
-msgid "/_About..."
-msgstr "ინფორმაცია..."
-
-#: ../userdrake_.c:103
-msgid "Apply filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:106
-#, fuzzy
-msgid "Users"
-msgstr "მომხმარებელი"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Create Home Directory"
+msgstr "მომხმარებლის პირადი უჯრა"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "ჯგუფ(ებ)ი"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr ""
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Home Directory"
 msgstr "მომხმარებლის პირადი უჯრა"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-#, fuzzy
-msgid "Login Shell"
-msgstr "მომხმარებელი"
-
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake_.c:122
-msgid "Status"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User ID"
-msgstr "მომხმარებელი"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User Name"
-msgstr "UserDrake"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group ID"
-msgstr "ჯგუფ(ებ)ი"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group Members"
-msgstr "ჯგუფ(ებ)ი"
-
-#: ../userdrake_.c:129 ../userdrake_.c:565
-#, fuzzy
-msgid "Group Name"
-msgstr "ჯგუფ(ებ)ი"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-#, fuzzy
-msgid "Add User"
-msgstr "მომხმარებლის დამატება"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
 msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add Group"
-msgstr "ჯგუფის დამატება"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add a group to the system"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/Add _Group"
 msgstr "ჯგუფის დამატება"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "დამუშავება"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr ""
 
-#: ../userdrake_.c:137
-msgid "Edit selected row"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "წაშლა"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete selected row"
+#: ../userdrake:1
+#, c-format
+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:139
-msgid "Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:139
-#, fuzzy
-msgid "Refresh the list"
-msgstr "მომხმარებელთა სია"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add a group to the system"
+msgstr "ჯგუფის დამატება"
 
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:168
-msgid "Locked"
+#: ../userdrake:1
+#, c-format
+msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "ჯგუფ(ებ)ი"
 
-#: ../userdrake_.c:225 ../userdrake_.c:364
-msgid "Create New User"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:232
-#, fuzzy
-msgid "Create Home Directory"
-msgstr "მომხმარებლის პირადი უჯრა"
-
-#: ../userdrake_.c:234
-#, fuzzy
-msgid "Home Directory: "
-msgstr "მომხმარებლის პირადი უჯრა"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr ""
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
-#, fuzzy
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "პირადი უჯრა"
+
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Password Mismatch"
 msgstr "პაროლი"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
 msgstr ""
 
-#: ../userdrake_.c:265
-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:1
+#, fuzzy, c-format
+msgid "Add User"
+msgstr "მომხმარებლის დამატება"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Actions"
+msgstr "დამუშავება"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_File"
+msgstr "ფაილი"
 
-#: ../userdrake_.c:355
-msgid "Yes"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:359
-msgid "No"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
 msgstr ""
 
-#: ../userdrake_.c:370
-msgid "Specify group ID manually"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User Name"
+msgstr "UserDrake"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Home Directory: "
+msgstr "მომხმარებლის პირადი უჯრა"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Edit"
+msgstr "დამუშავება"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid ""
-"Creating a group with a GID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:400
-msgid "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "მომხმარებელი"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "წაშლა"
+
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, fuzzy, c-format
-msgid "Delete Home Directory :%s"
-msgstr "მომხმარებლის პირადი უჯრა"
+msgid "User Data"
+msgstr "მომხმარებელთა სია"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
+msgid "Refresh"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
+msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
+msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "მომხმარებელი"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Name"
+msgstr "ჯგუფ(ებ)ი"
+
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr ""
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "პაროლი"
 
-#: ../userdrake_.c:553
-#, fuzzy
-msgid "Confirm Password:"
-msgstr "პაროლი"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr ""
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "პირადი უჯრა"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr ""
 
-#: ../userdrake_.c:593
-#, fuzzy
-msgid "User Data"
-msgstr "მომხმარებელთა სია"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Users"
+msgstr "მომხმარებელი"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group ID"
+msgstr "ჯგუფ(ებ)ი"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
+#: ../userdrake:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_About..."
+msgstr "ინფორმაცია..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Options"
+msgstr "დამუშავება"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User ID"
+msgstr "მომხმარებელი"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Refresh the list"
+msgstr "მომხმარებელთა სია"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Help"
+msgstr "დახმარება"
 
-#: ../userdrake_.c:622
-#, fuzzy
-msgid "Password Info"
-msgstr "პაროლი"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Delete Home Directory :%s"
+msgstr "მომხმარებლის პირადი უჯრა"
 
-#: ../userdrake_.c:626
-msgid "Select the groups that the user will be a member of:"
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:671
-#, fuzzy
-msgid "Group Data"
-msgstr "ჯგუფთა სია"
+#: ../userdrake:1
+#, c-format
+msgid "Select the groups that the user will be a member of:"
+msgstr ""
 
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:675
-#, fuzzy
-msgid "Group Users"
-msgstr "ჯგუფ(ებ)ი"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add Group"
+msgstr "ჯგუფის დამატება"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
+msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:900
-msgid "Close"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Data"
+msgstr "ჯგუფთა სია"
+
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Confirm Password:"
+msgstr "პაროლი"
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Add User"
+msgstr "მომხმარებლის დამატება"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Password Info"
+msgstr "პაროლი"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
 msgstr ""
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:931
-msgid "Error"
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
 msgstr ""
 
 #~ msgid "Help"
diff --git a/po/ko.po b/po/ko.po
index 77d2fbd..da16038 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+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,470 +16,539 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr ""
 
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/_Actions"
-msgstr "����"
-
-#: ../userdrake_.c:66
-#, fuzzy
-msgid "/_Edit"
-msgstr "����"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Users"
+msgstr "�׷�"
 
-#: ../userdrake_.c:67
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "/_Delete"
 msgstr "����"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
+#: ../userdrake:1
+#, c-format
+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:68 ../userdrake_.c:80
-#, fuzzy
-msgid "/_Options"
-msgstr "����"
-
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-#, fuzzy
-msgid "/_File"
-msgstr "����"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Login Shell"
+msgstr "�α��θ�"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "����"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:76
-#, fuzzy
-msgid "/_Add User"
-msgstr "����� �߰�"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/Add _Group"
-msgstr "�׷� �߰�"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-#, fuzzy
-msgid "/_Help"
-msgstr "����"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Members"
+msgstr "�׷�"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:88
-#, fuzzy
-msgid "/_About..."
-msgstr "�� ���α׷���..."
-
-#: ../userdrake_.c:103
-msgid "Apply filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "�����"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Create Home Directory"
+msgstr "����� Ȩ ���丮"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "�׷�"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr ""
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Home Directory"
 msgstr "����� Ȩ ���丮"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-#, fuzzy
-msgid "Login Shell"
-msgstr "�α��θ�"
-
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "Status"
-msgstr "TLS ����"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User ID"
-msgstr "�����"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User Name"
-msgstr "����ڵ巹��ũ"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group ID"
-msgstr "�׷�"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group Members"
-msgstr "�׷�"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr ""
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-#, fuzzy
-msgid "Group Name"
-msgstr "�׷�"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-#, fuzzy
-msgid "Add User"
-msgstr "����� �߰�"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
 msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add Group"
-msgstr "�׷� �߰�"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add a group to the system"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/Add _Group"
 msgstr "�׷� �߰�"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "����"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr ""
 
-#: ../userdrake_.c:137
-msgid "Edit selected row"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "����"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete selected row"
+#: ../userdrake:1
+#, c-format
+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:139
-msgid "Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:139
-#, fuzzy
-msgid "Refresh the list"
-msgstr "����� ���"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add a group to the system"
+msgstr "�׷� �߰�"
 
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:168
-msgid "Locked"
+#: ../userdrake:1
+#, c-format
+msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "�׷�"
 
-#: ../userdrake_.c:225 ../userdrake_.c:364
-msgid "Create New User"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:232
-#, fuzzy
-msgid "Create Home Directory"
-msgstr "����� Ȩ ���丮"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr ""
 
-#: ../userdrake_.c:234
-#, fuzzy
-msgid "Home Directory: "
-msgstr "����� Ȩ ���丮"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr ""
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:251
-#, fuzzy
-msgid "User already exists, please choose another User Name"
-msgstr "�̹� �����ϴ� �̸��Դϴ�."
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Ȩ ���丮"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Password Mismatch"
 msgstr "��ȣ"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "�̹� �����ϴ� �̸��Դϴ�."
 
-#: ../userdrake_.c:265
-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:1
+#, fuzzy, c-format
+msgid "Add User"
+msgstr "����� �߰�"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Userdrake"
+msgstr "����ڵ巹��ũ"
 
-#: ../userdrake_.c:317
-msgid "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Actions"
+msgstr "����"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_File"
+msgstr "����"
+
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:355
-msgid "Yes"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Close"
+msgstr "�����"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User Name"
+msgstr "����ڵ巹��ũ"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Home Directory: "
+msgstr "����� Ȩ ���丮"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:359
-msgid "No"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Edit"
+msgstr "����"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "�α��θ�"
 
-#: ../userdrake_.c:385
-msgid ""
-"Creating a group with a GID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:400
-msgid "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "����"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, fuzzy, c-format
-msgid "Delete Home Directory :%s"
-msgstr "����� Ȩ ���丮"
+msgid "User Data"
+msgstr "����� ���"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
+msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
+msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
+msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "�α��θ�"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Name"
+msgstr "�׷�"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Status"
+msgstr "TLS ����"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "��ȣ"
 
-#: ../userdrake_.c:553
-#, fuzzy
-msgid "Confirm Password:"
-msgstr "��ȣ:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr ""
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Ȩ ���丮"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr ""
 
-#: ../userdrake_.c:593
-#, fuzzy
-msgid "User Data"
-msgstr "����� ���"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "�����"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group ID"
+msgstr "�׷�"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
+#: ../userdrake:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_About..."
+msgstr "�� ���α׷���..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Options"
+msgstr "����"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User ID"
+msgstr "�����"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Refresh the list"
+msgstr "����� ���"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Help"
+msgstr "����"
 
-#: ../userdrake_.c:622
-#, fuzzy
-msgid "Password Info"
-msgstr "��ȣ"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Delete Home Directory :%s"
+msgstr "����� Ȩ ���丮"
 
-#: ../userdrake_.c:626
-msgid "Select the groups that the user will be a member of:"
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:671
-#, fuzzy
-msgid "Group Data"
-msgstr "�׷� ���"
+#: ../userdrake:1
+#, c-format
+msgid "Select the groups that the user will be a member of:"
+msgstr ""
 
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:675
-#, fuzzy
-msgid "Group Users"
-msgstr "�׷�"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add Group"
+msgstr "�׷� �߰�"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
+msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:900
-#, fuzzy
-msgid "Close"
-msgstr "�����"
-
-#: ../userdrake_.c:906
-#, fuzzy
-msgid "Userdrake"
-msgstr "����ڵ巹��ũ"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Data"
+msgstr "�׷� ���"
 
-#: ../userdrake_.c:912
-msgid "Authors: "
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Confirm Password:"
+msgstr "��ȣ:"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Add User"
+msgstr "����� �߰�"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Password Info"
+msgstr "��ȣ"
+
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "�˻�:"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:931
-msgid "Error"
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
 msgstr ""
 
 #~ msgid "Help"
diff --git a/po/lt.po b/po/lt.po
index a454650..b6a9070 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+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,468 +16,539 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr ""
 
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/_Actions"
-msgstr "Veiksmai"
-
-#: ../userdrake_.c:66
-#, fuzzy
-msgid "/_Edit"
-msgstr "Redaguoti"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Users"
+msgstr "Grup�s"
 
-#: ../userdrake_.c:67
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "/_Delete"
 msgstr "I�trinti"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
+#: ../userdrake:1
+#, c-format
+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:68 ../userdrake_.c:80
-#, fuzzy
-msgid "/_Options"
-msgstr "Veiksmai"
-
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-#, fuzzy
-msgid "/_File"
-msgstr "Byla"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Login Shell"
+msgstr "Prisijungti"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Redaguoti"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:76
-#, fuzzy
-msgid "/_Add User"
-msgstr "Prid�ti vartotoj�"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/Add _Group"
-msgstr "Prid�ti grup�"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-#, fuzzy
-msgid "/_Help"
-msgstr "Pagalba"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Members"
+msgstr "Grup�s"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:88
-#, fuzzy
-msgid "/_About..."
-msgstr "Apie"
-
-#: ../userdrake_.c:103
-msgid "Apply filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Vartotojai"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Create Home Directory"
+msgstr "Vartotoj� nam� katalogas"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Grup�s"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr ""
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Home Directory"
 msgstr "Vartotoj� nam� katalogas"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-#, fuzzy
-msgid "Login Shell"
-msgstr "Prisijungti"
-
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake_.c:122
-msgid "Status"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User ID"
-msgstr "Vartotojas"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User Name"
-msgstr "Userdrake"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group ID"
-msgstr "Grup�"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group Members"
-msgstr "Grup�s"
-
-#: ../userdrake_.c:129 ../userdrake_.c:565
-#, fuzzy
-msgid "Group Name"
-msgstr "Grup�"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-#, fuzzy
-msgid "Add User"
-msgstr "Prid�ti vartotoj�"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
 msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add Group"
-msgstr "Prid�ti grup�"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add a group to the system"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/Add _Group"
 msgstr "Prid�ti grup�"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Redaguoti"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr ""
 
-#: ../userdrake_.c:137
-msgid "Edit selected row"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "I�trinti"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete selected row"
+#: ../userdrake:1
+#, c-format
+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:139
-msgid "Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:139
-#, fuzzy
-msgid "Refresh the list"
-msgstr "Vartotoj� s�ra�as"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add a group to the system"
+msgstr "Prid�ti grup�"
 
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:168
-msgid "Locked"
+#: ../userdrake:1
+#, c-format
+msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Grup�s"
 
-#: ../userdrake_.c:225 ../userdrake_.c:364
-msgid "Create New User"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:232
-#, fuzzy
-msgid "Create Home Directory"
-msgstr "Vartotoj� nam� katalogas"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr ""
 
-#: ../userdrake_.c:234
-#, fuzzy
-msgid "Home Directory: "
-msgstr "Vartotoj� nam� katalogas"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr ""
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:251
-#, fuzzy
-msgid "User already exists, please choose another User Name"
-msgstr "�is vardas jau yra sitemoje"
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Nam�"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Password Mismatch"
 msgstr "Slapta�odis"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "�is vardas jau yra sitemoje"
 
-#: ../userdrake_.c:265
-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:1
+#, fuzzy, c-format
+msgid "Add User"
+msgstr "Prid�ti vartotoj�"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Actions"
+msgstr "Veiksmai"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_File"
+msgstr "Byla"
 
-#: ../userdrake_.c:355
-msgid "Yes"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:359
-msgid "No"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
 msgstr ""
 
-#: ../userdrake_.c:370
-msgid "Specify group ID manually"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User Name"
+msgstr "Userdrake"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Home Directory: "
+msgstr "Vartotoj� nam� katalogas"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Edit"
+msgstr "Redaguoti"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid ""
-"Creating a group with a GID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:400
-msgid "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Prisijungti"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "I�trinti"
+
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, fuzzy, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Vartotoj� nam� katalogas"
+msgid "User Data"
+msgstr "Vartotoj� s�ra�as"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
+msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
+msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
+msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Prisijungti"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Name"
+msgstr "Grup�"
+
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr ""
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Slapta�odis"
 
-#: ../userdrake_.c:553
-#, fuzzy
-msgid "Confirm Password:"
-msgstr "Slapta�odis"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr ""
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Nam�"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr ""
 
-#: ../userdrake_.c:593
-#, fuzzy
-msgid "User Data"
-msgstr "Vartotoj� s�ra�as"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Vartotojai"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group ID"
+msgstr "Grup�"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
+#: ../userdrake:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_About..."
+msgstr "Apie"
 
-#: ../userdrake_.c:610
-#, fuzzy
-msgid "User last changed password on : "
-msgstr "Negaliu pakeisti slapt"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Options"
+msgstr "Veiksmai"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User ID"
+msgstr "Vartotojas"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Refresh the list"
+msgstr "Vartotoj� s�ra�as"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Help"
+msgstr "Pagalba"
 
-#: ../userdrake_.c:622
-#, fuzzy
-msgid "Password Info"
-msgstr "Slapta�odis"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Vartotoj� nam� katalogas"
 
-#: ../userdrake_.c:626
-msgid "Select the groups that the user will be a member of:"
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:671
-#, fuzzy
-msgid "Group Data"
-msgstr "Grupi� s�ra�as"
+#: ../userdrake:1
+#, c-format
+msgid "Select the groups that the user will be a member of:"
+msgstr ""
 
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:675
-#, fuzzy
-msgid "Group Users"
-msgstr "Grup�s"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add Group"
+msgstr "Prid�ti grup�"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User last changed password on : "
+msgstr "Negaliu pakeisti slapt"
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
+msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:900
-msgid "Close"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Data"
+msgstr "Grupi� s�ra�as"
+
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Confirm Password:"
+msgstr "Slapta�odis"
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Add User"
+msgstr "Prid�ti vartotoj�"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Password Info"
+msgstr "Slapta�odis"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Ie�koti:"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:931
-msgid "Error"
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
 msgstr ""
 
 #~ msgid "Help"
diff --git a/po/lv.po b/po/lv.po
index 50656da..0e1e438 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-08-14 00:32+0200\n"
 "Last-Translator: Vitauts Sto�ka <vit@dau.lv>\n"
 "Language-Team: Latvian <ll10nt@listes.murds.lv>\n"
@@ -15,451 +15,551 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Mandrake Linux lietot�ju p�rvald�bas r�ks"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_Darb�bas"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Autorties�bas � 2003 MandrakeSoft."
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_Labot"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Grupas lietot�ji"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_Dz�st"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Filtr�t sist�mas lietot�jus"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_Opcijas"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Izveidot grupu, kuras GID ir maz�ks par 500, nav ieteicams.\n"
+"Vai tie��m v�laties to dar�t?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_Fails"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "�aula"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/_Atsvaidzin�t"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Izveidot lietot�jam priv�tu grupu"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/_Iziet"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Labot"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "Pievienot sist�mai lietot�ju"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/_Pievienot lietot�ju"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Konta inform�cija"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/Pievienot _grupu"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "Br�din�jums: Lietot�ja dz��ana"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/_Pal�dz�ba"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "K��da"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_Zi�ot par k��du"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "Grupas dal�bnieki"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_Par..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "Dienas, cik br�din�t pirms nomai�as:"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "Pielietot filtru"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Dz�st izv�l�to rindu"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Lietot�ji"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "Izveidot m�jas katalogu"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Grupas"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID:"
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Pilns v�rds"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr "V�rd� varb�t tikai mazie lat��u alfab�ta burti, '-' un '_'"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "M�jas katalogs"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "�aula"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"�� parole ir p�r�k vienk�r�a. \n"
+"Lab� parol� j�b�t vairak nek� 6 simboliem"
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Prim�r� grupa"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "Dienas, l�dz tiek piepras�ta nomai�a:"
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Statuss"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "Vai tie��m v�laties dz�st grupu %s\n"
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "Lietot�ja ID"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "L�dzu nor�diet visus laukus paroles noveco�anai\n"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Lietot�jv�rds"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "Uzklik��iniet uz ikonas, lai to nomain�tu"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "Grupas ID"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s ir lietot�ja %s prim�r� grupa\n"
+"Vispirms izdz�siet lietot�ju"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "Grupas dal�bnieki"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/Pievienot _grupu"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Grupas nosaukums"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "J�s nevarat izsl�gt lietot�ju '%s' no vi�a prim�r�s grupas"
 
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr "Pievienot lietot�ju"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Mandrake Linux lietot�ju p�rvald�bas r�ks"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "Pievienot sist�mai lietot�ju"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "��da grupa jau eksist�, izv�lieties citu grupas nosaukumu"
 
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "Pievienot grupu"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Izveidot lietot�ju, kura UID ir maz�ks par 500, nav ieteicams.\n"
+"Vai tie��m j�s v�laties to dar�t?\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Autori:"
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "Pievienot sist�mai grupu"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Labot"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "Labot izv�l�to rindu"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Dz�st"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Dz�st izv�l�to rindu"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Atsvaidzin�t"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Atsvaidzin�t sarakstu"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "Novecojis"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "Blo��ts"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "Uzklik��iniet uz ikonas, lai to nomain�tu"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Izveidot jaunu lietot�ju"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "Izveidot m�jas katalogu"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Grupas"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "M�jas katalogs:"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Prim�r� grupa"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Izveidot lietot�jam priv�tu grupu"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "Lietot�ja Uid < 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "Nor�d�t lietot�ja ID patst�v�gi"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "Blo��t lietot�ja kontu"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "��ds lietot�js jau eksist�, izv�lieties citu lietot�jv�rdu"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
+"Dz��ot lietot�ju %s\n"
+"tiks veiktas ar� ��das darb�bas\n"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "Dienas, l�dz tiek at�auta nomai�a:"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "M�jas"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "Paroles nesakr�t"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"�� parole ir p�r�k vienk�r�a. \n"
-"Lab� parol� j�b�t vairak nek� 6 simboliem"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "��ds lietot�js jau eksist�, izv�lieties citu lietot�jv�rdu"
 
-#: ../userdrake_.c:265
-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 ""
-"Izveidot lietot�ju, kura UID ir maz�ks par 500, nav ieteicams.\n"
-"Vai tie��m j�s v�laties to dar�t?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
+msgstr "Pievienot lietot�ju"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "Lietot�ja Uid < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID:"
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "Konts noveco (GGGG-MM-DD):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "Izv�lieties grupu"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_Darb�bas"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "Pievienot grupai 'users'"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Pievienot eksist�jo�ai grupai"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "Nor�d�t lietot�ja ID patst�v�gi"
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "Grupa ar ��du nosaukumu jau eksist�. Ko j�s v�laties dar�t?"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/_Fails"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "J�"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "V�rds ir p�r�k gar�"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "N�"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Aizv�rt"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Lietot�jv�rds"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "M�jas katalogs:"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/_Atsvaidzin�t"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_Labot"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "Nor�d�t grupas ID patst�v�gi"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "��da grupa jau eksist�, izv�lieties citu grupas nosaukumu"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "V�rda lauks ir tuk�s, l�dzu ievadiet v�rdu"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr "Grupas Gid ir < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Login"
 
-#: ../userdrake_.c:385
-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 ""
-"Izveidot grupu, kuras GID ir maz�ks par 500, nav ieteicams.\n"
-"Vai tie��m v�laties to dar�t?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/_Iziet"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID:"
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "Grupa ar ��du nosaukumu jau eksist�. Ko j�s v�laties dar�t?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr "Br�din�jums: Lietot�ja dz��ana"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Dz�st"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"Dz��ot lietot�ju %s\n"
-"tiks veiktas ar� ��das darb�bas\n"
+"L�dzu nor�diet gadu, m�nesi un dienu\n"
+"konta noveco�anai"
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Dz�st m�jas katalogu: %s"
+msgid "User Data"
+msgstr "Lietot�ja dati"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "Izdz�sta pastkaste: /var/spool/mail/%s"
+msgid "Refresh"
+msgstr "Atsvaidzin�t"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Pilns v�rds"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "Br�din�jums: Grupas dz��ana"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "Vai tie��m v�laties dz�st grupu %s\n"
+msgid " Group Gid is < 500"
+msgstr "Grupas Gid ir < 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s ir lietot�ja %s prim�r� grupa\n"
-"Vispirms izdz�siet lietot�ju"
+msgid "Edit selected row"
+msgstr "Labot izv�l�to rindu"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Login"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Grupas nosaukums"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Statuss"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Parole"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Apstiprin�t paroli:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "At�aut paroles noveco�anu"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "M�jas"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "Izv�lieties lietot�jus, ko pievienot �ai grupai:"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Lietot�ja dati"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Lietot�ji"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "At�aut konta noveco�anu"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "Dienas, pirms konts k��st neakt�vs:"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "Konts noveco (GGGG-MM-DD):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "Grupas ID"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "Blo��t lietot�ja kontu"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "N�"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Konta inform�cija"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_Par..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "Lietot�js p�d�jo reizi main�ja paroli:"
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Opcijas"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "At�aut paroles noveco�anu"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "Lietot�ja ID"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "Dienas, l�dz tiek at�auta nomai�a:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "At�aut konta noveco�anu"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "Dienas, l�dz tiek piepras�ta nomai�a:"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "Izdz�sta pastkaste: /var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "Dienas, cik br�din�t pirms nomai�as:"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Atsvaidzin�t sarakstu"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "Dienas, pirms konts k��st neakt�vs:"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_Pal�dz�ba"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Paroles inform�cija"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Dz�st m�jas katalogu: %s"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Lietot�ju p�rvald�ba\n"
+
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Izv�lieties grupas, kur�m pieder�s lietot�js:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "Grupas dati"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "Izv�lieties lietot�jus, ko pievienot �ai grupai:"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "Blo��ts"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Grupas lietot�ji"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "Pievienot grupu"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "L�dzu lietot�jam izv�lieties vismaz vienu grupu"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"L�dzu nor�diet gadu, m�nesi un dienu\n"
-"konta noveco�anai"
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "Lietot�js p�d�jo reizi main�ja paroli:"
 
-#: ../userdrake_.c:753
-#, fuzzy
-msgid "Please fill up all fields in password aging\n"
-msgstr "L�dzu nor�diet visus laukus paroles noveco�anai\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Zi�ot par k��du"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "J�s nevarat izsl�gt lietot�ju '%s' no vi�a prim�r�s grupas"
+msgid "Yes"
+msgstr "J�"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Aizv�rt"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Grupas dati"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID:"
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Autori:"
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Apstiprin�t paroli:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Lietot�ju p�rvald�ba\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/_Pievienot lietot�ju"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Autorties�bas � 2003 MandrakeSoft."
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Filtr�t sist�mas lietot�jus"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "V�rda lauks ir tuk�s, l�dzu ievadiet v�rdu"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "Paroles inform�cija"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "V�rd� varb�t tikai mazie lat��u alfab�ta burti, '-' un '_'"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Mekl�t:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "V�rds ir p�r�k gar�"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Pievienot eksist�jo�ai grupai"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "K��da"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "Izv�lieties grupu"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "Pielietot filtru"
diff --git a/po/mk.po b/po/mk.po
index 144c579..e80a94d 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+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,469 +18,539 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr ""
 
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/_Actions"
-msgstr "Акции"
-
-#: ../userdrake_.c:66
-#, fuzzy
-msgid "/_Edit"
-msgstr "Уреди"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Users"
+msgstr "Групи"
 
-#: ../userdrake_.c:67
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "/_Delete"
 msgstr "Отстрани"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
+#: ../userdrake:1
+#, c-format
+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:68 ../userdrake_.c:80
-#, fuzzy
-msgid "/_Options"
-msgstr "Акции"
-
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-#, fuzzy
-msgid "/_File"
-msgstr "Датотека"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Login Shell"
+msgstr "Login"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Уреди"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:76
-#, fuzzy
-msgid "/_Add User"
-msgstr "Додај корисник"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/Add _Group"
-msgstr "Додај група"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-#, fuzzy
-msgid "/_Help"
-msgstr "Помош"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Members"
+msgstr "Групи"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:88
-#, fuzzy
-msgid "/_About..."
-msgstr "За"
-
-#: ../userdrake_.c:103
-msgid "Apply filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Корисници"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Create Home Directory"
+msgstr "Кориснички домашен дир."
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Групи"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr ""
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Home Directory"
 msgstr "Кориснички домашен дир."
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-#, fuzzy
-msgid "Login Shell"
-msgstr "Login"
-
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "Status"
-msgstr "Вклучи tls"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User ID"
-msgstr "Корисник"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User Name"
-msgstr "Userdrake"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group ID"
-msgstr "Група"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group Members"
-msgstr "Групи"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr ""
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-#, fuzzy
-msgid "Group Name"
-msgstr "Група"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-#, fuzzy
-msgid "Add User"
-msgstr "Додај корисник"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
 msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add Group"
-msgstr "Додај група"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add a group to the system"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/Add _Group"
 msgstr "Додај група"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Уреди"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr ""
 
-#: ../userdrake_.c:137
-msgid "Edit selected row"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Отстрани"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete selected row"
+#: ../userdrake:1
+#, c-format
+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:139
-msgid "Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:139
-#, fuzzy
-msgid "Refresh the list"
-msgstr "Листа на корисници"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add a group to the system"
+msgstr "Додај група"
 
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:168
-msgid "Locked"
+#: ../userdrake:1
+#, c-format
+msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Групи"
 
-#: ../userdrake_.c:225 ../userdrake_.c:364
-msgid "Create New User"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:232
-#, fuzzy
-msgid "Create Home Directory"
-msgstr "Кориснички домашен дир."
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr ""
 
-#: ../userdrake_.c:234
-#, fuzzy
-msgid "Home Directory: "
-msgstr "Кориснички домашен дир."
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr ""
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:251
-#, fuzzy
-msgid "User already exists, please choose another User Name"
-msgstr "Ова име веќе постои на системот"
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Дома"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Password Mismatch"
 msgstr "Лозинка"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Ова име веќе постои на системот"
 
-#: ../userdrake_.c:265
-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:1
+#, fuzzy, c-format
+msgid "Add User"
+msgstr "Додај корисник"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Actions"
+msgstr "Акции"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_File"
+msgstr "Датотека"
+
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:355
-msgid "Yes"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Close"
+msgstr "Исчисти"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User Name"
+msgstr "Userdrake"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Home Directory: "
+msgstr "Кориснички домашен дир."
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:359
-msgid "No"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Edit"
+msgstr "Уреди"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Login"
 
-#: ../userdrake_.c:385
-msgid ""
-"Creating a group with a GID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:400
-msgid "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Отстрани"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, fuzzy, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Кориснички домашен дир."
+msgid "User Data"
+msgstr "Листа на корисници"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
+msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
+msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
+msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Login"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Name"
+msgstr "Група"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Status"
+msgstr "Вклучи tls"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Лозинка"
 
-#: ../userdrake_.c:553
-#, fuzzy
-msgid "Confirm Password:"
-msgstr "Лозинка:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr ""
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Дома"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr ""
 
-#: ../userdrake_.c:593
-#, fuzzy
-msgid "User Data"
-msgstr "Листа на корисници"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Корисници"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group ID"
+msgstr "Група"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
+#: ../userdrake:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_About..."
+msgstr "За"
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Options"
+msgstr "Акции"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User ID"
+msgstr "Корисник"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Refresh the list"
+msgstr "Листа на корисници"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Help"
+msgstr "Помош"
 
-#: ../userdrake_.c:622
-#, fuzzy
-msgid "Password Info"
-msgstr "Лозинка"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Кориснички домашен дир."
 
-#: ../userdrake_.c:626
-msgid "Select the groups that the user will be a member of:"
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:671
-#, fuzzy
-msgid "Group Data"
-msgstr "Листа на групи"
+#: ../userdrake:1
+#, c-format
+msgid "Select the groups that the user will be a member of:"
+msgstr ""
 
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:675
-#, fuzzy
-msgid "Group Users"
-msgstr "Групи"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add Group"
+msgstr "Додај група"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
+msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:900
-#, fuzzy
-msgid "Close"
-msgstr "Исчисти"
-
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Data"
+msgstr "Листа на групи"
 
-#: ../userdrake_.c:912
-msgid "Authors: "
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Confirm Password:"
+msgstr "Лозинка:"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Add User"
+msgstr "Додај корисник"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Password Info"
+msgstr "Лозинка"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Search:"
+msgstr "Барај база:"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:931
-msgid "Error"
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
 msgstr ""
 
 #~ msgid "Help"
@@ -836,9 +906,6 @@ msgstr ""
 #~ msgid "Server address:"
 #~ msgstr "Адреса на сервер:"
 
-#~ msgid "Search base:"
-#~ msgstr "Барај база:"
-
 #~ msgid "Bind DN:"
 #~ msgstr "Bind DN:"
 
diff --git a/po/mn.po b/po/mn.po
index 1e3e60e..f28ed42 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+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,470 +18,539 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr ""
 
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/_Actions"
-msgstr "Үйлдэлүүд"
-
-#: ../userdrake_.c:66
-#, fuzzy
-msgid "/_Edit"
-msgstr "Засах"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Users"
+msgstr "Группүүд"
 
-#: ../userdrake_.c:67
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "/_Delete"
 msgstr "Устгах"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
+#: ../userdrake:1
+#, c-format
+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:68 ../userdrake_.c:80
-#, fuzzy
-msgid "/_Options"
-msgstr "Үйлдэлүүд"
-
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-#, fuzzy
-msgid "/_File"
-msgstr "Файл"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Login Shell"
+msgstr "Нэвтрэх"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Засах"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:76
-#, fuzzy
-msgid "/_Add User"
-msgstr "Хэрэглэгч нэмэх"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/Add _Group"
-msgstr "Групп нэмэх"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-#, fuzzy
-msgid "/_Help"
-msgstr "Тусламж"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Members"
+msgstr "Группүүд"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:88
-#, fuzzy
-msgid "/_About..."
-msgstr "Тухай"
-
-#: ../userdrake_.c:103
-msgid "Apply filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Хэрэглэгчид"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Create Home Directory"
+msgstr "Хэрэглэгчийн гэрийн зам"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Группүүд"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr ""
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Home Directory"
 msgstr "Хэрэглэгчийн гэрийн зам"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-#, fuzzy
-msgid "Login Shell"
-msgstr "Нэвтрэх"
-
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "Status"
-msgstr "tls-г эхлүүлэх"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User ID"
-msgstr "Хэрэглэгч"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User Name"
-msgstr "Хэрэглэгчийн драке"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group ID"
-msgstr "Групп"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr ""
 
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group Members"
-msgstr "Группүүд"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-#, fuzzy
-msgid "Group Name"
-msgstr "Групп"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-#, fuzzy
-msgid "Add User"
-msgstr "Хэрэглэгч нэмэх"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr ""
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add Group"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/Add _Group"
 msgstr "Групп нэмэх"
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add a group to the system"
-msgstr "Шинэ групп нэмэх"
-
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Засах"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr ""
 
-#: ../userdrake_.c:137
-msgid "Edit selected row"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Устгах"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete selected row"
+#: ../userdrake:1
+#, c-format
+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:139
-msgid "Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:139
-#, fuzzy
-msgid "Refresh the list"
-msgstr "Хэрэглэгчидийн жагсаалт"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add a group to the system"
+msgstr "Шинэ групп нэмэх"
 
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:168
-msgid "Locked"
+#: ../userdrake:1
+#, c-format
+msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Группүүд"
 
-#: ../userdrake_.c:225 ../userdrake_.c:364
-msgid "Create New User"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:232
-#, fuzzy
-msgid "Create Home Directory"
-msgstr "Хэрэглэгчийн гэрийн зам"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr ""
 
-#: ../userdrake_.c:234
-#, fuzzy
-msgid "Home Directory: "
-msgstr "Хэрэглэгчийн гэрийн зам"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr ""
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:251
-#, fuzzy
-msgid "User already exists, please choose another User Name"
-msgstr "Энэ нэр хэдийн системд орсон байна"
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Эзний гэр"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Password Mismatch"
 msgstr "Нууц үг"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Энэ нэр хэдийн системд орсон байна"
 
-#: ../userdrake_.c:265
-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:1
+#, fuzzy, c-format
+msgid "Add User"
+msgstr "Хэрэглэгч нэмэх"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Userdrake"
+msgstr "Хэрэглэгчийн драке"
 
-#: ../userdrake_.c:317
-msgid "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Actions"
+msgstr "Үйлдэлүүд"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_File"
+msgstr "Файл"
+
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:355
-msgid "Yes"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Close"
+msgstr "Цэвэрлэх"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User Name"
+msgstr "Хэрэглэгчийн драке"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Home Directory: "
+msgstr "Хэрэглэгчийн гэрийн зам"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:359
-msgid "No"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Edit"
+msgstr "Засах"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Нэвтрэх"
 
-#: ../userdrake_.c:385
-msgid ""
-"Creating a group with a GID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:400
-msgid "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Устгах"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, fuzzy, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Хэрэглэгчийн гэрийн зам"
+msgid "User Data"
+msgstr "Хэрэглэгчидийн жагсаалт"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
+msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
+msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
+msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Нэвтрэх"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Name"
+msgstr "Групп"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Status"
+msgstr "tls-г эхлүүлэх"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Нууц үг"
 
-#: ../userdrake_.c:553
-#, fuzzy
-msgid "Confirm Password:"
-msgstr "Нууц үг:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr ""
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Эзний гэр"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr ""
 
-#: ../userdrake_.c:593
-#, fuzzy
-msgid "User Data"
-msgstr "Хэрэглэгчидийн жагсаалт"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Хэрэглэгчид"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group ID"
+msgstr "Групп"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
+#: ../userdrake:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_About..."
+msgstr "Тухай"
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Options"
+msgstr "Үйлдэлүүд"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User ID"
+msgstr "Хэрэглэгч"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Refresh the list"
+msgstr "Хэрэглэгчидийн жагсаалт"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Help"
+msgstr "Тусламж"
 
-#: ../userdrake_.c:622
-#, fuzzy
-msgid "Password Info"
-msgstr "Нууц үг"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Хэрэглэгчийн гэрийн зам"
 
-#: ../userdrake_.c:626
-msgid "Select the groups that the user will be a member of:"
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:671
-#, fuzzy
-msgid "Group Data"
-msgstr "Группийн жагсаалт"
+#: ../userdrake:1
+#, c-format
+msgid "Select the groups that the user will be a member of:"
+msgstr ""
 
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:675
-#, fuzzy
-msgid "Group Users"
-msgstr "Группүүд"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add Group"
+msgstr "Групп нэмэх"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
+msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:900
-#, fuzzy
-msgid "Close"
-msgstr "Цэвэрлэх"
-
-#: ../userdrake_.c:906
-#, fuzzy
-msgid "Userdrake"
-msgstr "Хэрэглэгчийн драке"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Data"
+msgstr "Группийн жагсаалт"
 
-#: ../userdrake_.c:912
-msgid "Authors: "
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Confirm Password:"
+msgstr "Нууц үг:"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Add User"
+msgstr "Хэрэглэгч нэмэх"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Password Info"
+msgstr "Нууц үг"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Search:"
+msgstr "Хайлтын бааз:"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:931
-msgid "Error"
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
 msgstr ""
 
 #~ msgid "Help"
@@ -836,9 +905,6 @@ msgstr ""
 #~ msgid "Server address:"
 #~ msgstr "Серверийн хаяг:"
 
-#~ msgid "Search base:"
-#~ msgstr "Хайлтын бааз:"
-
 #~ msgid "Bind DN:"
 #~ msgstr "DN холбоос:"
 
diff --git a/po/ms.po b/po/ms.po
index a961a88..e3b444b 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+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,469 +17,539 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr ""
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/_Actions"
-msgstr "Aksi"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Hakcipta © 2003 MandrakeSoft."
 
-#: ../userdrake_.c:66
-#, fuzzy
-msgid "/_Edit"
-msgstr "Edit"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Users"
+msgstr "Kumpulan"
 
-#: ../userdrake_.c:67
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "/_Delete"
 msgstr "Hapus"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
+#: ../userdrake:1
+#, c-format
+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:68 ../userdrake_.c:80
-#, fuzzy
-msgid "/_Options"
-msgstr "Aksi"
-
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-#, fuzzy
-msgid "/_File"
-msgstr "Fail"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Login Shell"
+msgstr "Login"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Edit"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:76
-#, fuzzy
-msgid "/_Add User"
-msgstr "Tambah user"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/Add _Group"
-msgstr "Tambah kumpulan"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-#, fuzzy
-msgid "/_Help"
-msgstr "Pertolongan"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Members"
+msgstr "Kumpulan"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:88
-#, fuzzy
-msgid "/_About..."
-msgstr "Mengenai"
-
-#: ../userdrake_.c:103
-msgid "Apply filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "User"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Create Home Directory"
+msgstr "Direktori rumah user"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Kumpulan"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr ""
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Home Directory"
 msgstr "Direktori rumah user"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-#, fuzzy
-msgid "Login Shell"
-msgstr "Login"
-
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "Status"
-msgstr "Mula tls"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User ID"
-msgstr "User"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User Name"
-msgstr "Userdrake"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group ID"
-msgstr "Kumpulan"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr ""
 
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group Members"
-msgstr "Kumpulan"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-#, fuzzy
-msgid "Group Name"
-msgstr "Kumpulan"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-#, fuzzy
-msgid "Add User"
-msgstr "Tambah user"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr ""
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add Group"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/Add _Group"
 msgstr "Tambah kumpulan"
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add a group to the system"
-msgstr "Tambah Kumpulan"
-
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Edit"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr ""
 
-#: ../userdrake_.c:137
-msgid "Edit selected row"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Hapus"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete selected row"
+#: ../userdrake:1
+#, c-format
+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:139
-msgid "Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:139
-#, fuzzy
-msgid "Refresh the list"
-msgstr "Daftar user"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add a group to the system"
+msgstr "Tambah Kumpulan"
 
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:168
-msgid "Locked"
+#: ../userdrake:1
+#, c-format
+msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Kumpulan"
 
-#: ../userdrake_.c:225 ../userdrake_.c:364
-msgid "Create New User"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:232
-#, fuzzy
-msgid "Create Home Directory"
-msgstr "Direktori rumah user"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr ""
 
-#: ../userdrake_.c:234
-#, fuzzy
-msgid "Home Directory: "
-msgstr "Direktori rumah user"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr ""
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:251
-#, fuzzy
-msgid "User already exists, please choose another User Name"
-msgstr "Nama ini sudah sedia adai dalam sistem"
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Rumah"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Password Mismatch"
 msgstr "Katalaluan"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Nama ini sudah sedia adai dalam sistem"
 
-#: ../userdrake_.c:265
-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:1
+#, fuzzy, c-format
+msgid "Add User"
+msgstr "Tambah user"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Actions"
+msgstr "Aksi"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_File"
+msgstr "Fail"
+
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:355
-msgid "Yes"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Close"
+msgstr "Terang"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User Name"
+msgstr "Userdrake"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Home Directory: "
+msgstr "Direktori rumah user"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:359
-msgid "No"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Edit"
+msgstr "Edit"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Login"
 
-#: ../userdrake_.c:385
-msgid ""
-"Creating a group with a GID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:400
-msgid "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Hapus"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, fuzzy, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Direktori rumah user"
+msgid "User Data"
+msgstr "Daftar user"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
+msgid "Refresh"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
+msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
+msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Login"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Name"
+msgstr "Kumpulan"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Status"
+msgstr "Mula tls"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Katalaluan"
 
-#: ../userdrake_.c:553
-#, fuzzy
-msgid "Confirm Password:"
-msgstr "Katalaluan:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr ""
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Rumah"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr ""
 
-#: ../userdrake_.c:593
-#, fuzzy
-msgid "User Data"
-msgstr "Daftar user"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "User"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group ID"
+msgstr "Kumpulan"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
+#: ../userdrake:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_About..."
+msgstr "Mengenai"
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Options"
+msgstr "Aksi"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User ID"
+msgstr "User"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Refresh the list"
+msgstr "Daftar user"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Help"
+msgstr "Pertolongan"
 
-#: ../userdrake_.c:622
-#, fuzzy
-msgid "Password Info"
-msgstr "Katalaluan"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Direktori rumah user"
 
-#: ../userdrake_.c:626
-msgid "Select the groups that the user will be a member of:"
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:671
-#, fuzzy
-msgid "Group Data"
-msgstr "Daftar kumpulan"
+#: ../userdrake:1
+#, c-format
+msgid "Select the groups that the user will be a member of:"
+msgstr ""
 
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:675
-#, fuzzy
-msgid "Group Users"
-msgstr "Kumpulan"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add Group"
+msgstr "Tambah kumpulan"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
+msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:900
-#, fuzzy
-msgid "Close"
-msgstr "Terang"
-
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Data"
+msgstr "Daftar kumpulan"
 
-#: ../userdrake_.c:912
-msgid "Authors: "
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Confirm Password:"
+msgstr "Katalaluan:"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Hakcipta © 2003 MandrakeSoft."
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Add User"
+msgstr "Tambah user"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Password Info"
+msgstr "Katalaluan"
+
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Cari:"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:931
-msgid "Error"
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
 msgstr ""
 
 #~ msgid "Help"
diff --git a/po/mt.po b/po/mt.po
index 95fda13..84f0047 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-mt\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-08-19 09:27+0200\n"
 "Last-Translator: Ramon Casha <rcasha@waldonet.net.mt>\n"
 "Language-Team:  <mt@li.org>\n"
@@ -18,455 +18,556 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Għodda tal-Mandrake għall-Immaniġġjar tal-Users"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_Azzjonijiet"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright © 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_Editja"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Users tal-grupp"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_Ħassar"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/I_ffiltra l-users tas-sistema"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/Għaż_liet"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Li toħloq ID ta' grupp inqas minn 500 mhux rakkomandat.\n"
+"Żgur li trid tagħmel dan?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_Fajl"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Shell tal-login"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/E_rġa' tella'"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Oħloq grupp privat għall-user"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/O_ħroġ"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Ibdel"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "Żid user mas-sistema"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/_Żid user"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Info. dwar Kont"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/Żid _Grupp"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/_Għajnuna"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Problema"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/I_rrapporta problema"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "Membri tal-grupp"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_Dwar..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "Ġranet ta' twissija qabel jiskadi :"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "Applika filtru"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Ħassar il-linja magħżula"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Users"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "Oħloq direttorju personali"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Gruppi"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Isem sħiħ"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr ""
+"L-isem jista' jinkludi biss ittri żgħar bl-alfabett Infliż, numri, \"-\" u "
+"\"_\""
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Direttorju personali"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Shell tal-login"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"Dan il-password sempliċi wisq.\n"
+"Passwords tajbin iridu jkunu twal >6 ittri."
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Grupp ewlieni"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "Ġranet qabel jiġi mġiegħel tibdil :"
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Status"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "ID tal-user"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Jekk jogħġbok speċifika d-dettalji tal-iskadenza tal-password\n"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Isem il-user"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "Klikkja fuq l-ikona biex tibdilha"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "ID tal-Grupp"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s huwa l-grupp ewlieni tal-user %s\n"
+" L-ewwel ħassar lill-user"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "Membri tal-grupp"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/Żid _Grupp"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Isem il-grupp"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Ma tistax tneħħi l-user \"%s\" mill-grupp ewlieni"
 
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr "Żid user"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Għodda tal-Mandrake għall-Immaniġġjar tal-Users"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "Żid user mas-sistema"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "Dan l-isem ta' grupp diġà jeżisti. Jekk jogħġbok agħżel ieħor."
 
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "Żid grupp"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Li toħloq ID ta' user inqas minn 500 mhux rakkomandat.\n"
+"Żgur li trid tagħmel dan?\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Awturi: "
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "Żid grupp mas-sistema"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Ibdel"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "Ibdel il-linja magħżula"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Ħassar"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Ħassar il-linja magħżula"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Erġa' tella'"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Erġa' tella' l-lista"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "Skadut"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "Imsakkar"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "Klikkja fuq l-ikona biex tibdilha"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Oħloq user ġdid"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "Oħloq direttorju personali"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Gruppi"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Direttorju personali:"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Grupp ewlieni"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Oħloq grupp privat għall-user"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "ID tal-user < 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "Speċifika ID tal-user manwalment"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "Sakkar il-kont tal-user"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "Dan l-isem diġà jeżisti; jekk jogħġbok agħżel ieħor"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
+"Qed jitħassar user %s\n"
+" Agħmel ukoll dan li ġej\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "Ġranet qabel tħalli tibdil :"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Direttorju personali"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "Passwords ma jaqblux"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"Dan il-password sempliċi wisq.\n"
-"Passwords tajbin iridu jkunu twal >6 ittri."
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Dan l-isem diġà jeżisti; jekk jogħġbok agħżel ieħor"
 
-#: ../userdrake_.c:265
-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 ""
-"Li toħloq ID ta' user inqas minn 500 mhux rakkomandat.\n"
-"Żgur li trid tagħmel dan?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
+msgstr "Żid user"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "ID tal-user < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "Kont jiskadi (YYYY-MM-DD):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "Agħżel grupp"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_Azzjonijiet"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "Żid mal-grupp \"users\""
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Żid ma' grupp eżistenti"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "Speċifika ID tal-user manwalment"
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "Diġà jeżisti grupp b'dan l-isem. X'tixtieq tagħmel?"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/_Fajl"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Iva"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "Isem twil wisq"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "Le"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Agħlaq"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Isem il-user"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Direttorju personali:"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/E_rġa' tella'"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_Editja"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "Speċifika l-ID tal-grupp manwalment"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "Dan l-isem ta' grupp diġà jeżisti. Jekk jogħġbok agħżel ieħor."
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "L-isem huwa vojt. Jekk jogħġbok ipprovdi isem"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr "ID tal-grupp < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Login"
 
-#: ../userdrake_.c:385
-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 ""
-"Li toħloq ID ta' grupp inqas minn 500 mhux rakkomandat.\n"
-"Żgur li trid tagħmel dan?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/O_ħroġ"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "Diġà jeżisti grupp b'dan l-isem. X'tixtieq tagħmel?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Ħassar"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"Qed jitħassar user %s\n"
-" Agħmel ukoll dan li ġej\n"
+"Jekk jogħġbok speċifika s-sena, xahar u ġurnata\n"
+"meta jiskadi l-kont "
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Ħassar id-direttorju personali :%s"
+msgid "User Data"
+msgstr "Informazzjoni tal-user"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "Ħassar il-kaxxa tal-ittri: /var/spool/mail/%s"
+msgid "Refresh"
+msgstr "Erġa' tella'"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Isem sħiħ"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr ""
+msgid " Group Gid is < 500"
+msgstr "ID tal-grupp < 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s huwa l-grupp ewlieni tal-user %s\n"
-" L-ewwel ħassar lill-user"
+msgid "Edit selected row"
+msgstr "Ibdel il-linja magħżula"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Login"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Isem il-grupp"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Status"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Password"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Ikkonferma password:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "Password tiskadi"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Direttorju personali"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "Agħżel liema users se jkunu membri tal-grupp :"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Informazzjoni tal-user"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Users"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "Kont jiskadi"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "Ġranet qabel jiġi inattivat il-kont :"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "Kont jiskadi (YYYY-MM-DD):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "ID tal-Grupp"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "Sakkar il-kont tal-user"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "Le"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Info. dwar Kont"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_Dwar..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "Il-user l-aħħar li bidel il-password f':"
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/Għaż_liet"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "Password tiskadi"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "ID tal-user"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "Ġranet qabel tħalli tibdil :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "Kont jiskadi"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "Ġranet qabel jiġi mġiegħel tibdil :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "Ħassar il-kaxxa tal-ittri: /var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "Ġranet ta' twissija qabel jiskadi :"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Erġa' tella' l-lista"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "Ġranet qabel jiġi inattivat il-kont :"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_Għajnuna"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Info. Password"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Ħassar id-direttorju personali :%s"
+
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Maniġġjar tal-users \n"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Agħżel il-gruppi li l-user huwa membru tagħhom:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "Info. grupp"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "Agħżel liema users se jkunu membri tal-grupp :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "Imsakkar"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Users tal-grupp"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "Żid grupp"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "Agħżel ta' l-inqas grupp wieħed għall-user"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Jekk jogħġbok speċifika s-sena, xahar u ġurnata\n"
-"meta jiskadi l-kont "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "Il-user l-aħħar li bidel il-password f':"
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
-msgstr "Jekk jogħġbok speċifika d-dettalji tal-iskadenza tal-password\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/I_rrapporta problema"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Ma tistax tneħħi l-user \"%s\" mill-grupp ewlieni"
+msgid "Yes"
+msgstr "Iva"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Agħlaq"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Info. grupp"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Awturi: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Ikkonferma password:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Maniġġjar tal-users \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/_Żid user"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright © 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/I_ffiltra l-users tas-sistema"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "L-isem huwa vojt. Jekk jogħġbok ipprovdi isem"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "Info. Password"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr ""
-"L-isem jista' jinkludi biss ittri żgħar bl-alfabett Infliż, numri, \"-\" u "
-"\"_\""
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Fittex:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "Isem twil wisq"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Żid ma' grupp eżistenti"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Problema"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "Agħżel grupp"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "Applika filtru"
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "Għajnuna ġenerika dwar userdrake"
diff --git a/po/nb.po b/po/nb.po
index 0242a80..bdbcb18 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-nb\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-08-18 03:08+0200\n"
 "Last-Translator: Per �yvind Karlsen <peroyvind@sintrax.net>\n"
 "Language-Team: Norwegian Bokm�l <cooker-i18n@linux-mandrake.com>\n"
@@ -20,453 +20,554 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Mandrake Linux brukeradministreringsverkt�y"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_Handlinger"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright � 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_Rediger"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Gruppebrukere"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_Slett"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Filtrer systembrukere"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_Valg"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Oppretter en gruppe med GID lavere enn 500 er ikke anbefalt.\n"
+" Er du sikker p� at du vil dette?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_Fil"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Innloggingsskall"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/_Oppdater"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Opprett en privat gruppe for brukeren"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/_Avslutt"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Rediger"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "Legg til en bruker til systemet"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/_Legg til bruker"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Kontoinfo"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/Legg til _gruppe"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "Advarsel : Sletter bruker"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/_Hjelp"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Feil"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_Rapporter feil"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "Gruppemedlemmer"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_Om..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "Dagers varsel f�r skifte :"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "Legg til filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Slett valgte rad"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Brukere"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "Opprett hjemmekatalog"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Grupper"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID(brukerID): "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Fullt navn"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr "Navnet m� innholde bare sm� bokstaver, numre, `-' og `_'"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Hjemmekatalog"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Innloggingsskall"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"Passordet er for enkelt. \n"
+" Bra passord b�r v�re p� over 6 tegn"
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Prim�rgruppe"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "Dager f�r skifte kreves :"
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Status"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "Vil du virkelig slette gruppen %s\n"
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "BrukerID"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Vennligst fyll alle felter for passordeldring\n"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Brukernavn"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "Klikk p� ikonet for � endre det"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "GruppeID"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s er en prim�r gruppe for bruker %s\n"
+" Fjern brukeren f�rst"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "Gruppemedlemmer"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/Legg til _gruppe"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Gruppenavn"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Du kan ikke fjern '%s' fra deres prim�re gruppe"
 
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr "Legg til bruker"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Mandrake Linux brukeradministreringsverkt�y"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "Legg til en bruker til systemet"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "Gruppene eksisterer allerede, vennligst velg et annet gruppenavn"
 
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "Legg til gruppe"
+#: ../userdrake:1
+#, c-format
+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 ""
+"� legge til en bruker med UID(brukerID) lavere enn 500 er ikke anbefalt.\n"
+" Er du sikker p� at du vil dette?\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Forfatter: "
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "Legg til en gruppe til systemet"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Rediger"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "Rediger valgte rad"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Slett"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Slett valgte rad"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Oppdater"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Oppdater listen"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "Utdatert"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "Stengt"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "Klikk p� ikonet for � endre det"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Opprett ny bruker"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "Opprett hjemmekatalog"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Grupper"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Hjemmekatalog: "
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Prim�rgruppe"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Opprett en privat gruppe for brukeren"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "BrukerID er lavere enn 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "Spesifiser brukerID manuelt"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "Steng brukerkonto"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "Brrukeren eksisterer allerede, vennligst velg et annet brukernavn"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
+"Sleter bruker %s\n"
+" Utf�r ogs� f�lgende handlinger\n"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "Dager f�r skifte er tillatt :"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Hjem"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "Passordene stemmer ikke overens"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"Passordet er for enkelt. \n"
-" Bra passord b�r v�re p� over 6 tegn"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Brrukeren eksisterer allerede, vennligst velg et annet brukernavn"
 
-#: ../userdrake_.c:265
-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 ""
-"� legge til en bruker med UID(brukerID) lavere enn 500 er ikke anbefalt.\n"
-" Er du sikker p� at du vil dette?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
+msgstr "Legg til bruker"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "BrukerID er lavere enn 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID(brukerID): "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "Konto g�r ut (YYYY-MM-DD)"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "Velg gruppe"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_Handlinger"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "Legg til i 'users' gruppen"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Legg til i den eksisterende gruppen"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "Spesifiser brukerID manuelt"
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "En gruppe med dette navnet eksisterer allerede. Hva vil du gj�re?"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/_Fil"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Ja"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "Navnet er for langt"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "Nei"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Lukk"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Brukernavn"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Hjemmekatalog: "
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/_Oppdater"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_Rediger"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "Spesifiser gruppeID manuelt"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "Gruppene eksisterer allerede, vennligst velg et annet gruppenavn"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "Navnfelt er tomt, vennligst gi et navn"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr "Gruppe GID er lavere enn 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Innlogg"
 
-#: ../userdrake_.c:385
-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 ""
-"Oppretter en gruppe med GID lavere enn 500 er ikke anbefalt.\n"
-" Er du sikker p� at du vil dette?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/_Avslutt"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID(gruppeID): "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "En gruppe med dette navnet eksisterer allerede. Hva vil du gj�re?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr "Advarsel : Sletter bruker"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Slett"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"Sleter bruker %s\n"
-" Utf�r ogs� f�lgende handlinger\n"
+"Vennligst spesifiser dato, m�ned og dag \n"
+" for konto utl�psdato "
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Slett hjemmekatalog: %s"
+msgid "User Data"
+msgstr "Brukerdata"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "Slett postboks: /var/spool/mail/%s"
+msgid "Refresh"
+msgstr "Oppdater"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Fullt navn"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "Advarsel : Sletter gruppe"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "Vil du virkelig slette gruppen %s\n"
+msgid " Group Gid is < 500"
+msgstr "Gruppe GID er lavere enn 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s er en prim�r gruppe for bruker %s\n"
-" Fjern brukeren f�rst"
+msgid "Edit selected row"
+msgstr "Rediger valgte rad"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Innlogg"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Gruppenavn"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Status"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Passord"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Bekreft passord:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "Aktiver utl�psdato for passord"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Hjem"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "Velg brukere som skal v�re med i denne gruppen :"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Brukerdata"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Brukere"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "Aktiver utl�psdato for konto"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "Dager f�r konto blir inaktiv :"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "Konto g�r ut (YYYY-MM-DD)"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "GruppeID"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "Steng brukerkonto"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "Nei"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Kontoinfo"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_Om..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "Bruker skiftet sist passord den : "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Valg"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "Aktiver utl�psdato for passord"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "BrukerID"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "Dager f�r skifte er tillatt :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "Aktiver utl�psdato for konto"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "Dager f�r skifte kreves :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "Slett postboks: /var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "Dagers varsel f�r skifte :"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Oppdater listen"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "Dager f�r konto blir inaktiv :"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_Hjelp"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Passordinfo"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Slett hjemmekatalog: %s"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Brukeradministrering \n"
+
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Velg gruppene som brukeren vil bli medlem av:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "Gruppedata"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "Velg brukere som skal v�re med i denne gruppen :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "Stengt"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Gruppebrukere"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "Legg til gruppe"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "Vennligst velg minst en gruppe for brukeren"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Vennligst spesifiser dato, m�ned og dag \n"
-" for konto utl�psdato "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "Bruker skiftet sist passord den : "
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
-msgstr "Vennligst fyll alle felter for passordeldring\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Rapporter feil"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Du kan ikke fjern '%s' fra deres prim�re gruppe"
+msgid "Yes"
+msgstr "Ja"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Lukk"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Gruppedata"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID(gruppeID): "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Forfatter: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Bekreft passord:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Brukeradministrering \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/_Legg til bruker"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright � 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Filtrer systembrukere"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "Navnfelt er tomt, vennligst gi et navn"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "Passordinfo"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "Navnet m� innholde bare sm� bokstaver, numre, `-' og `_'"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "S�k:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "Navnet er for langt"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Legg til i den eksisterende gruppen"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Feil"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "Velg gruppe"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "Legg til filter"
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "Generell hjelp om userdrake"
diff --git a/po/nl.po b/po/nl.po
index 6284275..d2d6124 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-nl\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-08-18 15:05+0200\n"
 "Last-Translator: Hendrik-Jan Heins <hjh@passys.nl>\n"
 "Language-Team: Nederlands <vertaling@nl.linux.org>\n"
@@ -20,460 +20,561 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Mandrake Linux gebruikersbeheer toepassing"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_Acties"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright © 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/Be_werken"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Gebruikers groeperen"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_Verwijderen"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Systeemgebruikers weglaten"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_Opties"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Een groep aanmaken met een GID van lager dan 500 wordt niet aangeraden.\n"
+" Weet u zeker dat u dit wilt doen?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_Bestand"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Aanmeldshell"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/_Vernieuwen"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Privé-groep aanmaken voor de gebruiker"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/A_fsluiten"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Bewerken"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "Gebruiker toevoegen aan het systeem"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/Ge_bruiker toevoegen"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Account-informatie"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/_Groep toevoegen"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "Waarschuwing: Gebruiker wordt nu verwijderd"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/_Hulp"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Fout"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/P_rogrammafout rapporteren"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "Groepsleden"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_Info..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "Dagen voordat veranderwaarschuwing wordt gegeven:"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "Filter toepassen"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Geselecteerde rij verwijderen"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Gebruikers"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "Persoonlijke map aanmaken"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Groepen"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Volledige Naam"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr ""
+"De naam mag alleen bestaan uit alleen kleine letters, cijfers, `-' en `_'"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Persoonlijke map"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Aanmeldshell"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"Dit wachtwoord is te eenvoudig. \n"
+"Een goed wachtwoord bevat tenminste 6 karakters"
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Primaire groep"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "Dagen voor verandering noodzakelijk is:"
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Status"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "Weet u zeker dat u de groep %s wilt verwijderen\n"
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "Gebruikers-ID"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Vul alle velden in voor wachtwoord-verloop\n"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Gebruikersnaam"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "Klik op het icoon om het te veranderen"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "Groep-ID"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s is een primaire groep voor gebruiker %s\n"
+" Verwijder eerst de gebruiker"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "Groepsleden"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/_Groep toevoegen"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Groepsnaam"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "U kunt gebruiker '%s' niet verwijderen uit zijn primaire groep"
 
-# broken into two lines to avoid too large a button
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr ""
-"Gebruiker\n"
-"toevoegen"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Mandrake Linux gebruikersbeheer toepassing"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "Gebruiker toevoegen aan het systeem"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "De groep bestaat al, kies een andere groepsnaam"
 
-# broken into two lines to avoid too large a button
-#: ../userdrake_.c:136
-msgid "Add Group"
+#: ../userdrake:1
+#, c-format
+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 ""
-"Groep\n"
-"toevoegen"
+"Een gebruiker aanmaken met een UID lager dan 500 wordt niet aangeraden.\n"
+" Weet u zeker dat u dit wilt doen?\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Auteurs: "
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "Groep toevoegen aan het systeem"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Bewerken"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "Geselecteerde rij bewerken"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Verwijderen"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Geselecteerde rij verwijderen"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Verversen"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "De lijst verversen"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "Verlopen"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "Afgesloten"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "Klik op het icoon om het te veranderen"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Nieuwe gebruiker aanmaken"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "Persoonlijke map aanmaken"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Groepen"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Persoonlijke map: "
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Primaire groep"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Privé-groep aanmaken voor de gebruiker"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "Gebruikers UID is < 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "Handmatig gebruikers-ID opgeven"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "Gebruikersaccount op slot zetten"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "De gebruiker bestaat al, kies een andere gebruikersnaam"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
+"Verwijderen van gebruiker %s\n"
+" Voer ook de volgende acties uit\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "Dagen voor verandering wordt toegestaan: "
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Persoonlijke map"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "Wachtwoord komt niet overeen"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"Dit wachtwoord is te eenvoudig. \n"
-"Een goed wachtwoord bevat tenminste 6 karakters"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "De gebruiker bestaat al, kies een andere gebruikersnaam"
 
-#: ../userdrake_.c:265
-msgid ""
-"Creating a user with a UID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+# broken into two lines to avoid too large a button
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
 msgstr ""
-"Een gebruiker aanmaken met een UID lager dan 500 wordt niet aangeraden.\n"
-" Weet u zeker dat u dit wilt doen?\n"
-"\n"
+"Gebruiker\n"
+"toevoegen"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "Gebruikers UID is < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "Account verloopt op (YYYY-MM-DD):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "Kies een groep"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_Acties"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "Toevoegen aan de groep 'users'"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Toevoegen aan de bestaande groep"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "Handmatig gebruikers-ID opgeven"
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "Een groep met deze naam bestaat al. Wat wilt u nu doen?"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/_Bestand"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Ja"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "De naam is te lang"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "Nee"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Sluiten"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Gebruikersnaam"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Persoonlijke map: "
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/_Vernieuwen"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/Be_werken"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "Handmatig groeps-ID opgeven"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "De groep bestaat al, kies een andere groepsnaam"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "Naam-veld is leeg, geef een naam op"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr " De groep GID is < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Aanmeldnaam"
 
-#: ../userdrake_.c:385
-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 ""
-"Een groep aanmaken met een GID van lager dan 500 wordt niet aangeraden.\n"
-" Weet u zeker dat u dit wilt doen?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/A_fsluiten"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "Een groep met deze naam bestaat al. Wat wilt u nu doen?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr "Waarschuwing: Gebruiker wordt nu verwijderd"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Verwijderen"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"Verwijderen van gebruiker %s\n"
-" Voer ook de volgende acties uit\n"
+"Geef een jaar, maand en dag op \n"
+" waarop de account verloopt "
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Persoonlijke map verwijderen :%s"
+msgid "User Data"
+msgstr "Gebruikersgegevens"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "Verwijder Mailbox :/var/spool/mail/%s"
+msgid "Refresh"
+msgstr "Verversen"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Volledige Naam"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "Waarschuwing : Groep wordt nu verwijderd"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "Weet u zeker dat u de groep %s wilt verwijderen\n"
+msgid " Group Gid is < 500"
+msgstr " De groep GID is < 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s is een primaire groep voor gebruiker %s\n"
-" Verwijder eerst de gebruiker"
+msgid "Edit selected row"
+msgstr "Geselecteerde rij bewerken"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Aanmeldnaam"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Groepsnaam"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Status"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Bevestig wachtwoord:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "Verlopen van wachtwoord inschakelen"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Persoonlijke map"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "Selecteer de gebruikers die lid moeten zijn van deze groep:"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Gebruikersgegevens"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Gebruikers"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "Verlopen van account inschakelen"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "Dagen voordat de account wordt gedeactiveerd:"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "Account verloopt op (YYYY-MM-DD):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "Groep-ID"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "Gebruikersaccount op slot zetten"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "Nee"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Account-informatie"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_Info..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "De gebruiker heeft het wachtwoord voor het laatst veranderd op: "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Opties"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "Verlopen van wachtwoord inschakelen"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "Gebruikers-ID"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "Dagen voor verandering wordt toegestaan: "
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "Verlopen van account inschakelen"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "Dagen voor verandering noodzakelijk is:"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "Verwijder Mailbox :/var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "Dagen voordat veranderwaarschuwing wordt gegeven:"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "De lijst verversen"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "Dagen voordat de account wordt gedeactiveerd:"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_Hulp"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Wachtwoord-informatie"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Persoonlijke map verwijderen :%s"
+
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Gebruikersbeheer \n"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Selecteer de groepen waar de gebruiker lid van moet zijn:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "Groepsgegevens"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "Selecteer de gebruikers die lid moeten zijn van deze groep:"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "Afgesloten"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Gebruikers groeperen"
+# broken into two lines to avoid too large a button
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr ""
+"Groep\n"
+"toevoegen"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "Selecteer tenminste één groep voor de gebruiker"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Geef een jaar, maand en dag op \n"
-" waarop de account verloopt "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "De gebruiker heeft het wachtwoord voor het laatst veranderd op: "
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
-msgstr "Vul alle velden in voor wachtwoord-verloop\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/P_rogrammafout rapporteren"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "U kunt gebruiker '%s' niet verwijderen uit zijn primaire groep"
+msgid "Yes"
+msgstr "Ja"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Sluiten"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Groepsgegevens"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Auteurs: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Bevestig wachtwoord:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Gebruikersbeheer \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/Ge_bruiker toevoegen"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright © 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Systeemgebruikers weglaten"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "Naam-veld is leeg, geef een naam op"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "Wachtwoord-informatie"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr ""
-"De naam mag alleen bestaan uit alleen kleine letters, cijfers, `-' en `_'"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Zoeken:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "De naam is te lang"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Toevoegen aan de bestaande groep"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Fout"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "Kies een groep"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "Filter toepassen"
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "Algemene hulp over Userdrake"
diff --git a/po/pl.po b/po/pl.po
index 3a4b39f..c4aa8fc 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+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,453 +18,554 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.5.5\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Narzędzie do zarządzania użytkownikami dla Linuksa Mandrake"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_Czynności"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright (C) 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_Edycja"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Użytkownikcy grupowi"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_Usuń"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Filtruj użytkowników systemowych"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_Opcje"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Tworzenie grupy z GID mniejszym niż 500 nie jest zalecane.\n"
+" Czy naprawdę chcesz to zrobić?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_Plik"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Powłoka logowania"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/O_dśwież"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Tworzy prywatną grupę dla użytkownika"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/_Zakończ"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Edytuj"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "Dodaje użytkownika do systemu"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/_Dodaj użytkownika"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Informacje o koncie"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/Dodaj g_rupę"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "Ostrzeżenie : Usuwanie użytkownika"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/_Pomoc"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Błąd"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_Zgłoś błąd"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "Członkowie grupy"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_O programie"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "Dni ostrzeżenia przed zmianą :"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "Zastosuj filtr"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Usuwa wybrany wiersz"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Użytkownicy"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "Utwórz katalog domowy"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Grupy"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Pełna nazwa"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr "Nazwa musi zawierać tylko małe litery, liczby, \"-\" lub \"_\""
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Katalog domowy"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Powłoka logowania"
-
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Podstawowa grupa"
-
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Stan"
-
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "ID użytkownika"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"Hasło jest za proste.\n"
+" Dobre hasła powinny posiadać więcej niż 6 znaków"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Nazwa użytkownika"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "Dni przed wymaganą zmianą :"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "ID grupy"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "Czy na pewno chcesz usunąć grupę %s\n"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "Członkowie grupy"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Wypełnij wszystkie pola związane z wiekiem hasła\n"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Nazwa grupy"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "Kliknij na ikonę aby ją zmienić"
 
-# broken into two lines to avoid too large a button
-#: ../userdrake_.c:135
-msgid "Add User"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
 msgstr ""
-"Dodaj\n"
-"użytkownika"
-
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "Dodaje użytkownika do systemu"
-
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "Dodaj grupę"
+"%s jest podstawową grupą dla użytkownika %s\n"
+" Usuń najpierw użytkownika"
 
-#: ../userdrake_.c:136
-msgid "Add a group to the system"
-msgstr "Dodaje grupę do systemu"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/Dodaj g_rupę"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Edytuj"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Nie można usunąć użytkownika \"%s\" z głównej grupy"
 
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "Modyfikuje wybrany wiersz"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Narzędzie do zarządzania użytkownikami dla Linuksa Mandrake"
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Usuń"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "Grupa już istnieje, wybierz inną nazwę grupy"
 
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Usuwa wybrany wiersz"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Tworzenie użytkownika z ID mniejszym niż 500 nie jest zalecane.\n"
+" Czy na pewno chcesz to zrobić?\n"
+"\n"
 
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Odśwież"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Autorzy: "
 
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Odświeża listę"
+#: ../userdrake:1
+#, c-format
+msgid "Add a group to the system"
+msgstr "Dodaje grupę do systemu"
 
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "Wygasło"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "Zablokowane"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "Kliknij na ikonę aby ją zmienić"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Utwórz nowego użytkownika"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "Utwórz katalog domowy"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Grupy"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Katalog domowy: "
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Podstawowa grupa"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Tworzy prywatną grupę dla użytkownika"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "ID Użytkownika jest < 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "Określ ręcznie ID użytkownika"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "Zablokuj konto użytkownika"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "Użytkownik już istnieje, wybierz inną nazwę użytkownika"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
+"Usuwanie użytkownika %s\n"
+" uruchamia także poniższe operacje\n"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "Dni przed dozwoloną zmianą :"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Katalog domowy"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "Hasła się nie zgadzają"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"Hasło jest za proste.\n"
-" Dobre hasła powinny posiadać więcej niż 6 znaków"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Użytkownik już istnieje, wybierz inną nazwę użytkownika"
 
-#: ../userdrake_.c:265
-msgid ""
-"Creating a user with a UID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+# broken into two lines to avoid too large a button
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
 msgstr ""
-"Tworzenie użytkownika z ID mniejszym niż 500 nie jest zalecane.\n"
-" Czy na pewno chcesz to zrobić?\n"
-"\n"
+"Dodaj\n"
+"użytkownika"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "ID Użytkownika jest < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "Konto wygasa    (YYYY-MM-DD):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "Wybierz grupę"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_Czynności"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "Dodaj do grupy \"users\""
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Dodaj do istniejącej grupy"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "Określ ręcznie ID użytkownika"
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "Grupa o tej nazwie już istnieje. Co chcesz uczynić?"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/_Plik"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Tak"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "Nazwa jest za długa"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "Nie"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Zamknij"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Nazwa użytkownika"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Katalog domowy: "
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/O_dśwież"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_Edycja"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "Określ ręcznie ID grupy"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "Grupa już istnieje, wybierz inną nazwę grupy"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "Pole nazwy jest puste, podaj inną nazwę"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr " ID grupy jest < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Użytkownik"
 
-#: ../userdrake_.c:385
-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 ""
-"Tworzenie grupy z GID mniejszym niż 500 nie jest zalecane.\n"
-" Czy naprawdę chcesz to zrobić?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/_Zakończ"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "Grupa o tej nazwie już istnieje. Co chcesz uczynić?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr "Ostrzeżenie : Usuwanie użytkownika"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Usuń"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"Usuwanie użytkownika %s\n"
-" uruchamia także poniższe operacje\n"
+"Podaj rok, miesiąc i dzień\n"
+" terminu ważności konta "
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Usuń katalog domowy :%s"
+msgid "User Data"
+msgstr "Dane użytkownika"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "Usuń skrzynkę pocztową :/var/spool/mail/%s"
+msgid "Refresh"
+msgstr "Odśwież"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Pełna nazwa"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "Ostrzeżenie : Usuwanie grupy"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "Czy na pewno chcesz usunąć grupę %s\n"
+msgid " Group Gid is < 500"
+msgstr " ID grupy jest < 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s jest podstawową grupą dla użytkownika %s\n"
-" Usuń najpierw użytkownika"
+msgid "Edit selected row"
+msgstr "Modyfikuje wybrany wiersz"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Użytkownik"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Nazwa grupy"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Stan"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Hasło"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Potwierdź hasło:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "Włącz wygasanie hasła"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Katalog domowy"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "Wybierz użytkownika dołączanego do grupy :"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Dane użytkownika"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Użytkownicy"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "Włączone wygasanie haseł"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "Dni przed wyłączeniem konta :"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "Konto wygasa    (YYYY-MM-DD):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "ID grupy"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "Zablokuj konto użytkownika"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "Nie"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Informacje o koncie"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_O programie"
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "Użytkownik ostatnio zmieniał hasło : "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Opcje"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "Włącz wygasanie hasła"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "ID użytkownika"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "Dni przed dozwoloną zmianą :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "Włączone wygasanie haseł"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "Dni przed wymaganą zmianą :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "Usuń skrzynkę pocztową :/var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "Dni ostrzeżenia przed zmianą :"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Odświeża listę"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "Dni przed wyłączeniem konta :"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_Pomoc"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Informacje o haśle"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Usuń katalog domowy :%s"
+
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Zarządzanie użytkownikami\n"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Wybierz grupy, których użytkownik będzie członkiem:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "Dane grupy"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "Wybierz użytkownika dołączanego do grupy :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "Zablokowane"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Użytkownikcy grupowi"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "Dodaj grupę"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "Wybierz co najmniej jedną grupę dla użytkownika"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Podaj rok, miesiąc i dzień\n"
-" terminu ważności konta "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "Użytkownik ostatnio zmieniał hasło : "
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
-msgstr "Wypełnij wszystkie pola związane z wiekiem hasła\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Zgłoś błąd"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Nie można usunąć użytkownika \"%s\" z głównej grupy"
+msgid "Yes"
+msgstr "Tak"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Zamknij"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Dane grupy"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Autorzy: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Potwierdź hasło:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Zarządzanie użytkownikami\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/_Dodaj użytkownika"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright (C) 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Filtruj użytkowników systemowych"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "Pole nazwy jest puste, podaj inną nazwę"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "Informacje o haśle"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "Nazwa musi zawierać tylko małe litery, liczby, \"-\" lub \"_\""
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Wyszukaj:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "Nazwa jest za długa"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Dodaj do istniejącej grupy"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Błąd"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "Wybierz grupę"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "Zastosuj filtr"
diff --git a/po/pt.po b/po/pt.po
index 3eeb3bc..e1cc696 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-pt\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-07-30 11:46+0200\n"
 "Last-Translator: Jose JORGE <jjorge@free.fr>\n"
 "Language-Team: portugu�s <pt@li.org>\n"
@@ -22,462 +22,562 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Ferramenta de Gest�o dos Utilizadores Mandrake Linux"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_Ac��es"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright � 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_Editar"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Utilizadores do Grupo"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_Apagar"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Filtrar os utilizadores sistema"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_Op��es"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Criar um grupo com um GID inferior a 500 � desaconselhado.\n"
+" Tem a certeza que deseja fazer-lo?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_Ficheiro"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Linha de Commando"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/_Recarregar"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Criar um grupo privativo para o utilizador"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/_Sair"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Editar"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>S"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "Adiciona um utilizador ao sistema"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/_Adicionar Utilizador"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Informa��es sobre a Conta"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/Adicionar _Grupo"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/_Ajuda"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Erro"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_Communicar um Erro"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "Membros do Grupo"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_Acerca..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "Dias de aviso antes da mudan�a :"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "Aplicar filtro"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Apaga a linha seleccionada"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Utilizadores"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "Criar Directoria Pessoal"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Grupos"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Nome Completo"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr "O nome s� pode conter letras min�sculas, n�meros, '-' e '_'"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Directoria Pessoal"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Linha de Commando"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"Esta senha � demasiado simples. \n"
+" As boas senhas deveriam ter mais de 6 simbolos"
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Grupo Principal"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "Dias antes de exigir a mudan�a :"
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Estado"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "ID Utilizador"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Por favor preencha tudo nas idades da senha\n"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Nome do Utilizador"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "Carregue na �cone para a mudar"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "ID Grupo"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s � o grupo principal do utilizador %s\n"
+" Apague o utilizador primeiro"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "Membros do Grupo"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/Adicionar _Grupo"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Nome do Grupo"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Voc� n�o pode remover o utilizador '%s' do seu grupo principal"
 
-# broken into two lines to avoid too large a button
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr ""
-"Adicionar\n"
-"Utilizador"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Ferramenta de Gest�o dos Utilizadores Mandrake Linux"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "Adiciona um utilizador ao sistema"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "O grupo j� existe, escolha por favor outro Nome de Grupo"
 
-# broken into two lines to avoid too large a button
-#: ../userdrake_.c:136
-msgid "Add Group"
+#: ../userdrake:1
+#, c-format
+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 ""
-"Adicionar\n"
-"Grupo"
+"Criar um utilizador com um UID inferior a 500 � desaconselhado.\n"
+" Tem a certeza que deseja fazer-lo?\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Autores : "
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "Adiciona um grupo ao sistema"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Editar"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "Edita a linha seleccionada"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Apagar"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Apaga a linha seleccionada"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Recarregar"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Recarrega a lista"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "Expirado"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "Bloqueado"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "Carregue na �cone para a mudar"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Criar um Novo Utilizador"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "Criar Directoria Pessoal"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Grupos"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Directoria Pessoal : "
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Grupo Principal"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Criar um grupo privativo para o utilizador"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "Uid utilizador < 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "Indicar manualmente o ID do utilizador"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "Bloquer a Conta do Utilizador"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
-"Este utilizador j� existe no sistema, escolha por favor outro Nome de "
-"Utilizador"
+"A apagar o utilizador %s\n"
+" Tamb�m fazer as ac��es seguintes\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "Dias antes de permitir a mudan�a :"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Directoria pessoal (home)"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "As senhas s�o diferentes"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
 msgstr ""
-"Esta senha � demasiado simples. \n"
-" As boas senhas deveriam ter mais de 6 simbolos"
+"Este utilizador j� existe no sistema, escolha por favor outro Nome de "
+"Utilizador"
 
-#: ../userdrake_.c:265
-msgid ""
-"Creating a user with a UID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+# broken into two lines to avoid too large a button
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
 msgstr ""
-"Criar um utilizador com um UID inferior a 500 � desaconselhado.\n"
-" Tem a certeza que deseja fazer-lo?\n"
-"\n"
+"Adicionar\n"
+"Utilizador"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "Uid utilizador < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "A conta expira em (YYYY-MM-DD):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "Escolher o Grupo"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_Ac��es"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "Adicionar ao grupo do utilizador"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Adicionar ao grupo existente"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "Indicar manualmente o ID do utilizador"
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "Um grupo com o mesmo nome j� existe.  Que deseja fazer?"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/_Ficheiro"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Sim"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "O nome � demasiado comprido"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "N�o"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Fechar"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Nome do Utilizador"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Directoria Pessoal : "
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/_Recarregar"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_Editar"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>S"
+
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "Indicar o ID do grupo manualmente"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "O grupo j� existe, escolha por favor outro Nome de Grupo"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "A zona do nome est� vazia, por favor indique um nome"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr "Gid do Grupo � < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Login"
 
-#: ../userdrake_.c:385
-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 ""
-"Criar um grupo com um GID inferior a 500 � desaconselhado.\n"
-" Tem a certeza que deseja fazer-lo?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/_Sair"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "Um grupo com o mesmo nome j� existe.  Que deseja fazer?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Apagar"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"A apagar o utilizador %s\n"
-" Tamb�m fazer as ac��es seguintes\n"
+"Por favor indique o Ano, M�s e Dia\n"
+"para a Expira��o da Conta "
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Apagar Directoria pessoal : %s"
+msgid "User Data"
+msgstr "Dados do Utilizador"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "Apagar a Caixa de Correio : /var/spool/mail/%s"
+msgid "Refresh"
+msgstr "Recarregar"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Nome Completo"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr ""
+msgid " Group Gid is < 500"
+msgstr "Gid do Grupo � < 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s � o grupo principal do utilizador %s\n"
-" Apague o utilizador primeiro"
+msgid "Edit selected row"
+msgstr "Edita a linha seleccionada"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Login"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Nome do Grupo"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Estado"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Senha"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Confirme a Senha :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "Permitir a Expira��o da Senha"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Directoria pessoal (home)"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "Escolha os utilizadores a adicionar ao grupo :"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Dados do Utilizador"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Utilizadores"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "Permitir a expira�ao da conta"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "Dias antes que a conta se desactive :"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "A conta expira em (YYYY-MM-DD):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "ID Grupo"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "Bloquer a Conta do Utilizador"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "N�o"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Informa��es sobre a Conta"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_Acerca..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "O utilizador alterou a senha em : "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Op��es"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "Permitir a Expira��o da Senha"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "ID Utilizador"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "Dias antes de permitir a mudan�a :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "Permitir a expira�ao da conta"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "Dias antes de exigir a mudan�a :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "Apagar a Caixa de Correio : /var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "Dias de aviso antes da mudan�a :"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Recarrega a lista"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "Dias antes que a conta se desactive :"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_Ajuda"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Informa��o da Senha"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Apagar Directoria pessoal : %s"
+
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Gest�o dos Utilizadores \n"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Escolha os grupos dos quais o utilizador vai ser membro :"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "Dados do Grupo"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "Escolha os utilizadores a adicionar ao grupo :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "Bloqueado"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Utilizadores do Grupo"
+# broken into two lines to avoid too large a button
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr ""
+"Adicionar\n"
+"Grupo"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "Por favor escolha pelo menos um grupo para o utilizador"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Por favor indique o Ano, M�s e Dia\n"
-"para a Expira��o da Conta "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "O utilizador alterou a senha em : "
 
-#: ../userdrake_.c:753
-#, fuzzy
-msgid "Please fill up all fields in password aging\n"
-msgstr "Por favor preencha tudo nas idades da senha\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Communicar um Erro"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Voc� n�o pode remover o utilizador '%s' do seu grupo principal"
+msgid "Yes"
+msgstr "Sim"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Fechar"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Dados do Grupo"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Autores : "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Confirme a Senha :"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Gest�o dos Utilizadores \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/_Adicionar Utilizador"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright � 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Filtrar os utilizadores sistema"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "A zona do nome est� vazia, por favor indique um nome"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "Informa��o da Senha"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "O nome s� pode conter letras min�sculas, n�meros, '-' e '_'"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Procurar:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "O nome � demasiado comprido"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Adicionar ao grupo existente"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Erro"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "Escolher o Grupo"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "Aplicar filtro"
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "Ajuda geral do userdrake"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8280a3b..0919bb5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-pt_BR\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-08-18 15:35+0200\n"
 "Last-Translator: Tiago Cruz <tiagocruz@linuxdicas.com.br>\n"
 "Language-Team: Portugu�s do Brasil <linux_pt_BR@yahoogrupos.com.br>\n"
@@ -24,459 +24,560 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Ferramenta de Gerenciamento de Usu�rios Mandrake Linux"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/A��es"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright � 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_Editar"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Grupo de Usu�rios"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/Apagar"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Filtrar usu�rios do sistema"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_Op��es"
+#: ../userdrake:1
+#, c-format
+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 ""
+"N�o � recomendado criar um grupo com identifica��o < que 500.\n"
+"Voce tem certeza que quer isso?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/Arquivo"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Login"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/Atualizar"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Criar grupo privado deste usu�rio"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/Encerrar"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Editar"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "Adiciona um usu�rio ao sistema"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/Adicionar _usu�rio"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Informa��es da conta"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/Adicionar _grupo"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "Aten��o: Excluindo Usu�rio"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/A_juda"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Erro"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_Relat�rio de erros"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "Membros do Grupo"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_Sobre..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "Dias de alerta antes do vencimento"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "Aplicar filtro"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Apagar linha selecionada"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Usu�rios"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "Criar diret�rio principal do usu�rio"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Grupos"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID"
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Nome completo"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr "O nome deve conter apenas caracteres min�sculos, n�meros,'-' e '_'"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Diret�rio do usu�rio"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Login"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"Esta senha � muito simples. \n"
+"Senhas seguras devem ter mais de 6 caracteres."
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Grupo prim�rio"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "Dias depois do vencimento"
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Status"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "Voc� deseja realmente excluir o grupo %s\n"
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "Usu�rio"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Favor preencher todos os campos da senha\n"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Nome do usu�rio"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "Clique no �cone para muda-lo"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "Grupo"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s � o grupo principal do usu�rio %s\n"
+"Primeiro apague o usu�rio"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "Membros do Grupo"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/Adicionar _grupo"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Nome do grupo"
+#: ../userdrake:1
+#, 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"
 
-# broken into two lines to avoid too large a button
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr ""
-"Adicionar\n"
-"usu�rio"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Ferramenta de Gerenciamento de Usu�rios Mandrake Linux"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "Adiciona um usu�rio ao sistema"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "Este grupo j� existe. Por favor, escolha outro nome"
 
-# broken into two lines to avoid too large a button
-#: ../userdrake_.c:136
-msgid "Add Group"
+#: ../userdrake:1
+#, c-format
+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 ""
-"Adicionar\n"
-"grupo"
+"Criar um usu�rio com uma UID menor que 500 n�o � recomendado.\n"
+"Voce tem certeza que quer isso?\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Autores:"
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "Adicionar um grupo ao sistema"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Editar"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "Editar linha selecionada"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Apagar"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Apagar linha selecionada"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Atualizar"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Atualizar a lista de usu�rios"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "Expirado"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "Travado"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "Clique no �cone para muda-lo"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Criar novo usu�rio"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "Criar diret�rio principal do usu�rio"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Grupos"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Diret�rio principal"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Grupo prim�rio"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Criar grupo privado deste usu�rio"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "UID do usu�rio < 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "Informe manualmente o ID deste usu�rio"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "Trava a conta do usu�rio"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "Esse nome j� existe. Por favor escolha outro."
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
+"Apagando usu�rio %s\n"
+"Fazendo tamb�m as seguintes a��es\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "Dias antes do vencimento"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Home"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "Senhas diferentes"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"Esta senha � muito simples. \n"
-"Senhas seguras devem ter mais de 6 caracteres."
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Esse nome j� existe. Por favor escolha outro."
 
-#: ../userdrake_.c:265
-msgid ""
-"Creating a user with a UID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+# broken into two lines to avoid too large a button
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
 msgstr ""
-"Criar um usu�rio com uma UID menor que 500 n�o � recomendado.\n"
-"Voce tem certeza que quer isso?\n"
-"\n"
+"Adicionar\n"
+"usu�rio"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "UID do usu�rio < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID"
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "Conta termina em (YYYY-MM-DD):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "Selecione um Grupo"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/A��es"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "Adicione usu�rio ao grupo"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Adicione a um grupo existente"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "Informe manualmente o ID deste usu�rio"
 
-#: ../userdrake_.c:334
-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:1
+#, c-format
+msgid "/_File"
+msgstr "/Arquivo"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Sim"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "Nome muito grande"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "N�o"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Fechar"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Nome do usu�rio"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Diret�rio principal"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/Atualizar"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_Editar"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "Informe manualmente o ID do grupo"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "Este grupo j� existe. Por favor, escolha outro nome"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "O campo do nome est� vazio! Coloque um nome"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr "Identifica��o do Grupo � < de 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Login"
 
-#: ../userdrake_.c:385
-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 ""
-"N�o � recomendado criar um grupo com identifica��o < que 500.\n"
-"Voce tem certeza que quer isso?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/Encerrar"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID"
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "Um grupo com este nome j� existe. O que voce quer fazer?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr "Aten��o: Excluindo Usu�rio"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Apagar"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"Apagando usu�rio %s\n"
-"Fazendo tamb�m as seguintes a��es\n"
+"Favor informar Ano, Mes e Dia\n"
+"de vencimento desta conta"
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Apagar Diret�rio principal do usu�rio: %s"
+msgid "User Data"
+msgstr "Dados do usu�rio"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "Apagar Caixa de Correio: /var/spool/mail/%s"
+msgid "Refresh"
+msgstr "Atualizar"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Nome completo"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "Aten��o: Excluindo Grupo"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "Voc� deseja realmente excluir o grupo %s\n"
+msgid " Group Gid is < 500"
+msgstr "Identifica��o do Grupo � < de 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s � o grupo principal do usu�rio %s\n"
-"Primeiro apague o usu�rio"
+msgid "Edit selected row"
+msgstr "Editar linha selecionada"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Login"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Nome do grupo"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Status"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Senha"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Confirme a senha:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "Permite vencimento da senha"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Home"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "Selecione os usu�rios para juntar-se a este grupo:"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Dados do usu�rio"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Usu�rios"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "Permite vencimento da conta"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "Dias antes de conta inativa"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "Conta termina em (YYYY-MM-DD):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "Grupo"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "Trava a conta do usu�rio"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "N�o"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Informa��es da conta"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_Sobre..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "�ltima mudan�a de senha"
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Op��es"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "Permite vencimento da senha"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "Usu�rio"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "Dias antes do vencimento"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "Permite vencimento da conta"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "Dias depois do vencimento"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "Apagar Caixa de Correio: /var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "Dias de alerta antes do vencimento"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Atualizar a lista de usu�rios"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "Dias antes de conta inativa"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/A_juda"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Informa��es de Senha"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Apagar Diret�rio principal do usu�rio: %s"
+
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Gerenciamento de Usu�rios\n"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
 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:671
-msgid "Group Data"
-msgstr "Lista de grupos"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "Selecione os usu�rios para juntar-se a este grupo:"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "Travado"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Grupo de Usu�rios"
+# broken into two lines to avoid too large a button
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr ""
+"Adicionar\n"
+"grupo"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "Por favor, selecione ao menos um grupo para este usu�rio"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Favor informar Ano, Mes e Dia\n"
-"de vencimento desta conta"
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "�ltima mudan�a de senha"
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
-msgstr "Favor preencher todos os campos da senha\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Relat�rio de erros"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, 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"
+msgid "Yes"
+msgstr "Sim"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Fechar"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Lista de grupos"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID"
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Autores:"
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Confirme a senha:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Gerenciamento de Usu�rios\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/Adicionar _usu�rio"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright � 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Filtrar usu�rios do sistema"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "O campo do nome est� vazio! Coloque um nome"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "Informa��es de Senha"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "O nome deve conter apenas caracteres min�sculos, n�meros,'-' e '_'"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Procurar:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "Nome muito grande"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Adicione a um grupo existente"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Erro"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "Selecione um Grupo"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "Aplicar filtro"
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "Ajuda no UserDrake"
diff --git a/po/ro.po b/po/ro.po
index 62972e7..f80f270 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-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+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,465 +18,560 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Unealta de administrare a utilizatorilor Mandrake Linux"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_Acţiuni"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright (C) 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_Editează"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Grupuri de utilizatori"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_Şterge"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Filtrare utilizatori sistem"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_Opţiuni"
-
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_Fişier"
-
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/Actualiza_re"
-
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/_Terminare"
-
-#: ../userdrake_.c:74
-msgid "<control>Q"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Nu este recomandată crearea unui grup cu ID-ul mai mic de 500.\n"
+"Chiar doriţi acest lucru?\n"
+"\n"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/_Adaugă utilizator"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Interpretor de comenzi"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/Adaugă _grup"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Creează un grup privat pentru utilizator"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/A_jutor"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Editează"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_Raportare eroare"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "Adaugă un utilizator la sistem"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_Despre..."
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Informaţii despre cont"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
 msgstr ""
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Utilizatori"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Eroare"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Grupuri"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "Membrii din grup"
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Nume complet"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "Zile îde averizare inaintea termenului modificării : "
 
-#: ../userdrake_.c:122
-msgid "Home Directory"
-msgstr "Directorul iniţial al utilizatorului"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Şterge rândul selectat"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Interpretor de comenzi"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Create Home Directory"
+msgstr "Creează directorul iniţial al utilizatorului"
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Grup principal"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "Status"
-msgstr "Porneşte TLS"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr "Numele trebuie să conţină numai litere mici, numere, `-' şi `_'"
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "ID utilizator"
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory"
+msgstr "Directorul iniţial al utilizatorului"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Nume utilizator"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"Această parolă este prea simplă.\n"
+"Parolele  bune au mai mult de 6 caractere alfanumerice"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "ID Grup"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "Zile înainte de cererea modificării : "
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "Membrii din grup"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Nume grup"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Vă rog să specificaţi toate câmpurile legate de expirarea parolei"
 
-# broken into two lines to avoid too large a button
-#: ../userdrake_.c:135
-msgid "Add User"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
 msgstr ""
-"Adaugă\n"
-"utilizator"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "Adaugă un utilizator la sistem"
-
-# broken into two lines to avoid too large a button
-#: ../userdrake_.c:136
-msgid "Add Group"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
 msgstr ""
-"Adaugă\n"
-"grup"
+"%s este grup principal pentru utilizatorul %s\n"
+" Ştergeţi întâi utilizatorul"
 
-#: ../userdrake_.c:136
-msgid "Add a group to the system"
-msgstr "Adaugă un grup la sistem"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/Adaugă _grup"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Editează"
+#: ../userdrake:1
+#, 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:137
-msgid "Edit selected row"
-msgstr "Editează rândul selectat"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Unealta de administrare a utilizatorilor Mandrake Linux"
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Şterge"
+#: ../userdrake:1
+#, c-format
+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:138
-msgid "Delete selected row"
-msgstr "Şterge rândul selectat"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Nu este recomandată crearea unui utilizator cu ID-ul mai mic de 500.\n"
+"Chiar doriţi acest lucru?\n"
+"\n"
 
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Actualizare"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Autori: "
 
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Actualizare listă utilizatori"
+#: ../userdrake:1
+#, c-format
+msgid "Add a group to the system"
+msgstr "Adaugă un grup la sistem"
 
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr ""
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr ""
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Creează un utilizator nou"
 
-#: ../userdrake_.c:232
-#, fuzzy
-msgid "Create Home Directory"
-msgstr "Creează directorul iniţial al utilizatorului"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Grupuri"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Directorul iniţial al utilizatorului"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Grup principal"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Creează un grup privat pentru utilizator"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "ID-ul utilizatorului este mai mic de 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "Specificare manuală ID utilizator"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "Blocare cont utilizator"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
-"Acest utilizator exista deja, vă rog să folosiţi un alt nume de utilizator"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "Zile înainte de permiterea modificării : "
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Acasă"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "Nepotrivire parolă"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-#, fuzzy
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
 msgstr ""
-"Această parolă este prea simplă.\n"
-"Parolele  bune au mai mult de 6 caractere alfanumerice"
+"Acest utilizator exista deja, vă rog să folosiţi un alt nume de utilizator"
 
-#: ../userdrake_.c:265
-msgid ""
-"Creating a user with a UID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+# broken into two lines to avoid too large a button
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
 msgstr ""
-"Nu este recomandată crearea unui utilizator cu ID-ul mai mic de 500.\n"
-"Chiar doriţi acest lucru?\n"
-"\n"
+"Adaugă\n"
+"utilizator"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "ID-ul utilizatorului este mai mic de 500"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Userdrake"
+msgstr "Userdrake2"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "Contul expiră   MM/DD/YYY"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "Selectare grup"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_Acţiuni"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "Adaugă la grupul 'users'"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Adaugă la un grup existent"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "Specificare manuală ID utilizator"
 
-#: ../userdrake_.c:334
-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:1
+#, c-format
+msgid "/_File"
+msgstr "/_Fişier"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Da"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "Numele este prea lung"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "Nu"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Închide"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Nume utilizator"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Directorul iniţial al utilizatorului"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/Actualiza_re"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_Editează"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "Specificare manuală ID grup"
 
-#: ../userdrake_.c:381
-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:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "Câmpul Nume este gol, completaţi-l"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr "ID-ul grupului este mai mic de 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Logare"
 
-#: ../userdrake_.c:385
-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 ""
-"Nu este recomandată crearea unui grup cu ID-ul mai mic de 500.\n"
-"Chiar doriţi acest lucru?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/_Terminare"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "Un grup cu acest nume există deja. Ce doriţi să faceţi?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Şterge"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
+"Vă rog să specificaţi anul, luna şi ziua\n"
+"de expirare a contului "
 
-#: ../userdrake_.c:453
-#, fuzzy, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Creează directorul iniţial al utilizatorului"
+#: ../userdrake:1
+#, c-format
+msgid "User Data"
+msgstr "Date utilizatori"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr ""
+msgid "Refresh"
+msgstr "Actualizare"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Nume complet"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr ""
+msgid " Group Gid is < 500"
+msgstr "ID-ul grupului este mai mic de 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s este grup principal pentru utilizatorul %s\n"
-" Ştergeţi întâi utilizatorul"
+msgid "Edit selected row"
+msgstr "Editează rândul selectat"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Logare"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Nume grup"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Status"
+msgstr "Porneşte TLS"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Parolă"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Confirmare parolă:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "Activare expirare parolă"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Acasă"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "Selectaţi utilizatorii ce vor aparţine acestui grup :"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Date utilizatori"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Utilizatori"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "Activare expirare cont"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "Zile înaintea dezactivării contului : "
 
-#: ../userdrake_.c:598
-#, fuzzy
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "Contul expiră   MM/DD/YYY"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "ID Grup"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "Blocare cont utilizator"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "Nu"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Informaţii despre cont"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_Despre..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "Utilizatorul a modificat parola ultima dată în : "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Opţiuni"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "Activare expirare parolă"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "ID utilizator"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "Zile înainte de permiterea modificării : "
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "Activare expirare cont"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "Zile înainte de cererea modificării : "
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr ""
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "Zile îde averizare inaintea termenului modificării : "
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Actualizare listă utilizatori"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "Zile înaintea dezactivării contului : "
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/A_jutor"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Informaţii despre parolă"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Creează directorul iniţial al utilizatorului"
+
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Administrare utilizatori \n"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Selectaţi grupurile la care utilizatorul va aparţine:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "Date despre grupuri"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "Selectaţi utilizatorii ce vor aparţine acestui grup :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr ""
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Grupuri de utilizatori"
+# broken into two lines to avoid too large a button
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr ""
+"Adaugă\n"
+"grup"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "Vă rog să selectaţi cel putin un grup pt. utilizator"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Vă rog să specificaţi anul, luna şi ziua\n"
-"de expirare a contului "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "Utilizatorul a modificat parola ultima dată în : "
 
-#: ../userdrake_.c:753
-#, fuzzy
-msgid "Please fill up all fields in password aging\n"
-msgstr "Vă rog să specificaţi toate câmpurile legate de expirarea parolei"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Raportare eroare"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Nu se poate şterge utilizatorul '%s' din grupul său principal"
+msgid "Yes"
+msgstr "Da"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Închide"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Date despre grupuri"
 
-#: ../userdrake_.c:906
-#, fuzzy
-msgid "Userdrake"
-msgstr "Userdrake2"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Autori: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Confirmare parolă:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Administrare utilizatori \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/_Adaugă utilizator"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright (C) 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Filtrare utilizatori sistem"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "Câmpul Nume este gol, completaţi-l"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "Informaţii despre parolă"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "Numele trebuie să conţină numai litere mici, numere, `-' şi `_'"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Căutare:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "Numele este prea lung"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Adaugă la un grup existent"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Eroare"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "Selectare grup"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr ""
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "Ajutor general pentru Userdrake"
diff --git a/po/ru.po b/po/ru.po
index c801341..61ba07b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2-ru\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-08-17 16:31+0300\n"
 "Last-Translator: Alice Lafox <alice@lafox.com.ua>\n"
 "Language-Team: Russian <cooker-i18n@linux-mandrake.com>\n"
@@ -21,458 +21,559 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "������� ��� ���������� �������������� Mandrake Linux"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_��������"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright (C) 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_�������������"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "������ �������������"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_�������"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_������������� ��������� �������������"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_��������"
+#: ../userdrake:1
+#, c-format
+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 ""
+"��������� ������ � GID ����� 500 �� �������������.\n"
+"�� �������, ��� ������ ������� ���?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_����"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "�������� �����"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/_��������"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "������� ������ ������ ��� ������������"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/_�����"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "�������������"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "�������� ������������ � �������"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/�������� _������������"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "���������� �� ��������"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/�������� _������"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "�������������� : ��������� ������������"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/_�������"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "������"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_����� �� ������"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "����� ������"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_� ���������..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "�� ������� ���� ������������� �� ���������:"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "��������� ������"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "������� ��������� ������"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "������������"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "������� �������� �������"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "������"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "������ ���"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr ""
+"��� ������ ��������� ������ ��������� ������� ������� ��������, �����, `-' � "
+"`_'"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "�������� �������"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "�������� �����"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"���� ������ ������� �����. \n"
+"������� ������ ������ ���� > 6 ��������"
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "������� ������"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "����� ������� ���� ����������� ���������:"
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "������"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "�� ������������� ������ ������� ������ %s\n"
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "ID ������������"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "���������� ��������� ��� ���� ��� �������� ������\n"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "��� ������������"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "�������� �� ������ ����� �� �������"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "ID ������"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s �������� ������� ������� ��� ������������ %s\n"
+"������� ������� ������������"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "����� ������"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/�������� _������"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "��� ������"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "�� �� ������ ������� ������������ '%s' �� ��� ������� ������"
 
-# broken into two lines to avoid too large a button
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr ""
-"��������\n"
-"������������"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "������� ��� ���������� �������������� Mandrake Linux"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "�������� ������������ � �������"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "������ ��� ����������, �������� ������ ��� ������"
 
-# broken into two lines to avoid too large a button
-#: ../userdrake_.c:136
-msgid "Add Group"
+#: ../userdrake:1
+#, c-format
+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 ""
-"��������\n"
-"������"
+"��������� ������������� � UID ������ 500 �� �������������.\n"
+"�� �������, ��� ������ ������� ���?\n"
+"\n"
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "������:"
+
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "�������� ������ � �������"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "�������������"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "������������� ��������� ������"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "�������"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "������� ��������� ������"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "��������"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "�������� ������"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "���� �������� �����"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "������������"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "�������� �� ������ ����� �� �������"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "������� ������ ������������"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "������� �������� �������"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "������"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "�������� �������:"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "������� ������"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "������� ������ ������ ��� ������������"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "UID ������������ < 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "������� ID ������������ �������"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "������������� ������� ������������"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "������������ ��� ����������, �������� ������ ��� ������������"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
+"��������� ������������ %s\n"
+" ����� ����������� ��������� ��������\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "����� ������� ���� ��������� ���������:"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "�������� �������"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "������ �� ���������"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"���� ������ ������� �����. \n"
-"������� ������ ������ ���� > 6 ��������"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "������������ ��� ����������, �������� ������ ��� ������������"
 
-#: ../userdrake_.c:265
-msgid ""
-"Creating a user with a UID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+# broken into two lines to avoid too large a button
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
 msgstr ""
-"��������� ������������� � UID ������ 500 �� �������������.\n"
-"�� �������, ��� ������ ������� ���?\n"
-"\n"
+"��������\n"
+"������������"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "UID ������������ < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "���� �������� �������� �������� (YYYY-MM-DD):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "����� ������"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_��������"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "�������� � ������ 'users'"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "�������� � ������������ ������"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "������� ID ������������ �������"
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "������ � ����� ������ ��� ����������. ��� �� ������ �������?"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/_����"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "��"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "��� ������� �������"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "���"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "�������"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "��� ������������"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "�������� �������:"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/_��������"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_�������������"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "������� ID ������ �������"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "������ ��� ����������, �������� ������ ��� ������"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "���� ��� �� ���������, ������� ���, ����������"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr "GID ������ < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "�����"
 
-#: ../userdrake_.c:385
-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 ""
-"��������� ������ � GID ����� 500 �� �������������.\n"
-"�� �������, ��� ������ ������� ���?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/_�����"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "������ � ����� ������ ��� ����������. ��� �� ������ �������?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr "�������������� : ��������� ������������"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "�������"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"��������� ������������ %s\n"
-" ����� ����������� ��������� ��������\n"
+"������� ���, ����� � ����\n"
+"��������� ����� �������� ��������"
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "������� �������� ������� : %s"
+msgid "User Data"
+msgstr "������ ������������"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "������� �������� ���� :/var/spool/mail/%s"
+msgid "Refresh"
+msgstr "��������"
+
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "������ ���"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "�������������� : ��������� ������"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "�� ������������� ������ ������� ������ %s\n"
+msgid " Group Gid is < 500"
+msgstr "GID ������ < 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s �������� ������� ������� ��� ������������ %s\n"
-"������� ������� ������������"
+msgid "Edit selected row"
+msgstr "������������� ��������� ������"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "�����"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "��� ������"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "������"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "������"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "������������� ������:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "�������� ���� �������� ������"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "�������� �������"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "�������� ������������� ��� ������������� � ���� ������:"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "������ ������������"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "������������"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "�������� ���� �������� ��������"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "���������� ���� �� ���������� ��������:"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "���� �������� �������� �������� (YYYY-MM-DD):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "ID ������"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "������������� ������� ������������"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "���"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "���������� �� ��������"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_� ���������..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "��������� ��� ������������ ������ ������:"
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_��������"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "�������� ���� �������� ������"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "ID ������������"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "����� ������� ���� ��������� ���������:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "�������� ���� �������� ��������"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "����� ������� ���� ����������� ���������:"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "������� �������� ���� :/var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "�� ������� ���� ������������� �� ���������:"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "�������� ������"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "���������� ���� �� ���������� ��������:"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_�������"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "���������� � ������"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "������� �������� ������� : %s"
+
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "���������� �������������� \n"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "�������� ������, ������ ������� ����� ������������:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "������ ������"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "�������� ������������� ��� ������������� � ���� ������:"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "������������"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "������ �������������"
+# broken into two lines to avoid too large a button
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr ""
+"��������\n"
+"������"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "����������, �������� ��� ������������ �� ������� ���� ���� ������"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"������� ���, ����� � ����\n"
-"��������� ����� �������� ��������"
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "��������� ��� ������������ ������ ������:"
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
-msgstr "���������� ��������� ��� ���� ��� �������� ������\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_����� �� ������"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "�� �� ������ ������� ������������ '%s' �� ��� ������� ������"
+msgid "Yes"
+msgstr "��"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "�������"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "������ ������"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "������:"
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "������������� ������:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "���������� �������������� \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/�������� _������������"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright (C) 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_������������� ��������� �������������"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "���� ��� �� ���������, ������� ���, ����������"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "���������� � ������"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr ""
-"��� ������ ��������� ������ ��������� ������� ������� ��������, �����, `-' � "
-"`_'"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "�����:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "��� ������� �������"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "�������� � ������������ ������"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "������"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "����� ������"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "��������� ������"
diff --git a/po/sk.po b/po/sk.po
index 53d6d03..2d2aab9 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+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,469 +15,539 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr ""
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/_Actions"
-msgstr "Akcie"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright © 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-#, fuzzy
-msgid "/_Edit"
-msgstr "Upraviť"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Users"
+msgstr "Skupiny"
 
-#: ../userdrake_.c:67
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "/_Delete"
 msgstr "Zmaž"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
+#: ../userdrake:1
+#, c-format
+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:68 ../userdrake_.c:80
-#, fuzzy
-msgid "/_Options"
-msgstr "Akcie"
-
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-#, fuzzy
-msgid "/_File"
-msgstr "Súbor"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Login Shell"
+msgstr "Login"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Upraviť"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:76
-#, fuzzy
-msgid "/_Add User"
-msgstr "Pridať používateľa"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/Add _Group"
-msgstr "Pridať skupinu"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-#, fuzzy
-msgid "/_Help"
-msgstr "Pomoc"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Members"
+msgstr "Skupiny"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:88
-#, fuzzy
-msgid "/_About..."
-msgstr "O ..."
-
-#: ../userdrake_.c:103
-msgid "Apply filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Používatelia"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Create Home Directory"
+msgstr "Používateľov domovský adresár"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Skupiny"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr ""
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Home Directory"
 msgstr "Používateľov domovský adresár"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-#, fuzzy
-msgid "Login Shell"
-msgstr "Login"
-
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "Status"
-msgstr "Spustiť tls"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User ID"
-msgstr "Používateľ"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User Name"
-msgstr "Userdrake"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group ID"
-msgstr "Skupina"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group Members"
-msgstr "Skupiny"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr ""
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-#, fuzzy
-msgid "Group Name"
-msgstr "Skupina"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-#, fuzzy
-msgid "Add User"
-msgstr "Pridať používateľa"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
 msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add Group"
-msgstr "Pridať skupinu"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add a group to the system"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/Add _Group"
 msgstr "Pridať skupinu"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Upraviť"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr ""
 
-#: ../userdrake_.c:137
-msgid "Edit selected row"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Zmaž"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete selected row"
+#: ../userdrake:1
+#, c-format
+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:139
-msgid "Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:139
-#, fuzzy
-msgid "Refresh the list"
-msgstr "Zoznam používateľov"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add a group to the system"
+msgstr "Pridať skupinu"
 
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:168
-msgid "Locked"
+#: ../userdrake:1
+#, c-format
+msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Skupiny"
 
-#: ../userdrake_.c:225 ../userdrake_.c:364
-msgid "Create New User"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:232
-#, fuzzy
-msgid "Create Home Directory"
-msgstr "Používateľov domovský adresár"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr ""
 
-#: ../userdrake_.c:234
-#, fuzzy
-msgid "Home Directory: "
-msgstr "Používateľov domovský adresár"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr ""
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:251
-#, fuzzy
-msgid "User already exists, please choose another User Name"
-msgstr "Takéto meno už existuje"
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Domovský adresár"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Password Mismatch"
 msgstr "Heslo"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Takéto meno už existuje"
 
-#: ../userdrake_.c:265
-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:1
+#, fuzzy, c-format
+msgid "Add User"
+msgstr "Pridať používateľa"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Actions"
+msgstr "Akcie"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_File"
+msgstr "Súbor"
+
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:355
-msgid "Yes"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Close"
+msgstr "Vymazať"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User Name"
+msgstr "Userdrake"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Home Directory: "
+msgstr "Používateľov domovský adresár"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:359
-msgid "No"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Edit"
+msgstr "Upraviť"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Login"
 
-#: ../userdrake_.c:385
-msgid ""
-"Creating a group with a GID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:400
-msgid "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Zmaž"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, fuzzy, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Používateľov domovský adresár"
+msgid "User Data"
+msgstr "Zoznam používateľov"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
+msgid "Refresh"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
+msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
+msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Login"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Name"
+msgstr "Skupina"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Status"
+msgstr "Spustiť tls"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Heslo"
 
-#: ../userdrake_.c:553
-#, fuzzy
-msgid "Confirm Password:"
-msgstr "Heslo:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr ""
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Domovský adresár"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr ""
 
-#: ../userdrake_.c:593
-#, fuzzy
-msgid "User Data"
-msgstr "Zoznam používateľov"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Používatelia"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group ID"
+msgstr "Skupina"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
+#: ../userdrake:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_About..."
+msgstr "O ..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Options"
+msgstr "Akcie"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User ID"
+msgstr "Používateľ"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Refresh the list"
+msgstr "Zoznam používateľov"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Help"
+msgstr "Pomoc"
 
-#: ../userdrake_.c:622
-#, fuzzy
-msgid "Password Info"
-msgstr "Heslo"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Používateľov domovský adresár"
 
-#: ../userdrake_.c:626
-msgid "Select the groups that the user will be a member of:"
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:671
-#, fuzzy
-msgid "Group Data"
-msgstr "Zoznam skupín"
+#: ../userdrake:1
+#, c-format
+msgid "Select the groups that the user will be a member of:"
+msgstr ""
 
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:675
-#, fuzzy
-msgid "Group Users"
-msgstr "Skupiny"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add Group"
+msgstr "Pridať skupinu"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
+msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:900
-#, fuzzy
-msgid "Close"
-msgstr "Vymazať"
-
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Data"
+msgstr "Zoznam skupín"
 
-#: ../userdrake_.c:912
-msgid "Authors: "
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Confirm Password:"
+msgstr "Heslo:"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright © 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Add User"
+msgstr "Pridať používateľa"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Password Info"
+msgstr "Heslo"
+
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Hľadať:"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:931
-msgid "Error"
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
 msgstr ""
 
 #~ msgid "Help"
diff --git a/po/sl.po b/po/sl.po
index b31070b..05ab2a0 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+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,470 +17,539 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr ""
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/_Actions"
-msgstr "Akcije"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Avtorske pravice © 2003 MandrakeSoft."
 
-#: ../userdrake_.c:66
-#, fuzzy
-msgid "/_Edit"
-msgstr "Uredi"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Users"
+msgstr "Skupine"
 
-#: ../userdrake_.c:67
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "/_Delete"
 msgstr "Zbriši"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
+#: ../userdrake:1
+#, c-format
+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:68 ../userdrake_.c:80
-#, fuzzy
-msgid "/_Options"
-msgstr "Akcije"
-
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-#, fuzzy
-msgid "/_File"
-msgstr "Datoteka"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Login Shell"
+msgstr "Uporabniško ime"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Uredi"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:76
-#, fuzzy
-msgid "/_Add User"
-msgstr "Dodaj uporabnika"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/Add _Group"
-msgstr "Dodaj skupino"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-#, fuzzy
-msgid "/_Help"
-msgstr "Pomoč"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Members"
+msgstr "Skupine"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:88
-#, fuzzy
-msgid "/_About..."
-msgstr "O userdrake"
-
-#: ../userdrake_.c:103
-msgid "Apply filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Uporabniki"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Create Home Directory"
+msgstr "Domač direktorij uporabnika"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Skupine"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr ""
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Home Directory"
 msgstr "Domač direktorij uporabnika"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-#, fuzzy
-msgid "Login Shell"
-msgstr "Uporabniško ime"
-
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "Status"
-msgstr "Zaženi tls"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User ID"
-msgstr "Uporabnik"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User Name"
-msgstr "Userdrake - upravitelj uporabnikov"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group ID"
-msgstr "Skupina"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group Members"
-msgstr "Skupine"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr ""
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-#, fuzzy
-msgid "Group Name"
-msgstr "Skupina"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-#, fuzzy
-msgid "Add User"
-msgstr "Dodaj uporabnika"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
 msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add Group"
-msgstr "Dodaj skupino"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add a group to the system"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/Add _Group"
 msgstr "Dodaj skupino"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Uredi"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr ""
 
-#: ../userdrake_.c:137
-msgid "Edit selected row"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Zbriši"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete selected row"
+#: ../userdrake:1
+#, c-format
+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:139
-msgid "Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:139
-#, fuzzy
-msgid "Refresh the list"
-msgstr "Spisek uporabnikov"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add a group to the system"
+msgstr "Dodaj skupino"
 
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:168
-msgid "Locked"
+#: ../userdrake:1
+#, c-format
+msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Skupine"
 
-#: ../userdrake_.c:225 ../userdrake_.c:364
-msgid "Create New User"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:232
-#, fuzzy
-msgid "Create Home Directory"
-msgstr "Domač direktorij uporabnika"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr ""
 
-#: ../userdrake_.c:234
-#, fuzzy
-msgid "Home Directory: "
-msgstr "Domač direktorij uporabnika"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr ""
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:251
-#, fuzzy
-msgid "User already exists, please choose another User Name"
-msgstr "To ime je na tem sistemu že uporabljeno"
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Dom"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Password Mismatch"
 msgstr "Geslo"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "To ime je na tem sistemu že uporabljeno"
 
-#: ../userdrake_.c:265
-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:1
+#, fuzzy, c-format
+msgid "Add User"
+msgstr "Dodaj uporabnika"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Userdrake"
+msgstr "Userdrake - upravitelj uporabnikov"
 
-#: ../userdrake_.c:317
-msgid "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Actions"
+msgstr "Akcije"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_File"
+msgstr "Datoteka"
+
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:355
-msgid "Yes"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Close"
+msgstr "Briši"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User Name"
+msgstr "Userdrake - upravitelj uporabnikov"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Home Directory: "
+msgstr "Domač direktorij uporabnika"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:359
-msgid "No"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Edit"
+msgstr "Uredi"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Uporabniško ime"
 
-#: ../userdrake_.c:385
-msgid ""
-"Creating a group with a GID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:400
-msgid "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Zbriši"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, fuzzy, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Domač direktorij uporabnika"
+msgid "User Data"
+msgstr "Spisek uporabnikov"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
+msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
+msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
+msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Uporabniško ime"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Name"
+msgstr "Skupina"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Status"
+msgstr "Zaženi tls"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Geslo"
 
-#: ../userdrake_.c:553
-#, fuzzy
-msgid "Confirm Password:"
-msgstr "Geslo:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr ""
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Dom"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr ""
 
-#: ../userdrake_.c:593
-#, fuzzy
-msgid "User Data"
-msgstr "Spisek uporabnikov"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Uporabniki"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group ID"
+msgstr "Skupina"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
+#: ../userdrake:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_About..."
+msgstr "O userdrake"
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Options"
+msgstr "Akcije"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User ID"
+msgstr "Uporabnik"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Refresh the list"
+msgstr "Spisek uporabnikov"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Help"
+msgstr "Pomoč"
 
-#: ../userdrake_.c:622
-#, fuzzy
-msgid "Password Info"
-msgstr "Geslo"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Domač direktorij uporabnika"
 
-#: ../userdrake_.c:626
-msgid "Select the groups that the user will be a member of:"
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:671
-#, fuzzy
-msgid "Group Data"
-msgstr "Spisek skupine"
+#: ../userdrake:1
+#, c-format
+msgid "Select the groups that the user will be a member of:"
+msgstr ""
 
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:675
-#, fuzzy
-msgid "Group Users"
-msgstr "Skupine"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add Group"
+msgstr "Dodaj skupino"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
+msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:900
-#, fuzzy
-msgid "Close"
-msgstr "Briši"
-
-#: ../userdrake_.c:906
-#, fuzzy
-msgid "Userdrake"
-msgstr "Userdrake - upravitelj uporabnikov"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Data"
+msgstr "Spisek skupine"
 
-#: ../userdrake_.c:912
-msgid "Authors: "
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Confirm Password:"
+msgstr "Geslo:"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Avtorske pravice © 2003 MandrakeSoft."
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Add User"
+msgstr "Dodaj uporabnika"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Password Info"
+msgstr "Geslo"
+
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Iskanje:"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:931
-msgid "Error"
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
 msgstr ""
 
 #~ msgid "Help"
diff --git a/po/sq.po b/po/sq.po
index f98ecc7..0ce42fa 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+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,457 +17,557 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Veg�l Qeveris�se p�r P�rdoruesit Linux Mandrake"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_Akcionet"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "E drejt� autori � 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_Boto"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Grup P�rdoruesish"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_Zhduke"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Filter i sistemit t� p�rdoruesve"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_Opcionet"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Krijimi i nj� p�rdoruesi me GID, m� t� vog�l se 500 nuk rekomandohet.\n"
+" A jeni i sigurt p�r k�t� veprim?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_Skedare"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Login Shell"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/_Rifreskoje"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Kroji nj� grup privat p�r p�rdoruesin"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/_Braktise"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Boto"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<kontrol>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "Shtoje nj� p�rdorues n� sistem"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/_Shtoje nj� p�rdorues"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Informcion mbi Konton"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/Shtoje nj� grup"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "Kujdes : Zhdukja e P�rdoruesit"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/_Ndihm�"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Gabim"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_Raport Bugi"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "An�tar�t e Grupit"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_N� lidhje me..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "Dit�r para se �sht� ndryshuar v�mendja :"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "Aplikoje filterin"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Zhduke rreshtin e zgjedhur"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "P�rdoruesit�"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "Krijo Repertorin Home"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Grupet"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Emri i Plot"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr "Emri duhet t� p�rmbaj m� s� paku shkronja, numra, `-' dhe `_'"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Repertori Home"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Login Shell"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"Kjo parull� �sht� tejet e thjesht�. \n"
+" Nj� parull� e mir� duhet t� jet� me > 6 karaktere"
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Grupi Primar"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "Dit�s para se �sht� nevojitur ndryshimi :"
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Statuti"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "A me t� v�rtet d�shironi ta zhdukni grupin %s\n"
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "ID i P�rdoruesit"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Ju lutemi specifikoni t� gjitha fushat p�r parull� p�rs�ri\n"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Emri i P�rdoruesit"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "Kliko mbi ikon� p�r ta nd�rruar"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "Grup ID"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s �sht� grup primar p�r p�rdoruesin %s\n"
+" Zhduke p�rdoruesin para se t� vazhdosh"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "An�tar�t e Grupit"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/Shtoje nj� grup"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Emri i Grupit"
+#: ../userdrake:1
+#, 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"
 
-# broken into two lines to avoid too large a button
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr "Shtoje nj� P�rdorues"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Veg�l Qeveris�se p�r P�rdoruesit Linux Mandrake"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "Shtoje nj� p�rdorues n� sistem"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "Grupi ve�se ekziston, ju lutemi zgjedheni nj� Em�r tjet�r t� Grupit"
 
-# broken into two lines to avoid too large a button
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "Shtoje nj� Grup"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Krijimi i nj� p�rdoruesi me UID, m� t� vog�l se 500 nuk rekomandohet.\n"
+" A jeni i sigurt p�r k�t� veprim?\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Autor�t: "
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "Shtoje nj� grup n� sistem"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Boto"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "Botoje rreshtin e zgjedhur"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Zhduke"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Zhduke rreshtin e zgjedhur"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Rifreskoje"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Rifreskoje list�n"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "Skadon afati"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "Mbyllur"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "Kliko mbi ikon� p�r ta nd�rruar"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Krijo nj� P�rdorues t� Ri"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "Krijo Repertorin Home"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Grupet"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Repertori Home: "
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Grupi Primar"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Kroji nj� grup privat p�r p�rdoruesin"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "Uid i p�rdoruesit �sht� < 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "Specifikoje ID e p�rdoruesit manuelisht"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "Lidhe Konton e P�rdoruesit"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
-"Ky p�rdorues ekziston, ju lutemi zgjedheni nj� em�r tjet�r t� P�doruesin"
+"Zhdukja e p�rdoruesit %s\n"
+" Njashtu parashef� akcionet vijuese\n"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "Dit�t para se �sht� mund�suar ndryshimi :"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Repertori Home"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "Parulla nuk P�rputhet"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
 msgstr ""
-"Kjo parull� �sht� tejet e thjesht�. \n"
-" Nj� parull� e mir� duhet t� jet� me > 6 karaktere"
+"Ky p�rdorues ekziston, ju lutemi zgjedheni nj� em�r tjet�r t� P�doruesin"
 
-#: ../userdrake_.c:265
-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 ""
-"Krijimi i nj� p�rdoruesi me UID, m� t� vog�l se 500 nuk rekomandohet.\n"
-" A jeni i sigurt p�r k�t� veprim?\n"
-"\n"
+# broken into two lines to avoid too large a button
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
+msgstr "Shtoje nj� P�rdorues"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "Uid i p�rdoruesit �sht� < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "Kontoja skadon (YYYY-MM-DD):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "Zgjedhe Grupin"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_Akcionet"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "Shtoi n� 'p�rdoruesit' grup"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Shtoje n� grupin ekzistues"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "Specifikoje ID e p�rdoruesit manuelisht"
 
-#: ../userdrake_.c:334
-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:1
+#, c-format
+msgid "/_File"
+msgstr "/_Skedare"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Po"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "Emri �sht� shum� i gjat�"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "Jo"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Mbylle"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Emri i P�rdoruesit"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Repertori Home: "
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/_Rifreskoje"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_Boto"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<kontrol>Q"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "Specifoje grupin e ID manuelisht"
 
-#: ../userdrake_.c:381
-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:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "Emri i fush�s �sht� zbraz�t ju lutemi furnizoni nj� em�r"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr " Grupi Gid �sht� < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Login"
 
-#: ../userdrake_.c:385
-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 ""
-"Krijimi i nj� p�rdoruesi me GID, m� t� vog�l se 500 nuk rekomandohet.\n"
-" A jeni i sigurt p�r k�t� veprim?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/_Braktise"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "Nj� grup me k�t� em�r ve�se ekziston.  �ka d�shironi t� b�ni?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr "Kujdes : Zhdukja e P�rdoruesit"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Zhduke"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"Zhdukja e p�rdoruesit %s\n"
-" Njashtu parashef� akcionet vijuese\n"
+"Ju lutemi zgjedheni Vitin, Muajin dhe Dit�n \n"
+" p�r Mbarimin e afatit t� Kontos "
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Zhduke Repertorin Home :%s"
+msgid "User Data"
+msgstr "T� dh�nat e p�rdoruesit"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "Zhduke Mailbox :/var/spool/mail/%s"
+msgid "Refresh"
+msgstr "Rifreskoje"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Emri i Plot"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "Kujdes : Zhdukja e Grupit"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "A me t� v�rtet d�shironi ta zhdukni grupin %s\n"
+msgid " Group Gid is < 500"
+msgstr " Grupi Gid �sht� < 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s �sht� grup primar p�r p�rdoruesin %s\n"
-" Zhduke p�rdoruesin para se t� vazhdosh"
+msgid "Edit selected row"
+msgstr "Botoje rreshtin e zgjedhur"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Login"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Emri i Grupit"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Statuti"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Parulla"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Konfirmoje Parull�n:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "Mund�soje Mbarimin Afatzgjat�s t� Parull�s"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Repertori Home"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "Zgjedhi p�rdoruesit t� cil�t do ti bashkangjiten grupit :"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "T� dh�nat e p�rdoruesit"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "P�rdoruesit�"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "Mund�soje konton e afatizuar"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "Dit�t para se t� jet� dezaktivizuar kontoja :"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "Kontoja skadon (YYYY-MM-DD):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "Grup ID"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "Lidhe Konton e P�rdoruesit"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "Jo"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Informcion mbi Konton"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_N� lidhje me..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "P�rdoruesi i fundit e ka ndrryshuar parull�n m� :"
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Opcionet"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "Mund�soje Mbarimin Afatzgjat�s t� Parull�s"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "ID i P�rdoruesit"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "Dit�t para se �sht� mund�suar ndryshimi :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "Mund�soje konton e afatizuar"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "Dit�s para se �sht� nevojitur ndryshimi :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "Zhduke Mailbox :/var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "Dit�r para se �sht� ndryshuar v�mendja :"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Rifreskoje list�n"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "Dit�t para se t� jet� dezaktivizuar kontoja :"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_Ndihm�"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Informacion mbi Parull�n"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Zhduke Repertorin Home :%s"
+
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Menagjer p�r P�rdorues \n"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Zgjedhi grupet p�r t� cilat p�rdoruesi do t� jet� an�tar i tyre:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "T� dh�na t� Grupit"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "Zgjedhi p�rdoruesit t� cil�t do ti bashkangjiten grupit :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "Mbyllur"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Grup P�rdoruesish"
+# broken into two lines to avoid too large a button
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "Shtoje nj� Grup"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "Ju lutemi zgjedheni m� s� paku nj� grup p�r p�rdoruesin"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Ju lutemi zgjedheni Vitin, Muajin dhe Dit�n \n"
-" p�r Mbarimin e afatit t� Kontos "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "P�rdoruesi i fundit e ka ndrryshuar parull�n m� :"
 
-#: ../userdrake_.c:753
-#, fuzzy
-msgid "Please fill up all fields in password aging\n"
-msgstr "Ju lutemi specifikoni t� gjitha fushat p�r parull� p�rs�ri\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Raport Bugi"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, 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"
+msgid "Yes"
+msgstr "Po"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Mbylle"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "T� dh�na t� Grupit"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Autor�t: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Konfirmoje Parull�n:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Menagjer p�r P�rdorues \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/_Shtoje nj� p�rdorues"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "E drejt� autori � 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Filter i sistemit t� p�rdoruesve"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "Emri i fush�s �sht� zbraz�t ju lutemi furnizoni nj� em�r"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "Informacion mbi Parull�n"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "Emri duhet t� p�rmbaj m� s� paku shkronja, numra, `-' dhe `_'"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Hulumto:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "Emri �sht� shum� i gjat�"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Shtoje n� grupin ekzistues"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Gabim"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "Zgjedhe Grupin"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "Aplikoje filterin"
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "Ndihm� e p�rgjithshme n� userdrake"
diff --git a/po/sr.po b/po/sr.po
index 43f0bd5..4ca7297 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2-sr\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-07-27 17:50+0200\n"
 "Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
 "Language-Team: serbian <i18n@mandrake.co.yu>\n"
@@ -19,457 +19,556 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Mandrake Linux ������� �� ��������� �����������"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_������"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright (C) 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_������"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "��������� ����e"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_�����"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_��������� ��������� ���������"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_������"
+#: ../userdrake:1
+#, c-format
+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 ""
+"�������� ����� �� GID ���� �� ���� �� 500 is ���� ������������.\n"
+" �� �� ��� ������� �� ������ �� ������� ���?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_����"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Login Shell"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/_������"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "������ �������� ����� �� ���������"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/_����"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "������"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "����� ��������� � ������"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/_����� ���������"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "���� � ������"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/����� _�����"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/_�����"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "������"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_��������� ������"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "������� �����"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_�..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "���� ��������� ��� ������� :"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "������� ������"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "������� �������� ���"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "���������"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Create Home Directory"
+msgstr "���������� home ���������j��"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "����e"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "���� ���"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr "��� ���� �� ������ ���� ���� �����, �������, `-' � `_'"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Home ������������"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Login Shell"
-
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "�������� �����"
-
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "������"
-
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "���������� ID"
-
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "���������� ���"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"��� ������� �� ������� �����������. \n"
+" ����� ������ ��� ���� �� 6 ��������� "
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "������ ID"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "���� ��� ��������� ������� :"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "������� �����"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "��� �����"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "������ �������� ��� ���� �� �������\n"
 
-#: ../userdrake_.c:135
-msgid "Add User"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
 msgstr ""
-"����j\n"
-"��������a"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "����� ��������� � ������"
-
-#: ../userdrake_.c:136
-msgid "Add Group"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
 msgstr ""
-"�����\n"
-"�����"
+"%s �� �������� ����� �� ��������� %s\n"
+" ���� ������ ���������t"
 
-#: ../userdrake_.c:136
-msgid "Add a group to the system"
-msgstr "����j ����� � ������"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/����� _�����"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "������"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "�� ������ �� �������� ��������� %s' �� ������ �������� �����"
 
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "������ �������� ���"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Mandrake Linux ������� �� ��������� �����������"
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "�����"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "����� ��� �������, ��������� ����� ��� �� �����"
 
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "������� �������� ���"
+#: ../userdrake:1
+#, c-format
+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 ""
+"�������� ��������� �� UID ����� �� 500 ���� ������������.\n"
+" �� �� ��� ������� �� ����� ��� �� �������?\n"
+"\n"
 
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "������"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "������"
 
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "������ �����"
+#: ../userdrake:1
+#, c-format
+msgid "Add a group to the system"
+msgstr "����j ����� � ������"
 
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "�������"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "���������"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr ""
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "�������� ����� ���������"
 
-#: ../userdrake_.c:232
-#, fuzzy
-msgid "Create Home Directory"
-msgstr "���������� home ���������j��"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "����e"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Home ������������: "
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "�������� �����"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "������ �������� ����� �� ���������"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "����������  Uid �� < 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "����� ������ ���������� ID"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "�������� ���������� �����"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "�������� ��� �������, ��������� ����� ���������� ���"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "���� ��� ������� �� ������� :"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Home"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "�������� �� ����������"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"��� ������� �� ������� �����������. \n"
-" ����� ������ ��� ���� �� 6 ��������� "
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "�������� ��� �������, ��������� ����� ���������� ���"
 
-#: ../userdrake_.c:265
-msgid ""
-"Creating a user with a UID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
 msgstr ""
-"�������� ��������� �� UID ����� �� 500 ���� ������������.\n"
-" �� �� ��� ������� �� ����� ��� �� �������?\n"
-"\n"
+"����j\n"
+"��������a"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "����������  Uid �� < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "����� ������ (YYYY-MM-DD):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "������� �����"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_������"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "����� � ����������� �����"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "����� � ��������� �����"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "����� ������ ���������� ID"
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "����� �� ���� ������ ��� �������. ��� ������ �� �������?"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/_����"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "��"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "��� �� ����������"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "��"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "�������"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "���������� ���"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Home ������������: "
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/_������"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_������"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "����� ������ ID �� �����"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "����� ��� �������, ��������� ����� ��� �� �����"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "���� �� ��� �� ������, ������� ���"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr " Gid �� ����� �� < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "���j��a"
 
-#: ../userdrake_.c:385
-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 ""
-"�������� ����� �� GID ���� �� ���� �� 500 is ���� ������������.\n"
-" �� �� ��� ������� �� ������ �� ������� ���?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/_����"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "����� �� ���� ������ ��� �������. ��� ������ �� �������?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "�����"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
+"�������� ������, ����� � ��� \n"
+" �� ����� �������� ������ "
 
-#: ../userdrake_.c:453
-#, fuzzy, c-format
-msgid "Delete Home Directory :%s"
-msgstr "���������� home ���������j��"
+#: ../userdrake:1
+#, c-format
+msgid "User Data"
+msgstr "����������� ������"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr ""
+msgid "Refresh"
+msgstr "������"
+
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "���� ���"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr ""
+msgid " Group Gid is < 500"
+msgstr " Gid �� ����� �� < 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s �� �������� ����� �� ��������� %s\n"
-" ���� ������ ���������t"
+msgid "Edit selected row"
+msgstr "������ �������� ���"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "���j��a"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "��� �����"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "������"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "������a"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "������� �������:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "������� ���������� ������� ������"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Home"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "��������� ��������� ���� ����� �� �������� ���� �����:"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "����������� ������"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "���������"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "������� ���������� ������"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "���� ��� ���� ����� ������� ��������� :"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "����� ������ (YYYY-MM-DD):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "������ ID"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "�������� ���������� �����"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "��"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "���� � ������"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_�..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "����������� �������� ��������� ������� �� : "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_������"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "������� ���������� ������� ������"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "���������� ID"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "���� ��� ������� �� ������� :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "������� ���������� ������"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "���� ��� ��������� ������� :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr ""
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "���� ��������� ��� ������� :"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "������ �����"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "���� ��� ���� ����� ������� ��������� :"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_�����"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "���� � ��������"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Delete Home Directory :%s"
+msgstr "���������� home ���������j��"
+
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "��������� ����������� \n"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "��������� ����� � ������ �� �������� ���� ����:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "������ � �����"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "��������� ��������� ���� ����� �� �������� ���� �����:"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "���������"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "��������� ����e"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr ""
+"�����\n"
+"�����"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "��������� ��� ����� ����� �� ���������"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"�������� ������, ����� � ��� \n"
-" �� ����� �������� ������ "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "����������� �������� ��������� ������� �� : "
 
-#: ../userdrake_.c:753
-#, fuzzy
-msgid "Please fill up all fields in password aging\n"
-msgstr "������ �������� ��� ���� �� �������\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_��������� ������"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "�� ������ �� �������� ��������� %s' �� ������ �������� �����"
+msgid "Yes"
+msgstr "��"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "�������"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "������ � �����"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "������"
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "������� �������:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "��������� ����������� \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/_����� ���������"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright (C) 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_��������� ��������� ���������"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "���� �� ��� �� ������, ������� ���"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "���� � ��������"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "��� ���� �� ������ ���� ���� �����, �������, `-' � `_'"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "�����:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "��� �� ����������"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "����� � ��������� �����"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "������"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "������� �����"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "������� ������"
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "��������� ����� �� userdrake"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 8b2cd49..39aec91 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2-sr\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-07-27 17:50+0200\n"
 "Last-Translator: Toma Jankovic_<tomaja@net.yu>\n"
 "Language-Team: serbian <i18n@mandrake.co.yu>\n"
@@ -19,458 +19,556 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Mandrake Linux Program za upravljanje korisnicima"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_Akcije"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright (C) 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_Izmeni"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Korisnici Grupe"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_Bri�i"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Filtriraj sistemske korisnike"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_Opcije"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Kreiranje grupe sa GID koje je manji od 500 is nije preporu�ljivo.\n"
+" da li ste sigurni da �elite da uradite ovo?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_Fajl"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Login Shell"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/_Osve�i"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Kriraj privatnu grupu za korisnika"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/_Kraj"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Izmeni"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "Dodaj korisnika u sistem"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/_Dodaj korisnika"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Onfo o nalogu"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/Dodaj _Grupu"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/_Pomo�"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Gre�ka"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_Prijavite gre�ku"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "�lanovi grupe"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_O..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "Dana upozorenja pre pormene :"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "Primeni filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Izbri�i izabrani red"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Korisnici"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Create Home Directory"
+msgstr "Korisnikov home direktorijum"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Grupe"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Puno ime"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr "Ime mo�e da sadr�i samo mala slova, brojeve, `-' i `_'"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Home direktorijum"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Login Shell"
-
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Primarna grupa"
-
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Status"
-
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "Korisnikov ID"
-
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Korisni�ko ime"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"Ova lozinka je previ�e jednostavna. \n"
+" Dobra lozika ima vi�e od 6 karaktera "
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "Grupni ID"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "DAna pre zahtevane promene :"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "�lanovi grupe"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Ime grupe"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Ponovo odredite sva polja za lozinku\n"
 
-#: ../userdrake_.c:135
-msgid "Add User"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
 msgstr ""
-"Dodaj\n"
-"korisnika"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "Dodaj korisnika u sistem"
-
-#: ../userdrake_.c:136
-msgid "Add Group"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
 msgstr ""
-"Dodaj\n"
-"grupu"
+"%s je primarna grupa za korisnika %s\n"
+" Prvo ukloni korisnikat"
 
-#: ../userdrake_.c:136
-msgid "Add a group to the system"
-msgstr "Dodaj grupu u sistem"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/Dodaj _Grupu"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Izmeni"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Ne mo�ete da uklonite korisnika %s' iz njegove primarne grupe"
 
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "Izmeni izabrani red"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Mandrake Linux Program za upravljanje korisnicima"
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Bri�i"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "Grupa ve� postoji, izaberite drugo ime za Grupu"
 
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Izbri�i izabrani red"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Kreiranje korisnika sa UID manjim od 500 nije preporu�ljivo.\n"
+" Da li ste sigurni da �lite ovo da uradite?\n"
+"\n"
 
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Osve�i"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Autori"
 
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Osve�i listu"
+#: ../userdrake:1
+#, c-format
+msgid "Add a group to the system"
+msgstr "Dodaj grupu u sistem"
 
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "Isteklo"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "Zaklju�ano"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr ""
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Kreiraljj novog korisnika"
 
-#: ../userdrake_.c:232
-#, fuzzy
-msgid "Create Home Directory"
-msgstr "Korisnikov home direktorijum"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Grupe"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Home direktorijum: "
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Primarna grupa"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Kriraj privatnu grupu za korisnika"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "KOrisnikov  Uid je < 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "Ru�no odredi korisnikov ID"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "Zaklju�aj korisnikov nalog"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "korisnik ve� postoji, izaberite drugo Korisni�ko ime"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "Dana pre dozvole za promenu :"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Home"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "Lozinkas se neodgovara"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"Ova lozinka je previ�e jednostavna. \n"
-" Dobra lozika ima vi�e od 6 karaktera "
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "korisnik ve� postoji, izaberite drugo Korisni�ko ime"
 
-#: ../userdrake_.c:265
-msgid ""
-"Creating a user with a UID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
 msgstr ""
-"Kreiranje korisnika sa UID manjim od 500 nije preporu�ljivo.\n"
-" Da li ste sigurni da �lite ovo da uradite?\n"
-"\n"
+"Dodaj\n"
+"korisnika"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "KOrisnikov  Uid je < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "Nalog isti�e (YYYY-MM-DD):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "Izaberi grupu"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_Akcije"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "Dodaj u korisnikovu grupu"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Dodaj u postoje�u grupu"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "Ru�no odredi korisnikov ID"
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "Grupa sa ovim imenom ve� postoji. �ta �elite da uradite?"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/_Fajl"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Da"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "Ime je preduga�ko"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "Ne"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Zatvori"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Korisni�ko ime"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Home direktorijum: "
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/_Osve�i"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_Izmeni"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "Ru�no odredi ID za grupu"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "Grupa ve� postoji, izaberite drugo ime za Grupu"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "Polje za ime je prazno, upi�ite ime"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr " Gid za Grupu je < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Prijava"
 
-#: ../userdrake_.c:385
-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 ""
-"Kreiranje grupe sa GID koje je manji od 500 is nije preporu�ljivo.\n"
-" da li ste sigurni da �elite da uradite ovo?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/_Kraj"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "Grupa sa ovim imenom ve� postoji. �ta �elite da uradite?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Bri�i"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
+"Odredite Godinu, Mesec i Dan \n"
+" za vreme isticanja naloga "
 
-#: ../userdrake_.c:453
-#, fuzzy, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Korisnikov home direktorijum"
+#: ../userdrake:1
+#, c-format
+msgid "User Data"
+msgstr "Korisnikovi podaci"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr ""
+msgid "Refresh"
+msgstr "Osve�i"
+
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Puno ime"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr ""
+msgid " Group Gid is < 500"
+msgstr " Gid za Grupu je < 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s je primarna grupa za korisnika %s\n"
-" Prvo ukloni korisnikat"
+msgid "Edit selected row"
+msgstr "Izmeni izabrani red"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Prijava"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Ime grupe"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Status"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Lozinka"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Potvrdi lozinku:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "Omogu�i ograni�enje trajanja lozike"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Home"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "Izaberite korisnike koji treba da pristupe ovoj grupi:"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Korisnikovi podaci"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Korisnici"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "Omogu�i ograni�enje naloga"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "Dana pre nego nalog postane neaktivan :"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "Nalog isti�e (YYYY-MM-DD):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "Grupni ID"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "Zaklju�aj korisnikov nalog"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "Ne"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Onfo o nalogu"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_O..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "Korisnikova poslednja promenjena lozinka na : "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Opcije"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "Omogu�i ograni�enje trajanja lozike"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "Korisnikov ID"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "Dana pre dozvole za promenu :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "Omogu�i ograni�enje naloga"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "DAna pre zahtevane promene :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr ""
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "Dana upozorenja pre pormene :"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Osve�i listu"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "Dana pre nego nalog postane neaktivan :"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_Pomo�"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Info o loozinci"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Korisnikov home direktorijum"
+
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Upravljanje korisnicima \n"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Izaberite grupe u kojima �e korisnik biti �lan:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "Podaci o grupi"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "Izaberite korisnike koji treba da pristupe ovoj grupi:"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "Zaklju�ano"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Korisnici Grupe"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr ""
+"Dodaj\n"
+"grupu"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "Izaberite bar jednu grupu za korisnika"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Odredite Godinu, Mesec i Dan \n"
-" za vreme isticanja naloga "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "Korisnikova poslednja promenjena lozinka na : "
 
-#: ../userdrake_.c:753
-#, fuzzy
-msgid "Please fill up all fields in password aging\n"
-msgstr "Ponovo odredite sva polja za lozinku\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Prijavite gre�ku"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Ne mo�ete da uklonite korisnika %s' iz njegove primarne grupe"
+msgid "Yes"
+msgstr "Da"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Zatvori"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Podaci o grupi"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Autori"
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Potvrdi lozinku:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Upravljanje korisnicima \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/_Dodaj korisnika"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright (C) 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Filtriraj sistemske korisnike"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "Polje za ime je prazno, upi�ite ime"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "Info o loozinci"
 
-#: ../userdrake_.c:926
-#, fuzzy
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "Ime mo�e da sadr�i samo mala slova, brojeve, `-' i `_'"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Tra�i:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "Ime je preduga�ko"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Dodaj u postoje�u grupu"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Gre�ka"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "Izaberi grupu"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "Primeni filter"
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "Generi�ka pomo� za userdrake"
diff --git a/po/sv.po b/po/sv.po
index 337d07f..1fa9fa7 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-sv\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-08-17 22:06+0200\n"
 "Last-Translator: Mattias Newzella <newzella@linux.nu>\n"
 "Language-Team: Svenska <sv@li.org>\n"
@@ -18,454 +18,555 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Mandrake Linux-verktyg f�r anv�ndarhantering"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_�tg�rder"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright � 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/R_edigera"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Gruppanv�ndare"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_Ta bort"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Filtrera systemanv�ndare"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_Alternativ"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Att skapa en grupp med ett grupp-id under 500 rekommenderas inte.\n"
+"�r du s�ker p� att du vill g�ra detta?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/Ark_iv"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Inloggningsskal"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/Uppdate_ra"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Skapa en privat grupp f�r anv�ndaren"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/Avsl_uta"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Redigera"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "L�gg till en anv�ndare till systemet"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/L_�gg till anv�ndare"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Kontoinformation"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/L�gg till _grupp"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "Varning: Tar bort anv�ndare"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/_Hj�lp"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Fel"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_Rapportera fel"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "Gruppmedlemmar"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_Om..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "F�rvarningstid i dagar innan �ndring:"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "Till�mpa filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Ta bort vald rad"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Anv�ndare"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "Skapa hemkatalog"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Grupper"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Fullst�ndigt namn"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr "Namnet m�ste best� av endast sm� bokst�ver, siffror, \"-\" och \"_\""
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Hemkatalog"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Inloggningsskal"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"Det h�r l�senordet �r f�r enkelt. \n"
+" Bra l�senord ska vara l�ngre �n sex tecken."
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Prim�r grupp"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "Dagar f�re �ndring kr�vs: "
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Status"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "Vill du verkligen ta bort gruppen %s\n"
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "Anv�ndar-id"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "Fyll i alla f�lt f�r l�senords�ldrande\n"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Anv�ndarnamn"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "Klicka p� ikonen f�r att �ndra den"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "Grupp-id"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s �r en prim�r grupp f�r anv�ndaren %s.\n"
+" Ta bort anv�ndaren f�rst"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "Gruppmedlemmar"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/L�gg till _grupp"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Gruppnamn"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Du kan inte ta bort anv�ndaren \"%s\" fr�n dess huvudgrupp."
 
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr ""
-"L�gg till\n"
-"anv�ndare"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Mandrake Linux-verktyg f�r anv�ndarhantering"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "L�gg till en anv�ndare till systemet"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "Gruppen finns redan. V�lj ett annat gruppnamn."
 
-#: ../userdrake_.c:136
-msgid "Add Group"
+#: ../userdrake:1
+#, c-format
+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 ""
-"L�gg till\n"
-"grupp"
+"Att skapa en anv�ndare med ett anv�ndar-id under 500 rekommenderas inte.\n"
+"�r du s�ker p� att du vill g�ra detta?\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Upphovsm�n: "
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "L�gg till en grupp till systemet"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Redigera"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "Redigera markerad rad"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Ta bort"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Ta bort vald rad"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Uppdatera"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Uppdatera listan"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "Utg�ngen"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "L�st"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "Klicka p� ikonen f�r att �ndra den"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Skapa ny anv�ndare"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "Skapa hemkatalog"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Grupper"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Hemkatalog: "
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Prim�r grupp"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Skapa en privat grupp f�r anv�ndaren"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "Anv�ndar-id �r < 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "Ange anv�ndar-id manuellt"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "L�s anv�ndarkonto"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "Anv�ndaren finns redan, v�lj ett annat anv�ndarnamn"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
+"Tar bort anv�ndare %s\n"
+" Utf�r ocks� f�ljande �tg�rder\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "Dagar innan �ndring till�ts: "
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Hem"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "Olika l�senord"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"Det h�r l�senordet �r f�r enkelt. \n"
-" Bra l�senord ska vara l�ngre �n sex tecken."
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Anv�ndaren finns redan, v�lj ett annat anv�ndarnamn"
 
-#: ../userdrake_.c:265
-msgid ""
-"Creating a user with a UID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
 msgstr ""
-"Att skapa en anv�ndare med ett anv�ndar-id under 500 rekommenderas inte.\n"
-"�r du s�ker p� att du vill g�ra detta?\n"
-"\n"
+"L�gg till\n"
+"anv�ndare"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "Anv�ndar-id �r < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "Kontot g�r ut den (YYYY-MM-DD):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "V�lj grupp"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_�tg�rder"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "L�gg till i gruppen \"users\""
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "L�gg till i den befintliga gruppen"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "Ange anv�ndar-id manuellt"
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "En grupp med detta namn finns redan. Vad vill du g�ra?"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/Ark_iv"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Ja"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "Namnet �r f�r l�ngt"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "Nej"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "St�ng"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Anv�ndarnamn"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Hemkatalog: "
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/Uppdate_ra"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/R_edigera"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "Ange grupp-id manuellt"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "Gruppen finns redan. V�lj ett annat gruppnamn."
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "Namnf�ltet �r tomt. Ange ett namn."
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr " Grupp-id �r < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Anv�ndarnamn"
 
-#: ../userdrake_.c:385
-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 ""
-"Att skapa en grupp med ett grupp-id under 500 rekommenderas inte.\n"
-"�r du s�ker p� att du vill g�ra detta?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/Avsl_uta"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "En grupp med detta namn finns redan. Vad vill du g�ra?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr "Varning: Tar bort anv�ndare"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Ta bort"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"Tar bort anv�ndare %s\n"
-" Utf�r ocks� f�ljande �tg�rder\n"
+"Ange �r, m�nad och dag f�r \n"
+" tidsbegr�nsning av konto "
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Ta bort hemkatalog: %s"
+msgid "User Data"
+msgstr "Anv�ndardata"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "Ta bort brevl�da: /var/spool/mail/%s"
+msgid "Refresh"
+msgstr "Uppdatera"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Fullst�ndigt namn"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "Varning: Tar bort grupp"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "Vill du verkligen ta bort gruppen %s\n"
+msgid " Group Gid is < 500"
+msgstr " Grupp-id �r < 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s �r en prim�r grupp f�r anv�ndaren %s.\n"
-" Ta bort anv�ndaren f�rst"
+msgid "Edit selected row"
+msgstr "Redigera markerad rad"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Anv�ndarnamn"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Gruppnamn"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Status"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "L�senord"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Bekr�fta l�senord:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "Aktivera tidsbegr�nsning av l�senord"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Hem"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "V�lj anv�ndarna som ska vara medlemmar i den h�r gruppen:"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Anv�ndardata"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Anv�ndare"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "Aktivera tidsbegr�nsning av konto"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "Dagar innan kontot blir inaktiverat:"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "Kontot g�r ut den (YYYY-MM-DD):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "Grupp-id"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "L�s anv�ndarkonto"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "Nej"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Kontoinformation"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_Om..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "Anv�ndaren �ndrade l�senord: "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Alternativ"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "Aktivera tidsbegr�nsning av l�senord"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "Anv�ndar-id"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "Dagar innan �ndring till�ts: "
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "Aktivera tidsbegr�nsning av konto"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "Dagar f�re �ndring kr�vs: "
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "Ta bort brevl�da: /var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "F�rvarningstid i dagar innan �ndring:"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Uppdatera listan"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "Dagar innan kontot blir inaktiverat:"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_Hj�lp"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "L�senordsinformation"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Ta bort hemkatalog: %s"
+
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Anv�ndarhantering \n"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "V�lj de grupper som anv�ndaren ska vara medlem i:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "Gruppdata"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "V�lj anv�ndarna som ska vara medlemmar i den h�r gruppen:"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "L�st"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Gruppanv�ndare"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr ""
+"L�gg till\n"
+"grupp"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "V�lj minst en grupp �t anv�ndaren."
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Ange �r, m�nad och dag f�r \n"
-" tidsbegr�nsning av konto "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "Anv�ndaren �ndrade l�senord: "
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
-msgstr "Fyll i alla f�lt f�r l�senords�ldrande\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Rapportera fel"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Du kan inte ta bort anv�ndaren \"%s\" fr�n dess huvudgrupp."
+msgid "Yes"
+msgstr "Ja"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "St�ng"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Gruppdata"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Upphovsm�n: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Bekr�fta l�senord:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Anv�ndarhantering \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/L_�gg till anv�ndare"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright � 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Filtrera systemanv�ndare"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "Namnf�ltet �r tomt. Ange ett namn."
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "L�senordsinformation"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "Namnet m�ste best� av endast sm� bokst�ver, siffror, \"-\" och \"_\""
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "S�k:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "Namnet �r f�r l�ngt"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "L�gg till i den befintliga gruppen"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Fel"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "V�lj grupp"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "Till�mpa filter"
diff --git a/po/ta.po b/po/ta.po
index a885a89..06046f5 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+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,470 +17,539 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr ""
 
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/_Actions"
-msgstr "செயல்கள்"
-
-#: ../userdrake_.c:66
-#, fuzzy
-msgid "/_Edit"
-msgstr "மாற்றியமை"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Users"
+msgstr "குழுக்கள்"
 
-#: ../userdrake_.c:67
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "/_Delete"
 msgstr "நீக்கு"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
+#: ../userdrake:1
+#, c-format
+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:68 ../userdrake_.c:80
-#, fuzzy
-msgid "/_Options"
-msgstr "செயல்கள்"
-
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-#, fuzzy
-msgid "/_File"
-msgstr "கோப்பு"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Login Shell"
+msgstr "தொடங்கல் "
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "மாற்றியமை"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:76
-#, fuzzy
-msgid "/_Add User"
-msgstr "பயனரைச் சேர்"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/Add _Group"
-msgstr "குழுவைச் சேர்க்கவும்"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-#, fuzzy
-msgid "/_Help"
-msgstr "உதவி"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Members"
+msgstr "குழுக்கள்"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:88
-#, fuzzy
-msgid "/_About..."
-msgstr "பற்றி"
-
-#: ../userdrake_.c:103
-msgid "Apply filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "பயனர்கள்"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Create Home Directory"
+msgstr "பயனரின் தொடக்க அடைவு"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "குழுக்கள்"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr ""
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Home Directory"
 msgstr "பயனரின் தொடக்க அடைவு"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-#, fuzzy
-msgid "Login Shell"
-msgstr "தொடங்கல் "
-
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "Status"
-msgstr "இதனை துவக்கு"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User ID"
-msgstr "பயனர்"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User Name"
-msgstr "டிரேக்பயனர்"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group ID"
-msgstr "குழு"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr ""
 
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group Members"
-msgstr "குழுக்கள்"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-#, fuzzy
-msgid "Group Name"
-msgstr "குழு"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-#, fuzzy
-msgid "Add User"
-msgstr "பயனரைச் சேர்"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr ""
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add Group"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/Add _Group"
 msgstr "குழுவைச் சேர்க்கவும்"
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add a group to the system"
-msgstr "குழுவைச் சேர்"
-
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "மாற்றியமை"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr ""
 
-#: ../userdrake_.c:137
-msgid "Edit selected row"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "நீக்கு"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete selected row"
+#: ../userdrake:1
+#, c-format
+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:139
-msgid "Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:139
-#, fuzzy
-msgid "Refresh the list"
-msgstr "பயனரின் பட்டியல்"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add a group to the system"
+msgstr "குழுவைச் சேர்"
 
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:168
-msgid "Locked"
+#: ../userdrake:1
+#, c-format
+msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "குழுக்கள்"
 
-#: ../userdrake_.c:225 ../userdrake_.c:364
-msgid "Create New User"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:232
-#, fuzzy
-msgid "Create Home Directory"
-msgstr "பயனரின் தொடக்க அடைவு"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr ""
 
-#: ../userdrake_.c:234
-#, fuzzy
-msgid "Home Directory: "
-msgstr "பயனரின் தொடக்க அடைவு"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr ""
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:251
-#, fuzzy
-msgid "User already exists, please choose another User Name"
-msgstr "இப்பெயர் ஏற்கனவே பயன்பாட்டில் உள்ளது"
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "ஆரம்பம்"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Password Mismatch"
 msgstr "கடவுச்சொல்"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "இப்பெயர் ஏற்கனவே பயன்பாட்டில் உள்ளது"
 
-#: ../userdrake_.c:265
-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:1
+#, fuzzy, c-format
+msgid "Add User"
+msgstr "பயனரைச் சேர்"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Userdrake"
+msgstr "டிரேக்பயனர்"
 
-#: ../userdrake_.c:317
-msgid "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Actions"
+msgstr "செயல்கள்"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_File"
+msgstr "கோப்பு"
+
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:355
-msgid "Yes"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Close"
+msgstr "துடை"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User Name"
+msgstr "டிரேக்பயனர்"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Home Directory: "
+msgstr "பயனரின் தொடக்க அடைவு"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:359
-msgid "No"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Edit"
+msgstr "மாற்றியமை"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "தொடங்கல் "
 
-#: ../userdrake_.c:385
-msgid ""
-"Creating a group with a GID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:400
-msgid "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "நீக்கு"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, fuzzy, c-format
-msgid "Delete Home Directory :%s"
-msgstr "பயனரின் தொடக்க அடைவு"
+msgid "User Data"
+msgstr "பயனரின் பட்டியல்"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
+msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
+msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
+msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "தொடங்கல் "
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Name"
+msgstr "குழு"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Status"
+msgstr "இதனை துவக்கு"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "கடவுச்சொல்"
 
-#: ../userdrake_.c:553
-#, fuzzy
-msgid "Confirm Password:"
-msgstr "கடவுச்சொல்"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr ""
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "ஆரம்பம்"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr ""
 
-#: ../userdrake_.c:593
-#, fuzzy
-msgid "User Data"
-msgstr "பயனரின் பட்டியல்"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "பயனர்கள்"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group ID"
+msgstr "குழு"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
+#: ../userdrake:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_About..."
+msgstr "பற்றி"
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Options"
+msgstr "செயல்கள்"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User ID"
+msgstr "பயனர்"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Refresh the list"
+msgstr "பயனரின் பட்டியல்"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Help"
+msgstr "உதவி"
 
-#: ../userdrake_.c:622
-#, fuzzy
-msgid "Password Info"
-msgstr "கடவுச்சொல்"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Delete Home Directory :%s"
+msgstr "பயனரின் தொடக்க அடைவு"
 
-#: ../userdrake_.c:626
-msgid "Select the groups that the user will be a member of:"
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:671
-#, fuzzy
-msgid "Group Data"
-msgstr "குழு  பட்டியல்"
+#: ../userdrake:1
+#, c-format
+msgid "Select the groups that the user will be a member of:"
+msgstr ""
 
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:675
-#, fuzzy
-msgid "Group Users"
-msgstr "குழுக்கள்"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add Group"
+msgstr "குழுவைச் சேர்க்கவும்"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
+msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:900
-#, fuzzy
-msgid "Close"
-msgstr "துடை"
-
-#: ../userdrake_.c:906
-#, fuzzy
-msgid "Userdrake"
-msgstr "டிரேக்பயனர்"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Data"
+msgstr "குழு  பட்டியல்"
 
-#: ../userdrake_.c:912
-msgid "Authors: "
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Confirm Password:"
+msgstr "கடவுச்சொல்"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Add User"
+msgstr "பயனரைச் சேர்"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Password Info"
+msgstr "கடவுச்சொல்"
+
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "தேடு:"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:931
-msgid "Error"
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
 msgstr ""
 
 #~ msgid "Help"
diff --git a/po/tg.po b/po/tg.po
index 229ba24..20a5077 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+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,470 +18,539 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr ""
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/_Actions"
-msgstr "Амалҳо"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Ҳуқуқи муаллифӣ © 2003 MandrakeSoft"
 
-#: ../userdrake_.c:66
-#, fuzzy
-msgid "/_Edit"
-msgstr "Таҳрир"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Users"
+msgstr "Гурӯҳҳо"
 
-#: ../userdrake_.c:67
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "/_Delete"
 msgstr "Нобуд кардан"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
+#: ../userdrake:1
+#, c-format
+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:68 ../userdrake_.c:80
-#, fuzzy
-msgid "/_Options"
-msgstr "Амалҳо"
-
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-#, fuzzy
-msgid "/_File"
-msgstr "Файл"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Login Shell"
+msgstr "Номи дохилӣ"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Таҳрир"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:76
-#, fuzzy
-msgid "/_Add User"
-msgstr "Иловаи корванд"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/Add _Group"
-msgstr "Иловаи гурӯҳ"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-#, fuzzy
-msgid "/_Help"
-msgstr "Ёрӣ"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Members"
+msgstr "Гурӯҳҳо"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:88
-#, fuzzy
-msgid "/_About..."
-msgstr "Дар бораи"
-
-#: ../userdrake_.c:103
-msgid "Apply filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Корвандҳо"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Create Home Directory"
+msgstr "Феҳристи хонагии корванд"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Гурӯҳҳо"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr ""
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Home Directory"
 msgstr "Феҳристи хонагии корванд"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-#, fuzzy
-msgid "Login Shell"
-msgstr "Номи дохилӣ"
-
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "Status"
-msgstr "Саршавии tls"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User ID"
-msgstr "Корванд"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User Name"
-msgstr "Userdrake"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group ID"
-msgstr "Гурӯҳ"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group Members"
-msgstr "Гурӯҳҳо"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr ""
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-#, fuzzy
-msgid "Group Name"
-msgstr "Гурӯҳ"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-#, fuzzy
-msgid "Add User"
-msgstr "Иловаи корванд"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
 msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add Group"
-msgstr "Иловаи гурӯҳ"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add a group to the system"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/Add _Group"
 msgstr "Иловаи гурӯҳ"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Таҳрир"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr ""
 
-#: ../userdrake_.c:137
-msgid "Edit selected row"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Нобуд кардан"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete selected row"
+#: ../userdrake:1
+#, c-format
+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:139
-msgid "Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:139
-#, fuzzy
-msgid "Refresh the list"
-msgstr "Рӯйхати корвандҳо"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add a group to the system"
+msgstr "Иловаи гурӯҳ"
 
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:168
-msgid "Locked"
+#: ../userdrake:1
+#, c-format
+msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Гурӯҳҳо"
 
-#: ../userdrake_.c:225 ../userdrake_.c:364
-msgid "Create New User"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:232
-#, fuzzy
-msgid "Create Home Directory"
-msgstr "Феҳристи хонагии корванд"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr ""
 
-#: ../userdrake_.c:234
-#, fuzzy
-msgid "Home Directory: "
-msgstr "Феҳристи хонагии корванд"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr ""
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:251
-#, fuzzy
-msgid "User already exists, please choose another User Name"
-msgstr "Ин ном аллакай дар систем ҳозираст"
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Хона (мавқеи аввала)"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Password Mismatch"
 msgstr "Гузарвожа"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Ин ном аллакай дар систем ҳозираст"
 
-#: ../userdrake_.c:265
-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:1
+#, fuzzy, c-format
+msgid "Add User"
+msgstr "Иловаи корванд"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Actions"
+msgstr "Амалҳо"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_File"
+msgstr "Файл"
+
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:355
-msgid "Yes"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Close"
+msgstr "Тоза кунед"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User Name"
+msgstr "Userdrake"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Home Directory: "
+msgstr "Феҳристи хонагии корванд"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:359
-msgid "No"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Edit"
+msgstr "Таҳрир"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Номи дохилӣ"
 
-#: ../userdrake_.c:385
-msgid ""
-"Creating a group with a GID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:400
-msgid "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Нобуд кардан"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, fuzzy, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Феҳристи хонагии корванд"
+msgid "User Data"
+msgstr "Рӯйхати корванд"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
+msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
+msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
+msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Номи дохилӣ"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Name"
+msgstr "Гурӯҳ"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Status"
+msgstr "Саршавии tls"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Гузарвожа"
 
-#: ../userdrake_.c:553
-#, fuzzy
-msgid "Confirm Password:"
-msgstr "Гузарвожа:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr ""
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Хона (мавқеи аввала)"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr ""
 
-#: ../userdrake_.c:593
-#, fuzzy
-msgid "User Data"
-msgstr "Рӯйхати корванд"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Корвандҳо"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group ID"
+msgstr "Гурӯҳ"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
+#: ../userdrake:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_About..."
+msgstr "Дар бораи"
 
-#: ../userdrake_.c:610
-#, fuzzy
-msgid "User last changed password on : "
-msgstr "Ивази гузарвожа намешавад"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Options"
+msgstr "Амалҳо"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User ID"
+msgstr "Корванд"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Refresh the list"
+msgstr "Рӯйхати корвандҳо"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Help"
+msgstr "Ёрӣ"
 
-#: ../userdrake_.c:622
-#, fuzzy
-msgid "Password Info"
-msgstr "Гузарвожа"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Феҳристи хонагии корванд"
 
-#: ../userdrake_.c:626
-msgid "Select the groups that the user will be a member of:"
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:671
-#, fuzzy
-msgid "Group Data"
-msgstr "Рӯйхати гурӯҳ"
+#: ../userdrake:1
+#, c-format
+msgid "Select the groups that the user will be a member of:"
+msgstr ""
 
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:675
-#, fuzzy
-msgid "Group Users"
-msgstr "Гурӯҳҳо"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add Group"
+msgstr "Иловаи гурӯҳ"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User last changed password on : "
+msgstr "Ивази гузарвожа намешавад"
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
+msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:900
-#, fuzzy
-msgid "Close"
-msgstr "Тоза кунед"
-
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Data"
+msgstr "Рӯйхати гурӯҳ"
 
-#: ../userdrake_.c:912
-msgid "Authors: "
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Confirm Password:"
+msgstr "Гузарвожа:"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Ҳуқуқи муаллифӣ © 2003 MandrakeSoft"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Add User"
+msgstr "Иловаи корванд"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Password Info"
+msgstr "Гузарвожа"
+
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Ҷустуҷӯ:"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:931
-msgid "Error"
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
 msgstr ""
 
 #~ msgid "Help"
diff --git a/po/tr.po b/po/tr.po
index 8ba6202..3f9ff1e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-08-08 00:17+0200\n"
 "Last-Translator: �mer Fad�l USTA <omer_fad@hotmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -21,450 +21,551 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Mandrake Linux Kullan�c� Y�netim Arac�"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/Eylemle_r"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Telif Hakk� � 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/D�_zenle"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Grup Kullan�c�lar�"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_Sil"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/Sistem kullan�c�lar�n� _Filtrele"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/S_e�enekler"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Grup ID'si 500 sayisindan k���k bir grup olu�turmak\n"
+"tavsiye edilmemektedir.\n"
+" Bunu yapmak istedi�inize emin misiniz ?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_Dosya"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Giri� Kabu�u"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/_Tazele"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Kullan�c�lar i�in �zel bir grup olu�tur"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/��_K"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "D�zenle"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "Sisteme bir kullan�c� ekler"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/K_ullan�c� Ekle"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Hesap bilgisi"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/Gru_p Ekle"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "Uyar� : Kullan�c� Siliniyor"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/_Yard�m"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Hata"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/Hata _Bildir"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "Grup �yeleri"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_Hakk�nda..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr ""
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "Filtreyi uygula"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Se�ili s�ray� siler"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Kullan�c�lar"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "Ev Dizini Olu�tur"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Gruplar"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Tam isim"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr "�sim sadece ufak latin harflerini , '-' ve '_' i�aretlerini i�erebilir"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Ev Dizini"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Giri� Kabu�u"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"Bu parola �ok basit. \n"
+" �yi bir parola en az 6 karakterden olu�turulmal�d�r"
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Birincil Grup"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr ""
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Durum"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "%s grubunu ger�ekten silmek istiyor musunuz\n"
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "Kullan�c� ID"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Kullan�c� Ad�"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "De�i�tirmek i�in simgesine t�klay�n"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "Grup ID"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s grubu %s kullan�c�s� i�in birincil gruptur\n"
+" �nce kullan�c�y� ��kart�n"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "Grup �yeleri"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/Gru_p Ekle"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Grup Ad�"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "'%s' kullan�c�s�n� onlar�n birincil grubundan ��kartamazs�n�z"
 
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr "Kullan�c� Ekle"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Mandrake Linux Kullan�c� Y�netim Arac�"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "Sisteme bir kullan�c� ekler"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "Grup zaten mevut, l�tfen bir ba�ka Grup ismi se�in"
 
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "Grup Ekle"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Kullan�c� ID'si 500 sayisindan k���k bir kullan�c� olu�turmak\n"
+"tavsiye edilmemektedir.\n"
+" Bunu yapmak istedi�inize emin misiniz ?\n"
+"\n"
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Yazanlar: "
+
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "Sisteme bir kullan�c� ekler"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "D�zenle"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "Se�ili s�ray� s�zenler"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Sil"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Se�ili s�ray� siler"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Tazele"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Listeyi tazeler"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "H�km�n� yitirmi�"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "Kilitli"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "De�i�tirmek i�in simgesine t�klay�n"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Yeni Kullan�c� Olu�tur"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "Ev Dizini Olu�tur"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Gruplar"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Ev Dizini: "
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Birincil Grup"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Kullan�c�lar i�in �zel bir grup olu�tur"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "Kullan�c� ad� 500 'den k���kj"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "Kullan�c�n�n ID'sini elle belirle"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "Kullan�c� Hesab�n� Kilitle"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "Kullan�c� zaten mevcut, l�tfen bir ba�ka Kullan�c� Ad� se�in"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
+"%s Kullan�c�s� siliniyor\n"
+" Sonras�nda �u eylemler ger�ekle�tirilecek\n"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Ev"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "Parolalar uyu�muyor"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"Bu parola �ok basit. \n"
-" �yi bir parola en az 6 karakterden olu�turulmal�d�r"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Kullan�c� zaten mevcut, l�tfen bir ba�ka Kullan�c� Ad� se�in"
 
-#: ../userdrake_.c:265
-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 ""
-"Kullan�c� ID'si 500 sayisindan k���k bir kullan�c� olu�turmak\n"
-"tavsiye edilmemektedir.\n"
-" Bunu yapmak istedi�inize emin misiniz ?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
+msgstr "Kullan�c� Ekle"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "Kullan�c� ad� 500 'den k���kj"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr ""
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "Grup Se�in"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/Eylemle_r"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "'users' grubuna ekle"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Var olan bir gruba ekle"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "Kullan�c�n�n ID'sini elle belirle"
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "Bu isimde zaten bir grup mevcut .  Ne yapmak istersiniz ?"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/_Dosya"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Evet"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "�sim �ok uzun"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "Hay�r"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Kapat"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Kullan�c� Ad�"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Ev Dizini: "
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/_Tazele"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/D�_zenle"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "Grup ID'sini elle belirle"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "Grup zaten mevut, l�tfen bir ba�ka Grup ismi se�in"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "�sim alan� bo� b�rak�lm�� l�tfen uygun �ekilde doldurunuz"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr " Grup Gid 500 'den k���k"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Giri�"
 
-#: ../userdrake_.c:385
-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 ""
-"Grup ID'si 500 sayisindan k���k bir grup olu�turmak\n"
-"tavsiye edilmemektedir.\n"
-" Bunu yapmak istedi�inize emin misiniz ?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/��_K"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "Bu isimde zaten bir grup mevcut .  Ne yapmak istersiniz ?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr "Uyar� : Kullan�c� Siliniyor"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Sil"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"%s Kullan�c�s� siliniyor\n"
-" Sonras�nda �u eylemler ger�ekle�tirilecek\n"
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Ev Dizinini Sil :%s"
+msgid "User Data"
+msgstr "Kullan�c� Verisi"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "Posta Kutusunu Sil :/var/spool/mail/%s"
+msgid "Refresh"
+msgstr "Tazele"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Tam isim"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "Uyar� : Grup Siliniyor"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "%s grubunu ger�ekten silmek istiyor musunuz\n"
+msgid " Group Gid is < 500"
+msgstr " Grup Gid 500 'den k���k"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s grubu %s kullan�c�s� i�in birincil gruptur\n"
-" �nce kullan�c�y� ��kart�n"
+msgid "Edit selected row"
+msgstr "Se�ili s�ray� s�zenler"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Giri�"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Grup Ad�"
+
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Durum"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Parola"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Parolay� Tekrarla:"
-
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Ev"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "Parolan�n h�k�m yitirmesine imkan ver"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Kullan�c� Verisi"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "Gruba eklenecek kullan�c�lar� se�in :"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "Hesap h�k�m yitirmesine imkan ver"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Kullan�c�lar"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "Kullan�c� Hesab�n� Kilitle"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "Grup ID"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Hesap bilgisi"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "Hay�r"
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_Hakk�nda..."
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "Parolan�n h�k�m yitirmesine imkan ver"
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/S_e�enekler"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "Kullan�c� ID"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "Hesap h�k�m yitirmesine imkan ver"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "Posta Kutusunu Sil :/var/spool/mail/%s"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Listeyi tazeler"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Parola bilgisi"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_Yard�m"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Ev Dizinini Sil :%s"
+
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Kullan�c� Y�netimi \n"
+
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Kullan�c�n�n �yesi olaca�� gruplar� se�iniz:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "Grup Verisi"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "Gruba eklenecek kullan�c�lar� se�in :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "Kilitli"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Grup Kullan�c�lar�"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "Grup Ekle"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "L�tfen kullan�c� i�in en az bir grup se�iniz"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/Hata _Bildir"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "'%s' kullan�c�s�n� onlar�n birincil grubundan ��kartamazs�n�z"
+msgid "Yes"
+msgstr "Evet"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Kapat"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Grup Verisi"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Yazanlar: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Parolay� Tekrarla:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Kullan�c� Y�netimi \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/K_ullan�c� Ekle"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Telif Hakk� � 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/Sistem kullan�c�lar�n� _Filtrele"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "�sim alan� bo� b�rak�lm�� l�tfen uygun �ekilde doldurunuz"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "Parola bilgisi"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "�sim sadece ufak latin harflerini , '-' ve '_' i�aretlerini i�erebilir"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Ara:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "�sim �ok uzun"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Var olan bir gruba ekle"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Hata"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "Grup Se�in"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "Filtreyi uygula"
diff --git a/po/uk.po b/po/uk.po
index 5290cba..e0f3521 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-uk\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-08-04 21:50+0300\n"
 "Last-Translator: Taras Boychuk <btr1@torba.com>\n"
 "Language-Team: ukrainian <uk@li.org>\n"
@@ -17,461 +17,561 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "���������� ��������� ������������� Mandrake Linux"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/䦧"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright � 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/���������"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "���������� ���������ަ�"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/��������"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/���������� ��������� ���������ަ�"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/���������"
+#: ../userdrake:1
+#, c-format
+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 ""
+"���������� ����� � �����, ������ �� 500 �� ��������դ����.\n"
+" �� ������Φ, �� ������ ������� ���� ���?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/����"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "��������� ����� �Ť����æ�"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/��������"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "�������� �������� ����� ��� �����������"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/�����"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "���������"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "������ ����������� �� �������"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/������ �����������"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "�������æ� ��� ���������ަ�"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/������ �����"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/��צ���"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "�������"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/�צ� ��� �������"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "����� �����"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/��� ��������..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "�Φ� ������������ ����� �ͦ��� :"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "����������� Ʀ����"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "�������� �������� �����"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "���������ަ"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "�������� ��ͦ��� �����������"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "�����"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "��� �����������: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "����� �����"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr ""
+"����� ���� ���������� Ԧ���� � ����� ���������� ̦���, ����, `-' �� `_'"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "��ͦ��� �����������"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "��������� ����� �Ť����æ�"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"��� ������ ������� �������. \n"
+" ������� ������ ������� ���� > 6 �����̦�"
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "�������� �����"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "����Ȧ��� �Φ� ����� �ͦ��� :"
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "������"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "��� �����������"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "����-�����, �����Φ�� �Ӧ ����, ��� ���������� ���ͦ� Ħ� ������\n"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "��'� �����������"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "����Φ�� �� ����æ, ��� ������"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "��� �����"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s � ��������� ������ ��� ����������� %s\n"
+" �������� ����ަ�� �����������"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "����� �����"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/������ �����"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "����� �����"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "�� �� ������ �������� ����������� '%s' � ���� �������ϧ �����"
 
-# broken into two lines to avoid too large a button
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr ""
-"������\n"
-"�����������"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "���������� ��������� ������������� Mandrake Linux"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "������ ����������� �� �������"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "����� ��� ���դ, ����-�����, ���֦�� ������ ����� �����"
 
-# broken into two lines to avoid too large a button
-#: ../userdrake_.c:136
-msgid "Add Group"
+#: ../userdrake:1
+#, c-format
+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 ""
-"������\n"
-"�����"
+"���������� ���������ަ� � �����, ������ �� 500 �� ��������դ����.\n"
+" �� ������Φ, �� ������ ������� ���� ���?\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "������: "
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "������ ����� �� �������"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "���������"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "��������� �������� �����"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "��������"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "�������� �������� �����"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "��������"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "�������� ������"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "���ͦ� ��˦������"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "�����������"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "����Φ�� �� ����æ, ��� ������"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "�������� ������ �����������"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "�������� ��ͦ��� �����������"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "�����"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "��ͦ��� �����������: "
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "�������� �����"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "�������� �������� ����� ��� �����������"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "��� ����������� ������ �� 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "������ ��� ����������� ������"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "����������� ��̦� ���������ަ�"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "����� ���������� ��� �, ����-�����, ������� ������ ��'� �����������"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
+"����������� ���������� %s\n"
+" ����� ����������� ������Φ Ħ�\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "��������� �Φ� ����� �ͦ��� :"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "��ͦ���"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "����̦ �� �Ц��������"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"��� ������ ������� �������. \n"
-" ������� ������ ������� ���� > 6 �����̦�"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "����� ���������� ��� �, ����-�����, ������� ������ ��'� �����������"
 
-#: ../userdrake_.c:265
-msgid ""
-"Creating a user with a UID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+# broken into two lines to avoid too large a button
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
 msgstr ""
-"���������� ���������ަ� � �����, ������ �� 500 �� ��������դ����.\n"
-" �� ������Φ, �� ������ ������� ���� ���?\n"
-"\n"
+"������\n"
+"�����������"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "��� ����������� ������ �� 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "��� �����������: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "���ͦ� Ħ� ������� ��˦��դ���� (YYYY-MM-DD):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "����Ҧ�� �����"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/䦧"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "������ � ����� 'users'"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "������ � ������� �����"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "������ ��� ����������� ������"
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "����� � ����� ������ ��� ���դ. �� � �� ��Ԧ�� �������?"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/����"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "���"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "����� ������� �����"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "�"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "�������"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "��'� �����������"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "��ͦ��� �����������: "
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/��������"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/���������"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "������ ��� ����� ������"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "����� ��� ���դ, ����-�����, ���֦�� ������ ����� �����"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "���� � ������ �����Τ, ����-�����, ���Ħ�� �����."
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr "��� ����� ������ �� 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "��'�"
 
-#: ../userdrake_.c:385
-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 ""
-"���������� ����� � �����, ������ �� 500 �� ��������դ����.\n"
-" �� ������Φ, �� ������ ������� ���� ���?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/�����"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "��� �����: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "����� � ����� ������ ��� ���դ. �� � �� ��Ԧ�� �������?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "��������"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"����������� ���������� %s\n"
-" ����� ����������� ������Φ Ħ�\n"
+"����-�����, ������� Ҧ�, ͦ���� � ���� \n"
+" ��˦������ Ħ� ������� "
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "�������� ��ͦ��� ����������� :%s"
+msgid "User Data"
+msgstr "��Φ �����������"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "�������� ������� �������� :/var/spool/mail/%s"
+msgid "Refresh"
+msgstr "��������"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "����� �����"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr ""
+msgid " Group Gid is < 500"
+msgstr "��� ����� ������ �� 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s � ��������� ������ ��� ����������� %s\n"
-" �������� ����ަ�� �����������"
+msgid "Edit selected row"
+msgstr "��������� �������� �����"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "��'�"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "����� �����"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "������"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "������"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "������Ħ�� ������:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "�צ������ ��������� ���ͦ�� Ħ� ������"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "��ͦ���"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "����Ҧ�� ���������ަ�, ���� �������� � �� ����� :"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "��Φ �����������"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "���������ަ"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "�צ������ ��������� �����˦�"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "�Φ� �� ���������� Ħ� ������� :"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "���ͦ� Ħ� ������� ��˦��դ���� (YYYY-MM-DD):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "��� �����"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "����������� ��̦� ���������ަ�"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "�"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "�������æ� ��� ���������ަ�"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/��� ��������..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "������� �ͦ�� ������ ������������ : "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/���������"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "�צ������ ��������� ���ͦ�� Ħ� ������"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "��� �����������"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "��������� �Φ� ����� �ͦ��� :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "�צ������ ��������� �����˦�"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "����Ȧ��� �Φ� ����� �ͦ��� :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "�������� ������� �������� :/var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "�Φ� ������������ ����� �ͦ��� :"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "�������� ������"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "�Φ� �� ���������� Ħ� ������� :"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/��צ���"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "�������æ� ��� ������"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "�������� ��ͦ��� ����������� :%s"
+
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "��������� ������������� \n"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "����Ҧ�� �����, ������ ���� ���� ����������:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "��Φ �����"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "����Ҧ�� ���������ަ�, ���� �������� � �� ����� :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "�����������"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "���������� ���������ަ�"
+# broken into two lines to avoid too large a button
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr ""
+"������\n"
+"�����"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "����-�����, ����Ҧ�� ��� ���� ����� ��� �����������"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"����-�����, ������� Ҧ�, ͦ���� � ���� \n"
-" ��˦������ Ħ� ������� "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "������� �ͦ�� ������ ������������ : "
 
-#: ../userdrake_.c:753
-#, fuzzy
-msgid "Please fill up all fields in password aging\n"
-msgstr "����-�����, �����Φ�� �Ӧ ����, ��� ���������� ���ͦ� Ħ� ������\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/�צ� ��� �������"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "�� �� ������ �������� ����������� '%s' � ���� �������ϧ �����"
+msgid "Yes"
+msgstr "���"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "�������"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "��Φ �����"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "��� �����: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "������: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "������Ħ�� ������:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "��������� ������������� \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/������ �����������"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright � 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/���������� ��������� ���������ަ�"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "���� � ������ �����Τ, ����-�����, ���Ħ�� �����."
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "�������æ� ��� ������"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr ""
-"����� ���� ���������� Ԧ���� � ����� ���������� ̦���, ����, `-' �� `_'"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "�����:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "����� ������� �����"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "������ � ������� �����"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "�������"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "����Ҧ�� �����"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "����������� Ʀ����"
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "�������� ��צ��� �� userdrake"
diff --git a/po/userdrake.pot b/po/userdrake.pot
index 1f30c9a..d31557f 100644
--- a/po/userdrake.pot
+++ b/po/userdrake.pot
@@ -1,450 +1,550 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8-bit\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr ""
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr ""
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
 msgstr ""
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr ""
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr ""
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
+#: ../userdrake:1
+#, c-format
+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:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
 msgstr ""
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
 msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
 msgstr ""
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
 msgstr ""
 
-#: ../userdrake_.c:88
-msgid "/_About..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:106
-msgid "Users"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
 msgstr ""
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
 msgstr ""
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr ""
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
 msgstr ""
 
-#: ../userdrake_.c:122
-msgid "Status"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
 msgstr ""
 
-#: ../userdrake_.c:122
-msgid "User ID"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
 msgstr ""
 
-#: ../userdrake_.c:122
-msgid "User Name"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
 msgstr ""
 
-#: ../userdrake_.c:129
-msgid "Group ID"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
 msgstr ""
 
-#: ../userdrake_.c:129
-msgid "Group Members"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
 msgstr ""
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
 msgstr ""
 
-#: ../userdrake_.c:135
-msgid "Add User"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
 msgstr ""
 
-#: ../userdrake_.c:136
-msgid "Add Group"
+#: ../userdrake:1
+#, c-format
+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:136
-msgid "Add a group to the system"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:137
-msgid "Edit"
+#: ../userdrake:1
+#, c-format
+msgid "Add a group to the system"
 msgstr ""
 
-#: ../userdrake_.c:137
-msgid "Edit selected row"
+#: ../userdrake:1
+#, c-format
+msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete"
+#: ../userdrake:1
+#, c-format
+msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete selected row"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
 msgstr ""
 
-#: ../userdrake_.c:139
-msgid "Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:139
-msgid "Refresh the list"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:168
-msgid "Expired"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
 msgstr ""
 
-#: ../userdrake_.c:168
-msgid "Locked"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:225 ../userdrake_.c:364
-msgid "Create New User"
+#: ../userdrake:1
+#, c-format
+msgid "Home"
 msgstr ""
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
+#: ../userdrake:1
+#, c-format
+msgid "Password Mismatch"
 msgstr ""
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
 msgstr ""
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
 msgstr ""
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
 msgstr ""
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
-msgid "Password Mismatch"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
 msgstr ""
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:265
-msgid ""
-"Creating a user with a UID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
 msgstr ""
 
-#: ../userdrake_.c:317
-msgid "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
 msgstr ""
 
-#: ../userdrake_.c:331
-msgid "Add to the 'users' group"
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
 msgstr ""
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
 msgstr ""
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:355
-msgid "Yes"
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
 msgstr ""
 
-#: ../userdrake_.c:359
-msgid "No"
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid ""
-"Creating a group with a GID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:400
-msgid "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
 msgstr ""
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
+msgid "User Data"
 msgstr ""
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
+msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
+msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
+msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:550
-msgid "Login"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
+msgid "Status"
 msgstr ""
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr ""
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
 msgstr ""
 
-#: ../userdrake_.c:591
-msgid "Home"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
 msgstr ""
 
-#: ../userdrake_.c:593
-msgid "User Data"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
 msgstr ""
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
 msgstr ""
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
+#: ../userdrake:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:605
-msgid "Account Info"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
 msgstr ""
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
 msgstr ""
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
 msgstr ""
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
 msgstr ""
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
 msgstr ""
 
-#: ../userdrake_.c:622
-msgid "Password Info"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
 msgstr ""
 
-#: ../userdrake_.c:626
-msgid "Select the groups that the user will be a member of:"
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:671
-msgid "Group Data"
+#: ../userdrake:1
+#, c-format
+msgid "Select the groups that the user will be a member of:"
 msgstr ""
 
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:675
-msgid "Group Users"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
 msgstr ""
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
+msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:900
-msgid "Close"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
 msgstr ""
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:912
-msgid "Authors: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
 msgstr ""
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
 msgstr ""
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
 msgstr ""
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
 msgstr ""
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:931
-msgid "Error"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
 msgstr ""
diff --git a/po/uz.po b/po/uz.po
index 213da8d..0eab34b 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-uz@Cyrl\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-08-18 01:56+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -23,457 +23,557 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Mandrake Linux uchun foydalanuvchilarni boshqarish vositasi"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_Amallar"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright (C) 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_Tuzatish"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Guruhning foydalanuvchilari"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_O'chirish"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Sistema foydalanuvchilarini filterlash"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_Parametrlar"
+#: ../userdrake:1
+#, c-format
+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 ""
+"GID'si 500 dan kam bo'lgan guruhni yaratish tavsiya qilinmaydi.\n"
+" Buni bajarishga ishonchingiz komilmi?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_Fayl"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Kirish konsoli"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/_Yangilash"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Foydalanuvchi uchun shaxsiy guruhni yaratish"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/Chi_qish"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Tuzatish"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "Sistemaga foydalanuvchini qo'shish"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/_Foydalanuvchini qo'shish"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Hisob haqida ma'lumot"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/_Guruhni qo'shish"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/_Yordam"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Xato"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_Xato haqida xabar qilish"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "Guruh a'zolari"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_Haqida"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr ""
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "Filterni qo'llash"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Belgilangan qatorni o'chirish"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Foydalanuvchilar"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "Uy direktoriyani yaratish"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Guruhlar"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "To'liq ismi"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr ""
+"Foydalanuvchi faqat kichik harflar, sonlar. \"-\" va \"_\" belgilaridan "
+"iborat bo'lishi mumkin"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Uy direktoriyasi"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Kirish konsoli"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"Bu maxfiy so'z juda sodda. \n"
+"Yaxshi maxfiy so'z 6 belgidan ko'p bo'lishi kerak"
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Asosiy guruh"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "Shuncha kundan so'ng o'zgartirish talab qilinadi :"
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Holati"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "Foydalanuvchining ID'si"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Foydalanuvchi"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "Buni o'zgartirish uchun nishonchani bosing"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "Guruhning ID'si"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"Guruh %s foydalanuvchi %s uchun asosiy\n"
+" Avvalo foydalanuvchini o'chiring"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "Guruh a'zolari"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/_Guruhni qo'shish"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Guruhning nomi"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Foydalanuvchini \"%s\" asosiy guruhidan o'chirib bo'lmaydi"
 
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr "Foydalanuvchini qo'shish"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Mandrake Linux uchun foydalanuvchilarni boshqarish vositasi"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "Sistemaga foydalanuvchini qo'shish"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "Guruh allaqachon mavjud, iltimos boshqa guruh nomini tanlang"
 
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "Guruhni qo'shish"
+#: ../userdrake:1
+#, c-format
+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 ""
+"UID'si 500 dan kam bo'lgan foydalanuvchini yaratish tavsiya qilinmaydi.\n"
+" Buni bajarishga ishonchingiz komilmi?\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Mualliflar: "
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "Sistemaga guruhni qo'shish"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Tuzatish"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "Belgilangan qatorni tuzatish"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "O'chirish"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Belgilangan qatorni o'chirish"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Yangilash"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Ro'yxatni yangilash"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "Vaqti o'tgan"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "Qulflangan"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "Buni o'zgartirish uchun nishonchani bosing"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Yangi foydalanuvchini yaratish"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "Uy direktoriyani yaratish"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Guruhlar"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Uy direktoriyasi: "
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Asosiy guruh"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Foydalanuvchi uchun shaxsiy guruhni yaratish"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "Foydalanuvchining UID'si 500 dan kam"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "Foydalanuvchining hisobini qulflash"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
-"Foydalanuvchi allaqachon mavjud, iltimos boshqa foydalanuvchini tanlang"
+"Foydalanuvchi %s o'chirilmoqda\n"
+" Budan tashqari quyidagi amallarni bajarish\n"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "Shuncha kundan so'ng o'zgartirish mumkin :"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Uy direktoriya"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "Maxfiy so'z mos kelmadi"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
 msgstr ""
-"Bu maxfiy so'z juda sodda. \n"
-"Yaxshi maxfiy so'z 6 belgidan ko'p bo'lishi kerak"
+"Foydalanuvchi allaqachon mavjud, iltimos boshqa foydalanuvchini tanlang"
 
-#: ../userdrake_.c:265
-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 ""
-"UID'si 500 dan kam bo'lgan foydalanuvchini yaratish tavsiya qilinmaydi.\n"
-" Buni bajarishga ishonchingiz komilmi?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
+msgstr "Foydalanuvchini qo'shish"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "Foydalanuvchining UID'si 500 dan kam"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake - foydalanuvchilarni boshqarish"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "Hisobning muddati o'tadi (YYYY-OO-KK):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "Guruhni tanlang"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_Amallar"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "\"users\" guruhiga qo'shish"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Mavjud bo'lgan guruhga qo'shish"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr ""
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "Bunday nomli guruh allaqachon mavjud. Siz nimani bajarishni istaysiz?"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/_Fayl"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Ha"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "Foydalanuvchining ismi juda uzun"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "Yo'q"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Yopish"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Foydalanuvchi"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Uy direktoriyasi: "
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/_Yangilash"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_Tuzatish"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "Guruh allaqachon mavjud, iltimos boshqa guruh nomini tanlang"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "Foydalanuvchi maydoni bo'sh. Iltimos foydalanuvchini kiriting."
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr "Guruhning GID'si 500 dan kam"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Foydalanuvchi"
 
-#: ../userdrake_.c:385
-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 ""
-"GID'si 500 dan kam bo'lgan guruhni yaratish tavsiya qilinmaydi.\n"
-" Buni bajarishga ishonchingiz komilmi?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/Chi_qish"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "Bunday nomli guruh allaqachon mavjud. Siz nimani bajarishni istaysiz?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "O'chirish"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"Foydalanuvchi %s o'chirilmoqda\n"
-" Budan tashqari quyidagi amallarni bajarish\n"
+"Iltimos hisob muddati o'tish\n"
+" yilni, oyni va kunni ko'rsating"
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Uy direktoriyasini o'chirish :%s"
+msgid "User Data"
+msgstr "Foydalanuvchining ma'lumotlari"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "Pochta qutisini o'chirish :/var/spool/mail/%s"
+msgid "Refresh"
+msgstr "Yangilash"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "To'liq ismi"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr ""
+msgid " Group Gid is < 500"
+msgstr "Guruhning GID'si 500 dan kam"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"Guruh %s foydalanuvchi %s uchun asosiy\n"
-" Avvalo foydalanuvchini o'chiring"
+msgid "Edit selected row"
+msgstr "Belgilangan qatorni tuzatish"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Foydalanuvchi"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Guruhning nomi"
+
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Holati"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Maxfiy so'z"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Maxfiy so'zni tasdiqlang:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "Maxfiy so'z muddati o'tishini yoqish"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Uy direktoriya"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "Bu guruhga a'zo bo'ladigan foydalanuvchilarni tanlang:"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Foydalanuvchining ma'lumotlari"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Foydalanuvchilar"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "Hisob muddati o'tishini yoqish"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "Shuncha kundan so'ng hisob qulflanadi :"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "Hisobning muddati o'tadi (YYYY-OO-KK):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "Guruhning ID'si"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "Foydalanuvchining hisobini qulflash"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "Yo'q"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Hisob haqida ma'lumot"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_Haqida"
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "Foydalanuvchi oxirgi marta maxfiy so'zni o'zgartirgan sana : "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Parametrlar"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "Maxfiy so'z muddati o'tishini yoqish"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "Foydalanuvchining ID'si"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "Shuncha kundan so'ng o'zgartirish mumkin :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "Hisob muddati o'tishini yoqish"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "Shuncha kundan so'ng o'zgartirish talab qilinadi :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "Pochta qutisini o'chirish :/var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Ro'yxatni yangilash"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "Shuncha kundan so'ng hisob qulflanadi :"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_Yordam"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Maxfiy so'z haqida ma'lumot"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Uy direktoriyasini o'chirish :%s"
+
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Foydalanuvchilar boshqaruvi\n"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Foydalanuvchi a'zo bo'ladigan guruhni tanlang:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "Guruhning ma'lumoti"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "Bu guruhga a'zo bo'ladigan foydalanuvchilarni tanlang:"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "Qulflangan"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Guruhning foydalanuvchilari"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "Guruhni qo'shish"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "Iltimos foydalanuvchi uchun eng kamida bitta guruhni tanlang"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Iltimos hisob muddati o'tish\n"
-" yilni, oyni va kunni ko'rsating"
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "Foydalanuvchi oxirgi marta maxfiy so'zni o'zgartirgan sana : "
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Xato haqida xabar qilish"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Foydalanuvchini \"%s\" asosiy guruhidan o'chirib bo'lmaydi"
+msgid "Yes"
+msgstr "Ha"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Yopish"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Guruhning ma'lumoti"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake - foydalanuvchilarni boshqarish"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Mualliflar: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Maxfiy so'zni tasdiqlang:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Foydalanuvchilar boshqaruvi\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/_Foydalanuvchini qo'shish"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright (C) 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Sistema foydalanuvchilarini filterlash"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "Foydalanuvchi maydoni bo'sh. Iltimos foydalanuvchini kiriting."
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "Maxfiy so'z haqida ma'lumot"
 
-#: ../userdrake_.c:926
-#, fuzzy
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr ""
-"Foydalanuvchi faqat kichik harflar, sonlar. \"-\" va \"_\" belgilaridan "
-"iborat bo'lishi mumkin"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Qidirish:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "Foydalanuvchining ismi juda uzun"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Mavjud bo'lgan guruhga qo'shish"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Xato"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "Guruhni tanlang"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "Filterni qo'llash"
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "Userdrake bo'yicha umumiy yordam"
diff --git a/po/uz@Cyrl.po b/po/uz@Cyrl.po
index c43b4f1..ce5ae7b 100644
--- a/po/uz@Cyrl.po
+++ b/po/uz@Cyrl.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-uz@Cyrl\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-08-18 01:56+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -23,456 +23,556 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Mandrake Linux учун фойдаланувчиларни бошқариш воситаси"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_Амаллар"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright (C) 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_Тузатиш"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Гуруҳнинг фойдаланувчилари"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_Ўчириш"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Система фойдаланувчиларини филтерлаш"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_Параметрлар"
+#: ../userdrake:1
+#, c-format
+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 ""
+"GID'си 500 дан кам бўлган гуруҳни яратиш тавсия қилинмайди.\n"
+" Буни бажаришга ишончингиз комилми?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_Файл"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Кириш консоли"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/_Янгилаш"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Фойдаланувчи учун шахсий гуруҳни яратиш"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/Чи_қиш"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Тузатиш"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "Системага фойдаланувчини қўшиш"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/_Фойдаланувчини қўшиш"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Ҳисоб ҳақида маълумот"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/_Гуруҳни қўшиш"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/_Ёрдам"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Хато"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_Хато ҳақида хабар қилиш"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "Гуруҳ аъзолари"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/_Ҳақида"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr ""
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "Филтерни қўллаш"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Белгиланган қаторни ўчириш"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Фойдаланувчилар"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "Уй директорияни яратиш"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Гуруҳлар"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "Тўлиқ исми"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr ""
+"Фойдаланувчи фақат кичик ҳарфлар, сонлар. \"-\" ва \"_\" белгиларидан иборат "
+"бўлиши мумкин"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Уй директорияси"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Кириш консоли"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"Бу махфий сўз жуда содда. \n"
+"Яхши махфий сўз 6 белгидан кўп бўлиши керак"
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Асосий гуруҳ"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "Шунча кундан сўнг ўзгартириш талаб қилинади :"
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Ҳолати"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "Фойдаланувчининг ID'си"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "Фойдаланувчи"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "Буни ўзгартириш учун нишончани босинг"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "Гуруҳнинг ID'си"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"Гуруҳ %s фойдаланувчи %s учун асосий\n"
+" Аввало фойдаланувчини ўчиринг"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "Гуруҳ аъзолари"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/_Гуруҳни қўшиш"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "Гуруҳнинг номи"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "Фойдаланувчини \"%s\" асосий гуруҳидан ўчириб бўлмайди"
 
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr "Фойдаланувчини қўшиш"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Mandrake Linux учун фойдаланувчиларни бошқариш воситаси"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "Системага фойдаланувчини қўшиш"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "Гуруҳ аллақачон мавжуд, илтимос бошқа гуруҳ номини танланг"
 
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "Гуруҳни қўшиш"
+#: ../userdrake:1
+#, c-format
+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 ""
+"UID'си 500 дан кам бўлган фойдаланувчини яратиш тавсия қилинмайди.\n"
+" Буни бажаришга ишончингиз комилми?\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Муаллифлар: "
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "Системага гуруҳни қўшиш"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Тузатиш"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "Белгиланган қаторни тузатиш"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Ўчириш"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Белгиланган қаторни ўчириш"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Янгилаш"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Рўйхатни янгилаш"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "Вақти ўтган"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "Қулфланган"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "Буни ўзгартириш учун нишончани босинг"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Янги фойдаланувчини яратиш"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "Уй директорияни яратиш"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Гуруҳлар"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Уй директорияси: "
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Асосий гуруҳ"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Фойдаланувчи учун шахсий гуруҳни яратиш"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "Фойдаланувчининг UID'си 500 дан кам"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "Фойдаланувчининг ҳисобини қулфлаш"
+
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
+"Фойдаланувчи %s ўчирилмоқда\n"
+" Будан ташқари қуйидаги амалларни бажариш\n"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "Фойдаланувчи аллақачон мавжуд, илтимос бошқа фойдаланувчини танланг"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "Шунча кундан сўнг ўзгартириш мумкин :"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Уй директория"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "Махфий сўз мос келмади"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"Бу махфий сўз жуда содда. \n"
-"Яхши махфий сўз 6 белгидан кўп бўлиши керак"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Фойдаланувчи аллақачон мавжуд, илтимос бошқа фойдаланувчини танланг"
 
-#: ../userdrake_.c:265
-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 ""
-"UID'си 500 дан кам бўлган фойдаланувчини яратиш тавсия қилинмайди.\n"
-" Буни бажаришга ишончингиз комилми?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
+msgstr "Фойдаланувчини қўшиш"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "Фойдаланувчининг UID'си 500 дан кам"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake - фойдаланувчиларни бошқариш"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "Ҳисобнинг муддати ўтади (ЙЙЙЙ-ОО-КК):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "Гуруҳни танланг"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_Амаллар"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "\"users\" гуруҳига қўшиш"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Мавжуд бўлган гуруҳга қўшиш"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr ""
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "Бундай номли гуруҳ аллақачон мавжуд. Сиз нимани бажаришни истайсиз?"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/_Файл"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Ҳа"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "Фойдаланувчининг исми жуда узун"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "Йўқ"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Ёпиш"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "Фойдаланувчи"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Уй директорияси: "
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/_Янгилаш"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_Тузатиш"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "Гуруҳ аллақачон мавжуд, илтимос бошқа гуруҳ номини танланг"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "Фойдаланувчи майдони бўш. Илтимос фойдаланувчини киритинг."
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr "Гуруҳнинг GID'си 500 дан кам"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Фойдаланувчи"
 
-#: ../userdrake_.c:385
-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 ""
-"GID'си 500 дан кам бўлган гуруҳни яратиш тавсия қилинмайди.\n"
-" Буни бажаришга ишончингиз комилми?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/Чи_қиш"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "Бундай номли гуруҳ аллақачон мавжуд. Сиз нимани бажаришни истайсиз?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Ўчириш"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"Фойдаланувчи %s ўчирилмоқда\n"
-" Будан ташқари қуйидаги амалларни бажариш\n"
+"Илтимос ҳисоб муддати ўтиш\n"
+" йилни, ойни ва кунни кўрсатинг"
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Уй директориясини ўчириш :%s"
+msgid "User Data"
+msgstr "Фойдаланувчининг маълумотлари"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "Почта қутисини ўчириш :/var/spool/mail/%s"
+msgid "Refresh"
+msgstr "Янгилаш"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "Тўлиқ исми"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr ""
+msgid " Group Gid is < 500"
+msgstr "Гуруҳнинг GID'си 500 дан кам"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"Гуруҳ %s фойдаланувчи %s учун асосий\n"
-" Аввало фойдаланувчини ўчиринг"
+msgid "Edit selected row"
+msgstr "Белгиланган қаторни тузатиш"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Фойдаланувчи"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "Гуруҳнинг номи"
+
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Ҳолати"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Махфий сўз"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Махфий сўзни тасдиқланг:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "Махфий сўз муддати ўтишини ёқиш"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Уй директория"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "Бу гуруҳга аъзо бўладиган фойдаланувчиларни танланг:"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Фойдаланувчининг маълумотлари"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Фойдаланувчилар"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "Ҳисоб муддати ўтишини ёқиш"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "Шунча кундан сўнг ҳисоб қулфланади :"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "Ҳисобнинг муддати ўтади (ЙЙЙЙ-ОО-КК):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "Гуруҳнинг ID'си"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "Фойдаланувчининг ҳисобини қулфлаш"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "Йўқ"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Ҳисоб ҳақида маълумот"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/_Ҳақида"
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "Фойдаланувчи охирги марта махфий сўзни ўзгартирган сана : "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Параметрлар"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "Махфий сўз муддати ўтишини ёқиш"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "Фойдаланувчининг ID'си"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "Шунча кундан сўнг ўзгартириш мумкин :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "Ҳисоб муддати ўтишини ёқиш"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "Шунча кундан сўнг ўзгартириш талаб қилинади :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "Почта қутисини ўчириш :/var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Рўйхатни янгилаш"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "Шунча кундан сўнг ҳисоб қулфланади :"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_Ёрдам"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Махфий сўз ҳақида маълумот"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Уй директориясини ўчириш :%s"
+
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Фойдаланувчилар бошқаруви\n"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Фойдаланувчи аъзо бўладиган гуруҳни танланг:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "Гуруҳнинг маълумоти"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "Бу гуруҳга аъзо бўладиган фойдаланувчиларни танланг:"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "Қулфланган"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Гуруҳнинг фойдаланувчилари"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "Гуруҳни қўшиш"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "Илтимос фойдаланувчи учун энг камида битта гуруҳни танланг"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"Илтимос ҳисоб муддати ўтиш\n"
-" йилни, ойни ва кунни кўрсатинг"
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "Фойдаланувчи охирги марта махфий сўзни ўзгартирган сана : "
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Хато ҳақида хабар қилиш"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "Фойдаланувчини \"%s\" асосий гуруҳидан ўчириб бўлмайди"
+msgid "Yes"
+msgstr "Ҳа"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Ёпиш"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Гуруҳнинг маълумоти"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake - фойдаланувчиларни бошқариш"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Муаллифлар: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Махфий сўзни тасдиқланг:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Фойдаланувчилар бошқаруви\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/_Фойдаланувчини қўшиш"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright (C) 2003 Mandrakesoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Система фойдаланувчиларини филтерлаш"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "Фойдаланувчи майдони бўш. Илтимос фойдаланувчини киритинг."
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "Махфий сўз ҳақида маълумот"
 
-#: ../userdrake_.c:926
-#, fuzzy
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr ""
-"Фойдаланувчи фақат кичик ҳарфлар, сонлар. \"-\" ва \"_\" белгиларидан иборат "
-"бўлиши мумкин"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Қидириш:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "Фойдаланувчининг исми жуда узун"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Мавжуд бўлган гуруҳга қўшиш"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Хато"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "Гуруҳни танланг"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "Филтерни қўллаш"
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "Userdrake бўйича умумий ёрдам"
diff --git a/po/vi.po b/po/vi.po
index 308ec5b..410c16c 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+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,469 +16,539 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr ""
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/_Actions"
-msgstr "Hành động"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Bản quyền © 2003 MandrakeSoft."
 
-#: ../userdrake_.c:66
-#, fuzzy
-msgid "/_Edit"
-msgstr "Biên soạn"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Users"
+msgstr "Nhóm"
 
-#: ../userdrake_.c:67
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "/_Delete"
 msgstr "Xóa"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
+#: ../userdrake:1
+#, c-format
+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:68 ../userdrake_.c:80
-#, fuzzy
-msgid "/_Options"
-msgstr "Hành động"
-
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-#, fuzzy
-msgid "/_File"
-msgstr "Tệp"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Login Shell"
+msgstr "Đăng nhập"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Biên soạn"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:76
-#, fuzzy
-msgid "/_Add User"
-msgstr "Thêm người dùng"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/Add _Group"
-msgstr "Thêm nhóm"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-#, fuzzy
-msgid "/_Help"
-msgstr "Trợ giúp"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Members"
+msgstr "Nhóm"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:88
-#, fuzzy
-msgid "/_About..."
-msgstr "Nói về"
-
-#: ../userdrake_.c:103
-msgid "Apply filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Người dùng"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Create Home Directory"
+msgstr "Thư mục home của người dùng"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Nhóm"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr ""
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Home Directory"
 msgstr "Thư mục home của người dùng"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-#, fuzzy
-msgid "Login Shell"
-msgstr "Đăng nhập"
-
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "Status"
-msgstr "Chạy tls"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User ID"
-msgstr "Người dùng"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User Name"
-msgstr "UserDrake"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group ID"
-msgstr "Nhóm"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group Members"
-msgstr "Nhóm"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr ""
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-#, fuzzy
-msgid "Group Name"
-msgstr "Nhóm"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-#, fuzzy
-msgid "Add User"
-msgstr "Thêm người dùng"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
 msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add Group"
-msgstr "Thêm nhóm"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add a group to the system"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/Add _Group"
 msgstr "Thêm nhóm"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Biên soạn"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr ""
 
-#: ../userdrake_.c:137
-msgid "Edit selected row"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Xóa"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete selected row"
+#: ../userdrake:1
+#, c-format
+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:139
-msgid "Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:139
-#, fuzzy
-msgid "Refresh the list"
-msgstr "Danh sách người dùng"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add a group to the system"
+msgstr "Thêm nhóm"
 
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:168
-msgid "Locked"
+#: ../userdrake:1
+#, c-format
+msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Nhóm"
 
-#: ../userdrake_.c:225 ../userdrake_.c:364
-msgid "Create New User"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:232
-#, fuzzy
-msgid "Create Home Directory"
-msgstr "Thư mục home của người dùng"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr ""
 
-#: ../userdrake_.c:234
-#, fuzzy
-msgid "Home Directory: "
-msgstr "Thư mục home của người dùng"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr ""
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:251
-#, fuzzy
-msgid "User already exists, please choose another User Name"
-msgstr "Tên này đã có trong hệ thống rồi"
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "Home"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Password Mismatch"
 msgstr "Mật khẩu"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Tên này đã có trong hệ thống rồi"
 
-#: ../userdrake_.c:265
-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:1
+#, fuzzy, c-format
+msgid "Add User"
+msgstr "Thêm người dùng"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Actions"
+msgstr "Hành động"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_File"
+msgstr "Tệp"
+
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:355
-msgid "Yes"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Close"
+msgstr "Xoá sạch"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User Name"
+msgstr "UserDrake"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Home Directory: "
+msgstr "Thư mục home của người dùng"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:359
-msgid "No"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Edit"
+msgstr "Biên soạn"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "Đăng nhập"
 
-#: ../userdrake_.c:385
-msgid ""
-"Creating a group with a GID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:400
-msgid "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Xóa"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, fuzzy, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Thư mục home của người dùng"
+msgid "User Data"
+msgstr "Danh sách người dùng"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
+msgid "Refresh"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
 msgstr ""
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
+msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
+msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "Đăng nhập"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Name"
+msgstr "Nhóm"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Status"
+msgstr "Chạy tls"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: ../userdrake_.c:553
-#, fuzzy
-msgid "Confirm Password:"
-msgstr "Mật khẩu:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr ""
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "Home"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr ""
 
-#: ../userdrake_.c:593
-#, fuzzy
-msgid "User Data"
-msgstr "Danh sách người dùng"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Người dùng"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group ID"
+msgstr "Nhóm"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
+#: ../userdrake:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_About..."
+msgstr "Nói về"
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Options"
+msgstr "Hành động"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User ID"
+msgstr "Người dùng"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Refresh the list"
+msgstr "Danh sách người dùng"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Help"
+msgstr "Trợ giúp"
 
-#: ../userdrake_.c:622
-#, fuzzy
-msgid "Password Info"
-msgstr "Mật khẩu"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Thư mục home của người dùng"
 
-#: ../userdrake_.c:626
-msgid "Select the groups that the user will be a member of:"
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:671
-#, fuzzy
-msgid "Group Data"
-msgstr "Danh sách nhóm"
+#: ../userdrake:1
+#, c-format
+msgid "Select the groups that the user will be a member of:"
+msgstr ""
 
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:675
-#, fuzzy
-msgid "Group Users"
-msgstr "Nhóm"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add Group"
+msgstr "Thêm nhóm"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
+msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:900
-#, fuzzy
-msgid "Close"
-msgstr "Xoá sạch"
-
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Data"
+msgstr "Danh sách nhóm"
 
-#: ../userdrake_.c:912
-msgid "Authors: "
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Confirm Password:"
+msgstr "Mật khẩu:"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Bản quyền © 2003 MandrakeSoft."
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Add User"
+msgstr "Thêm người dùng"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Password Info"
+msgstr "Mật khẩu"
+
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Tìm kiếm:"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:931
-msgid "Error"
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
 msgstr ""
 
 #~ msgid "Help"
diff --git a/po/wa.po b/po/wa.po
index 14ffca0..ceaac6c 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+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,460 +22,561 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Usteye di manaedjmint des uzeus di Mandrake"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/_Accions"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "Copyright � 2003 MandrakeSoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/_Candj�"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "Uzeus do groupe"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/_Disfacer"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/_Passete po les uzeus sistinme"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/_Tchuzes"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Ahiver on groupe avou on GID (idintifant do groupe) pus ptit ki 500\n"
+"n'�est n�n ricmand�. Estoz seur del voleur f�?\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/_Fitch�"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "Shell d'�elodjaedje"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/_Rafrister"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "Ahiver on groupe priv� po l'�uzeu"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/Mouss� _fo�"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "Candj�"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "Radjouter �n uzeu � sistinme"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/_Radjouter uzeu"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "Inform�cion do conte"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/Radjouter _groupe"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "Asteme: dji disface l'�uzeu"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/_Aidance"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "Aroke"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/_Rapoirter bug"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "Mimbes do groupe"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/� _dfait..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "Djo�s d'�adviertixhmint divant d'�diveur candj�:"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "Mete en alaedje li passete"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "Disfacer l'�roye tchoezeye"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "Uzeus"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "Ahiver l'�ridant m�jhon"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "Groupes"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "No en etir"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr ""
+"Li no n'�pout aveur ki des ptit�s laten�s letes, des chifes, li loyeure "
+"(�-�) et li caractere sorlign� (�_�)."
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "Ridant m�jhon"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "Shell d'�elodjaedje"
-
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "Prumio�le groupe"
-
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "Estat"
-
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "ID di l'�uzeu"
-
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "No di l'�uzeu"
-
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "ID do groupe"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"Li scret est p�r trop simpe. \n"
+" On bon scret doet aveur pus di 6 caracteres"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "Mimbes do groupe"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "Djo�s dvant dveur candj�:"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "No do groupe"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "Voloz vs vormint disfacer l'�groupe %s?\n"
 
-# broken into two lines to avoid too large a button
-#: ../userdrake_.c:135
-msgid "Add User"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
 msgstr ""
-"Radjouter\n"
-"uzeu"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "Radjouter �n uzeu � sistinme"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "clitch�z so l'�im�djete pol candj�"
 
-# broken into two lines to avoid too large a button
-#: ../userdrake_.c:136
-msgid "Add Group"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
 msgstr ""
-"Radjouter\n"
-"groupe"
+"%s est l'�groupe prumio�le da l'�uzeu %s\n"
+" I vs f�t d'�aprume oister l'�uzeu"
 
-#: ../userdrake_.c:136
-msgid "Add a group to the system"
-msgstr "Radjouter on groupe � sistinme"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/Radjouter _groupe"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "Candj�"
+#: ../userdrake:1
+#, 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:137
-msgid "Edit selected row"
-msgstr "Candj� l'�roye tchoezeye"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Usteye di manaedjmint des uzeus di Mandrake"
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "Disfacer"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr ""
+"Li groupe egzist�ye dedja, tchoezixhoz �n �te no d'�groupe s'�i vs plait"
 
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "Disfacer l'�roye tchoezeye"
+#: ../userdrake:1
+#, c-format
+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 ""
+"Ahiver �n uzeu avou �n UID (idintifant d'�uzeu) pus ptit ki 500\n"
+"n'�est n�n ricmand�. Estoz seur del voleur f�?\n"
+"\n"
 
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "Rafrister"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "Oteurs: "
 
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "Rafrister l'�djiv�ye"
+#: ../userdrake:1
+#, c-format
+msgid "Add a group to the system"
+msgstr "Radjouter on groupe � sistinme"
 
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr ""
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "clitch�z so l'�im�djete pol candj�"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "Ahiver on novea uzeu"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "Ahiver l'�ridant m�jhon"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "Groupes"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "Ridant m�jhon: "
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "Prumio�le groupe"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "Ahiver on groupe priv� po l'�uzeu"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "L' UID est < 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "Diner al mwin l'�idintifiant di l'�uzeu"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr ""
 
-#: ../userdrake_.c:251
-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:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
+"Dji disface l'�uzeu %s\n"
+" Dji fwai eto les accions shuvantes\n"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "Djo�s dvant d'�poleur candj�:"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "M�jhon"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "Les screts n'�sont n�n les minmes"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"Li scret est p�r trop simpe. \n"
-" On bon scret doet aveur pus di 6 caracteres"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "Ci no egzist�ye dedja el sistinme, tchoezixhoz � �n �te s'�i vs plait"
 
-#: ../userdrake_.c:265
-msgid ""
-"Creating a user with a UID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+# broken into two lines to avoid too large a button
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
 msgstr ""
-"Ahiver �n uzeu avou �n UID (idintifant d'�uzeu) pus ptit ki 500\n"
-"n'�est n�n ricmand�. Estoz seur del voleur f�?\n"
-"\n"
+"Radjouter\n"
+"uzeu"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "L' UID est < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr ""
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "Tchoezi groupe"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/_Accions"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "Radjouter � groupe �users�"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "Radjouter � groupe k'�egzit�ye dedja"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "Diner al mwin l'�idintifiant di l'�uzeu"
 
-#: ../userdrake_.c:334
-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:1
+#, c-format
+msgid "/_File"
+msgstr "/_Fitch�"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "Oyi"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "Li no est p�r trop long"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "Neni"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "Cl�re"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "No di l'�uzeu"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "Ridant m�jhon: "
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/_Rafrister"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/_Candj�"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "Diner al mwin l'�idintifiant do groupe"
 
-#: ../userdrake_.c:381
-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:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "Li tchamp do no est vude, i vs f�t dner on no s'�i vs plait"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr " Li GID est < 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "No d'�elodjaedje"
 
-#: ../userdrake_.c:385
-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 ""
-"Ahiver on groupe avou on GID (idintifant do groupe) pus ptit ki 500\n"
-"n'�est n�n ricmand�. Estoz seur del voleur f�?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/Mouss� _fo�"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "I gn a ddja on groupe di �'�no la.  Cw� voloz vs f�?"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr "Asteme: dji disface l'�uzeu"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "Disfacer"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"Dji disface l'�uzeu %s\n"
-" Dji fwai eto les accions shuvantes\n"
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "Disfacer l'�ridant m�jhon: %s"
+msgid "User Data"
+msgstr "Din�yes di l'�uzeu"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "Disfacer l'�boesse �s emiles: /var/spool/mail/%s"
+msgid "Refresh"
+msgstr "Rafrister"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "No en etir"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "Asteme: dji disface li groupe"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "Voloz vs vormint disfacer l'�groupe %s?\n"
+msgid " Group Gid is < 500"
+msgstr " Li GID est < 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s est l'�groupe prumio�le da l'�uzeu %s\n"
-" I vs f�t d'�aprume oister l'�uzeu"
+msgid "Edit selected row"
+msgstr "Candj� l'�roye tchoezeye"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "No d'�elodjaedje"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "No do groupe"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "Estat"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "Sicret"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "Acertinaedje do scret:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr ""
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "M�jhon"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "Tchoezixhoz les uzeus k'�iront dins �'�groupe chal:"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "Din�yes di l'�uzeu"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "Uzeus"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "Djo�s dvant ki l'�conte soeye djok�:"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "ID do groupe"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "Neni"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "Inform�cion do conte"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/� _dfait..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "L'�uzeu candja si scret pol dierin c�p li:"
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Tchuzes"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "ID di l'�uzeu"
+
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "Djo�s dvant d'�poleur candj�:"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "Disfacer l'�boesse �s emiles: /var/spool/mail/%s"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "Djo�s dvant dveur candj�:"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "Rafrister l'�djiv�ye"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "Djo�s d'�adviertixhmint divant d'�diveur candj�:"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_Aidance"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "Djo�s dvant ki l'�conte soeye djok�:"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "Disfacer l'�ridant m�jhon: %s"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "Inform�cion sol sicret"
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "Manaedjmint des uzeus \n"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "Tchoezixwhoz les groupes ki l'�uzeu nd� ser� mimbe:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "Din�yes do groupe"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "Tchoezixhoz les uzeus k'�iront dins �'�groupe chal:"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr ""
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "Uzeus do groupe"
+# broken into two lines to avoid too large a button
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr ""
+"Radjouter\n"
+"groupe"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "Tchoezixhoz pol moens on groupe po l'�uzeu s'�i vs plait"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "L'�uzeu candja si scret pol dierin c�p li:"
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Rapoirter bug"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, 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"
+msgid "Yes"
+msgstr "Oyi"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "Cl�re"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "Din�yes do groupe"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "Oteurs: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "Acertinaedje do scret:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "Manaedjmint des uzeus \n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/_Radjouter uzeu"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "Copyright � 2003 MandrakeSoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/_Passete po les uzeus sistinme"
 
-#: ../userdrake_.c:925
-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:1
+#, c-format
+msgid "Password Info"
+msgstr "Inform�cion sol sicret"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr ""
-"Li no n'�pout aveur ki des ptit�s laten�s letes, des chifes, li loyeure "
-"(�-�) et li caractere sorlign� (�_�)."
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "Cweri:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "Li no est p�r trop long"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "Radjouter � groupe k'�egzit�ye dedja"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "Aroke"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "Tchoezi groupe"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "Mete en alaedje li passete"
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "Aidance djenerike so userdrake"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f86a059..a705ac3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+0200\n"
 "PO-Revision-Date: 2003-08-13 16:29+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Chinese <zh@li.org>\n"
@@ -18,451 +18,551 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr "Mandrake Linux 用户管理工具"
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-msgid "/_Actions"
-msgstr "/操作(_A)"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "版权所有 (C) 2003 MandrakeSoft SA"
 
-#: ../userdrake_.c:66
-msgid "/_Edit"
-msgstr "/编辑(_E)"
+#: ../userdrake:1
+#, c-format
+msgid "Group Users"
+msgstr "组用户"
 
-#: ../userdrake_.c:67
+#: ../userdrake:1
+#, c-format
 msgid "/_Delete"
 msgstr "/删除(_D)"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
-msgstr "/过滤系统用户(_F)"
-
-#: ../userdrake_.c:68 ../userdrake_.c:80
-msgid "/_Options"
-msgstr "/选项(_O)"
+#: ../userdrake:1
+#, c-format
+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 ""
+"不推荐创建一个 GID 小于 500 的组。\n"
+"您确定您要这么做吗？\n"
+"\n"
 
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-msgid "/_File"
-msgstr "/文件(_F)"
+#: ../userdrake:1
+#, c-format
+msgid "Login Shell"
+msgstr "登录 Shell"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
-msgstr "/刷新(_R)"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
+msgstr "为该用户创建一个私有组"
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
-msgstr "/退出(_Q)"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "编辑"
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
-msgstr "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
+msgstr "向系统中添加一个用户"
 
-#: ../userdrake_.c:76
-msgid "/_Add User"
-msgstr "/添加用户(_A)"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
+msgstr "账户信息"
 
-#: ../userdrake_.c:77
-msgid "/Add _Group"
-msgstr "/添加组(_G)"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr "警告: 删除用户"
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-msgid "/_Help"
-msgstr "/帮助(_H)"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr "错误"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
-msgstr "/报告错误(_R)"
+#: ../userdrake:1
+#, c-format
+msgid "Group Members"
+msgstr "组成员"
 
-#: ../userdrake_.c:88
-msgid "/_About..."
-msgstr "/关于(_A)..."
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
+msgstr "更改前警告的天数:"
 
-#: ../userdrake_.c:103
-msgid "Apply filter"
-msgstr "应用过滤器"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
+msgstr "删除所选的行"
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "用户"
+#: ../userdrake:1
+#, c-format
+msgid "Create Home Directory"
+msgstr "创建主目录"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "组"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr "UID: "
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
-msgstr "全名"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+msgstr "名字只能小写的拉丁字母、数字、“-”和“_”"
 
-#: ../userdrake_.c:122
+#: ../userdrake:1
+#, c-format
 msgid "Home Directory"
 msgstr "主目录"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-msgid "Login Shell"
-msgstr "登录 Shell"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
+msgstr ""
+"这个密码太简单了。\n"
+"好的密码应该大于 6 个字符"
 
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
-msgstr "主要的组"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr "必须修改前的天数:"
 
-#: ../userdrake_.c:122
-msgid "Status"
-msgstr "状态"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr "您真的想要删除组 %s 吗?\n"
 
-#: ../userdrake_.c:122
-msgid "User ID"
-msgstr "用户 ID"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr "请指定密码时效的所有域\n"
 
-#: ../userdrake_.c:122
-msgid "User Name"
-msgstr "用户名"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
+msgstr "单击图标进行更改"
 
-#: ../userdrake_.c:129
-msgid "Group ID"
-msgstr "组 ID"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
+"%s 是用户 %s 的主要组\n"
+"请先删除这个用户"
 
-#: ../userdrake_.c:129
-msgid "Group Members"
-msgstr "组成员"
+#: ../userdrake:1
+#, c-format
+msgid "/Add _Group"
+msgstr "/添加组(_G)"
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-msgid "Group Name"
-msgstr "组名"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr "您不能从用户“%s”的主要组中删除该用户"
 
-#: ../userdrake_.c:135
-msgid "Add User"
-msgstr "添加用户"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
+msgstr "Mandrake Linux 用户管理工具"
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
-msgstr "向系统中添加一个用户"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr "组已经存在，请使用其他组名"
 
-#: ../userdrake_.c:136
-msgid "Add Group"
-msgstr "添加组"
+#: ../userdrake:1
+#, c-format
+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 ""
+"不推荐创建一个 UID 小于 500 的用户。\n"
+"您确定您要这么做吗?\n"
+"\n"
+
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
+msgstr "作者: "
 
-#: ../userdrake_.c:136
+#: ../userdrake:1
+#, c-format
 msgid "Add a group to the system"
 msgstr "向系统中添加一个组"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "编辑"
-
-#: ../userdrake_.c:137
-msgid "Edit selected row"
-msgstr "编辑所选的行"
-
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "删除"
-
-#: ../userdrake_.c:138
-msgid "Delete selected row"
-msgstr "删除所选的行"
-
-#: ../userdrake_.c:139
-msgid "Refresh"
-msgstr "刷新"
-
-#: ../userdrake_.c:139
-msgid "Refresh the list"
-msgstr "刷新列表"
-
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr "已到期"
 
-#: ../userdrake_.c:168
-msgid "Locked"
-msgstr "已锁定"
-
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr "单击图标进行更改"
-
-#: ../userdrake_.c:225 ../userdrake_.c:364
+#: ../userdrake:1
+#, c-format
 msgid "Create New User"
 msgstr "创建新用户"
 
-#: ../userdrake_.c:232
-msgid "Create Home Directory"
-msgstr "创建主目录"
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "组"
 
-#: ../userdrake_.c:234
-msgid "Home Directory: "
-msgstr "用户主目录: "
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
+msgstr "主要的组"
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
-msgstr "为该用户创建一个私有组"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr "用户的 UID 小于 500"
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
-msgstr "手动指定用户 ID"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr "锁定用户账户"
 
-#: ../userdrake_.c:251
-msgid "User already exists, please choose another User Name"
-msgstr "用户已经存在，请选择其他用户名"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
+msgstr ""
+"删除用户 %s\n"
+" 同时执行下列操作\n"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
+msgstr "允许修改前的天数:"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "主目录"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password Mismatch"
 msgstr "密码不匹配"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
-"这个密码太简单了。\n"
-"好的密码应该大于 6 个字符"
+#: ../userdrake:1
+#, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "用户已经存在，请选择其他用户名"
 
-#: ../userdrake_.c:265
-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 ""
-"不推荐创建一个 UID 小于 500 的用户。\n"
-"您确定您要这么做吗?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "Add User"
+msgstr "添加用户"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr "用户的 UID 小于 500"
+#: ../userdrake:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../userdrake_.c:317
-msgid "UID: "
-msgstr "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
+msgstr "账户过期到 (YYYY-MM-DD):"
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr "选择组"
+#: ../userdrake:1
+#, c-format
+msgid "/_Actions"
+msgstr "/操作(_A)"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr "添加到“users”组"
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
-msgstr "添加到已有组"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
+msgstr "手动指定用户 ID"
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
-msgstr "已经存在同名组。您想要怎么做？"
+#: ../userdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/文件(_F)"
 
-#: ../userdrake_.c:355
-msgid "Yes"
-msgstr "是"
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
+msgstr "名字太长了"
 
-#: ../userdrake_.c:359
-msgid "No"
-msgstr "否"
+#: ../userdrake:1
+#, c-format
+msgid "Close"
+msgstr "关闭"
+
+#: ../userdrake:1
+#, c-format
+msgid "User Name"
+msgstr "用户名"
+
+#: ../userdrake:1
+#, c-format
+msgid "Home Directory: "
+msgstr "用户主目录: "
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
+msgstr "/刷新(_R)"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Edit"
+msgstr "/编辑(_E)"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr "手动指定组 ID"
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
-msgstr "组已经存在，请使用其他组名"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
+msgstr "名字栏是空的，请提供一个名字"
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr "组的 GID 小于 500"
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "登录名"
 
-#: ../userdrake_.c:385
-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 ""
-"不推荐创建一个 GID 小于 500 的组。\n"
-"您确定您要这么做吗？\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
+msgstr "/退出(_Q)"
 
-#: ../userdrake_.c:400
-msgid "GID: "
-msgstr "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
+msgstr "已经存在同名组。您想要怎么做？"
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr "警告: 删除用户"
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "删除"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
-"删除用户 %s\n"
-" 同时执行下列操作\n"
+"请指定账户过期的\n"
+"年月日"
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, c-format
-msgid "Delete Home Directory :%s"
-msgstr "删除主目录: %s"
+msgid "User Data"
+msgstr "用户数据"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
-msgstr "删除邮箱: /var/spool/mail/%s"
+msgid "Refresh"
+msgstr "刷新"
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr "全名"
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr "警告: 删除组"
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
-msgstr "您真的想要删除组 %s 吗?\n"
+msgid " Group Gid is < 500"
+msgstr "组的 GID 小于 500"
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
-msgstr ""
-"%s 是用户 %s 的主要组\n"
-"请先删除这个用户"
+msgid "Edit selected row"
+msgstr "编辑所选的行"
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "登录名"
+#: ../userdrake:1
+#, c-format
+msgid "Group Name"
+msgstr "组名"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
+msgid "Status"
+msgstr "状态"
+
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "密码"
 
-#: ../userdrake_.c:553
-msgid "Confirm Password:"
-msgstr "确认密码:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr "启用密码过期"
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "主目录"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr "选择要加入这个组的用户:"
 
-#: ../userdrake_.c:593
-msgid "User Data"
-msgstr "用户数据"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "用户"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
-msgstr "启用账户过期"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
+msgstr "账户不被激活前的天数:"
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr "账户过期到 (YYYY-MM-DD):"
+#: ../userdrake:1
+#, c-format
+msgid "Group ID"
+msgstr "组 ID"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
-msgstr "锁定用户账户"
+#: ../userdrake:1
+#, c-format
+msgid "No"
+msgstr "否"
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr "账户信息"
+#: ../userdrake:1
+#, c-format
+msgid "/_About..."
+msgstr "/关于(_A)..."
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr "用户最后一次修改密码的时间: "
+#: ../userdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/选项(_O)"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr "启用密码过期"
+#: ../userdrake:1
+#, c-format
+msgid "User ID"
+msgstr "用户 ID"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
-msgstr "允许修改前的天数:"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
+msgstr "启用账户过期"
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
-msgstr "必须修改前的天数:"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
+msgstr "删除邮箱: /var/spool/mail/%s"
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr "更改前警告的天数:"
+#: ../userdrake:1
+#, c-format
+msgid "Refresh the list"
+msgstr "刷新列表"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr "账户不被激活前的天数:"
+#: ../userdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/帮助(_H)"
 
-#: ../userdrake_.c:622
-msgid "Password Info"
-msgstr "密码信息"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Home Directory :%s"
+msgstr "删除主目录: %s"
 
-#: ../userdrake_.c:626
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
+msgstr "用户管理\n"
+
+#: ../userdrake:1
+#, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "选择该用户将属于哪些组:"
 
-#: ../userdrake_.c:671
-msgid "Group Data"
-msgstr "组数据"
-
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
-msgstr "选择要加入这个组的用户:"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
+msgstr "已锁定"
 
-#: ../userdrake_.c:675
-msgid "Group Users"
-msgstr "组用户"
+#: ../userdrake:1
+#, c-format
+msgid "Add Group"
+msgstr "添加组"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr "请为这个用户至少选择一个组"
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
-msgstr ""
-"请指定账户过期的\n"
-"年月日"
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
+msgstr "用户最后一次修改密码的时间: "
 
-#: ../userdrake_.c:753
-#, fuzzy
-msgid "Please fill up all fields in password aging\n"
-msgstr "请指定密码时效的所有域\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/报告错误(_R)"
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
-msgstr "您不能从用户“%s”的主要组中删除该用户"
+msgid "Yes"
+msgstr "是"
 
-#: ../userdrake_.c:900
-msgid "Close"
-msgstr "关闭"
+#: ../userdrake:1
+#, c-format
+msgid "Group Data"
+msgstr "组数据"
 
-#: ../userdrake_.c:906
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
+msgstr "GID: "
 
-#: ../userdrake_.c:912
-msgid "Authors: "
-msgstr "作者: "
+#: ../userdrake:1
+#, c-format
+msgid "Confirm Password:"
+msgstr "确认密码:"
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr "用户管理\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Add User"
+msgstr "/添加用户(_A)"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "版权所有 (C) 2003 MandrakeSoft SA"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
+msgstr "/过滤系统用户(_F)"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
-msgstr "名字栏是空的，请提供一个名字"
+#: ../userdrake:1
+#, c-format
+msgid "Password Info"
+msgstr "密码信息"
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
-msgstr "名字只能小写的拉丁字母、数字、“-”和“_”"
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "搜索:"
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
-msgstr "名字太长了"
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
+msgstr "添加到已有组"
 
-#: ../userdrake_.c:931
-msgid "Error"
-msgstr "错误"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
+msgstr "选择组"
+
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
+msgstr "应用过滤器"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 293f566..3ebe615 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-08-19 15:32+0200\n"
+"POT-Creation-Date: 2003-08-19 22:57+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,470 +18,539 @@ msgstr ""
 "Content-Type: text/plain; charset=BIG5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../userdrake_.c:56
-msgid "Mandrake Linux Users Management Tool"
-msgstr ""
-
-#: ../userdrake_.c:66 ../userdrake_.c:67 ../userdrake_.c:75 ../userdrake_.c:76
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/_Actions"
-msgstr "����"
+#: ../userdrake:1
+#, c-format
+msgid "Copyright (C) 2003 Mandrakesoft SA"
+msgstr "���v�Ҧ� (C) 2003 MandrakeSoft�C"
 
-#: ../userdrake_.c:66
-#, fuzzy
-msgid "/_Edit"
-msgstr "�s��"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Users"
+msgstr "�s��"
 
-#: ../userdrake_.c:67
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "/_Delete"
 msgstr "�R��"
 
-#: ../userdrake_.c:68
-msgid "/_Filter system users"
+#: ../userdrake:1
+#, c-format
+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:68 ../userdrake_.c:80
-#, fuzzy
-msgid "/_Options"
-msgstr "����"
-
-#: ../userdrake_.c:72 ../userdrake_.c:73 ../userdrake_.c:74
-#, fuzzy
-msgid "/_File"
-msgstr "�ɮ�"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Login Shell"
+msgstr "�ϥΪ̦W��"
 
-#: ../userdrake_.c:73
-msgid "/_Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Create a private group for the user"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "/_Quit"
+#: ../userdrake:1
+#, c-format
+msgid "Edit"
+msgstr "�s��"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add a user to the system"
 msgstr ""
 
-#: ../userdrake_.c:74
-msgid "<control>Q"
+#: ../userdrake:1
+#, c-format
+msgid "Account Info"
 msgstr ""
 
-#: ../userdrake_.c:76
-#, fuzzy
-msgid "/_Add User"
-msgstr "�s�W�ϥΪ�"
+#: ../userdrake:1
+#, c-format
+msgid "Warning : Deleting User"
+msgstr ""
 
-#: ../userdrake_.c:77
-#, fuzzy
-msgid "/Add _Group"
-msgstr "�s�W�s��"
+#: ../userdrake:1
+#, c-format
+msgid "Error"
+msgstr ""
 
-#: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87 ../userdrake_.c:88
-#, fuzzy
-msgid "/_Help"
-msgstr "����"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Members"
+msgstr "�s��"
 
-#: ../userdrake_.c:87
-msgid "/_Report Bug"
+#: ../userdrake:1
+#, c-format
+msgid "Days warning before change :"
 msgstr ""
 
-#: ../userdrake_.c:88
-#, fuzzy
-msgid "/_About..."
-msgstr "����"
-
-#: ../userdrake_.c:103
-msgid "Apply filter"
+#: ../userdrake:1
+#, c-format
+msgid "Delete selected row"
 msgstr ""
 
-#: ../userdrake_.c:106
-msgid "Users"
-msgstr "�ϥΪ�"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Create Home Directory"
+msgstr "�ϥΪ̥D�ؿ�"
 
-#: ../userdrake_.c:108 ../userdrake_.c:632
-msgid "Groups"
-msgstr "�s��"
+#: ../userdrake:1
+#, c-format
+msgid "UID: "
+msgstr ""
 
-#: ../userdrake_.c:122 ../userdrake_.c:551
-msgid "Full Name"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Home Directory"
 msgstr "�ϥΪ̥D�ؿ�"
 
-#: ../userdrake_.c:122 ../userdrake_.c:554
-#, fuzzy
-msgid "Login Shell"
-msgstr "�ϥΪ̦W��"
-
-#: ../userdrake_.c:122 ../userdrake_.c:629
-msgid "Primary Group"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"This password is too simple. \n"
+" Good passwords should be > 6 characters"
 msgstr ""
 
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "Status"
-msgstr "TLS �[�K"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User ID"
-msgstr "�ϥΪ�"
-
-#: ../userdrake_.c:122
-#, fuzzy
-msgid "User Name"
-msgstr "Userdrake �ϥΪ̺޲z��"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group ID"
-msgstr "�s��"
-
-#: ../userdrake_.c:129
-#, fuzzy
-msgid "Group Members"
-msgstr "�s��"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change required :"
+msgstr ""
 
-#: ../userdrake_.c:129 ../userdrake_.c:565
-#, fuzzy
-msgid "Group Name"
-msgstr "�s��"
+#: ../userdrake:1
+#, c-format
+msgid "Do you really want to delete the group %s\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-#, fuzzy
-msgid "Add User"
-msgstr "�s�W�ϥΪ�"
+#: ../userdrake:1
+#, c-format
+msgid "Please fill up all fields in password aging\n"
+msgstr ""
 
-#: ../userdrake_.c:135
-msgid "Add a user to the system"
+#: ../userdrake:1
+#, c-format
+msgid "Click on the icon to change it"
 msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add Group"
-msgstr "�s�W�s��"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"%s is a primary group for user %s\n"
+" Remove the user first"
+msgstr ""
 
-#: ../userdrake_.c:136
-#, fuzzy
-msgid "Add a group to the system"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/Add _Group"
 msgstr "�s�W�s��"
 
-#: ../userdrake_.c:137
-msgid "Edit"
-msgstr "�s��"
+#: ../userdrake:1
+#, c-format
+msgid "You cannot remove user '%s' from their primary group"
+msgstr ""
 
-#: ../userdrake_.c:137
-msgid "Edit selected row"
+#: ../userdrake:1
+#, c-format
+msgid "Mandrake Linux Users Management Tool"
 msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete"
-msgstr "�R��"
+#: ../userdrake:1
+#, c-format
+msgid "Group already exists, please choose another Group Name"
+msgstr ""
 
-#: ../userdrake_.c:138
-msgid "Delete selected row"
+#: ../userdrake:1
+#, c-format
+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:139
-msgid "Refresh"
+#: ../userdrake:1
+#, c-format
+msgid "Authors: "
 msgstr ""
 
-#: ../userdrake_.c:139
-#, fuzzy
-msgid "Refresh the list"
-msgstr "�ϥΪ̦C��"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add a group to the system"
+msgstr "�s�W�s��"
 
-#: ../userdrake_.c:168
+#: ../userdrake:1
+#, c-format
 msgid "Expired"
 msgstr ""
 
-#: ../userdrake_.c:168
-msgid "Locked"
+#: ../userdrake:1
+#, c-format
+msgid "Create New User"
 msgstr ""
 
-#: ../userdrake_.c:207
-msgid "Click on the icon to change it"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Groups"
+msgstr "�s��"
 
-#: ../userdrake_.c:225 ../userdrake_.c:364
-msgid "Create New User"
+#: ../userdrake:1
+#, c-format
+msgid "Primary Group"
 msgstr ""
 
-#: ../userdrake_.c:232
-#, fuzzy
-msgid "Create Home Directory"
-msgstr "�ϥΪ̥D�ؿ�"
+#: ../userdrake:1
+#, c-format
+msgid "User Uid is < 500"
+msgstr ""
 
-#: ../userdrake_.c:234
-#, fuzzy
-msgid "Home Directory: "
-msgstr "�ϥΪ̥D�ؿ�"
+#: ../userdrake:1
+#, c-format
+msgid "Lock User Account"
+msgstr ""
 
-#: ../userdrake_.c:237
-msgid "Create a private group for the user"
+#: ../userdrake:1
+#, c-format
+msgid ""
+"Deleting user %s\n"
+" Also perform the following actions\n"
 msgstr ""
 
-#: ../userdrake_.c:238
-msgid "Specify user ID manually"
+#: ../userdrake:1
+#, c-format
+msgid "Days before change allowed :"
 msgstr ""
 
-#: ../userdrake_.c:251
-#, fuzzy
-msgid "User already exists, please choose another User Name"
-msgstr "�t�Τ��w�g���o�ӦW��"
+#: ../userdrake:1
+#, c-format
+msgid "Home"
+msgstr "�a�ؿ�"
 
-#: ../userdrake_.c:253 ../userdrake_.c:707
-#, fuzzy
+#: ../userdrake:1
+#, fuzzy, c-format
 msgid "Password Mismatch"
 msgstr "�K�X"
 
-#: ../userdrake_.c:254 ../userdrake_.c:709
-msgid ""
-"This password is too simple. \n"
-" Good passwords should be > 6 characters"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User already exists, please choose another User Name"
+msgstr "�t�Τ��w�g���o�ӦW��"
 
-#: ../userdrake_.c:265
-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:1
+#, fuzzy, c-format
+msgid "Add User"
+msgstr "�s�W�ϥΪ�"
 
-#: ../userdrake_.c:265
-msgid "User Uid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Userdrake"
+msgstr "Userdrake �ϥΪ̺޲z��"
 
-#: ../userdrake_.c:317
-msgid "UID: "
+#: ../userdrake:1
+#, c-format
+msgid "Account expires (YYYY-MM-DD):"
 msgstr ""
 
-#: ../userdrake_.c:329
-msgid "Choose Group"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Actions"
+msgstr "����"
 
-#: ../userdrake_.c:331
+#: ../userdrake:1
+#, c-format
 msgid "Add to the 'users' group"
 msgstr ""
 
-#: ../userdrake_.c:331
-msgid "Add to the existing group"
+#: ../userdrake:1
+#, c-format
+msgid "Specify user ID manually"
 msgstr ""
 
-#: ../userdrake_.c:334
-msgid "A group with this name already exists.  What would you like to do?"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_File"
+msgstr "�ɮ�"
+
+#: ../userdrake:1
+#, c-format
+msgid "Name is too long"
 msgstr ""
 
-#: ../userdrake_.c:355
-msgid "Yes"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Close"
+msgstr "���X"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User Name"
+msgstr "Userdrake �ϥΪ̺޲z��"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Home Directory: "
+msgstr "�ϥΪ̥D�ؿ�"
+
+#: ../userdrake:1
+#, c-format
+msgid "/_Refresh"
 msgstr ""
 
-#: ../userdrake_.c:359
-msgid "No"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Edit"
+msgstr "�s��"
+
+#: ../userdrake:1
+#, c-format
+msgid "<control>Q"
 msgstr ""
 
-#: ../userdrake_.c:370
+#: ../userdrake:1
+#, c-format
 msgid "Specify group ID manually"
 msgstr ""
 
-#: ../userdrake_.c:381
-msgid "Group already exists, please choose another Group Name"
+#: ../userdrake:1
+#, c-format
+msgid "Name field is empty please provide a name"
 msgstr ""
 
-#: ../userdrake_.c:385
-msgid " Group Gid is < 500"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Login"
+msgstr "�ϥΪ̦W��"
 
-#: ../userdrake_.c:385
-msgid ""
-"Creating a group with a GID less than 500 is not recommended.\n"
-" Are you sure you want to do this?\n"
-"\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Quit"
 msgstr ""
 
-#: ../userdrake_.c:400
-msgid "GID: "
+#: ../userdrake:1
+#, c-format
+msgid "A group with this name already exists.  What would you like to do?"
 msgstr ""
 
-#: ../userdrake_.c:449
-msgid "Warning : Deleting User"
-msgstr ""
+#: ../userdrake:1
+#, c-format
+msgid "Delete"
+msgstr "�R��"
 
-#: ../userdrake_.c:452
+#: ../userdrake:1
 #, c-format
 msgid ""
-"Deleting user %s\n"
-" Also perform the following actions\n"
+"Please specify Year, Month and Day \n"
+" for Account Expiration "
 msgstr ""
 
-#: ../userdrake_.c:453
+#: ../userdrake:1
 #, fuzzy, c-format
-msgid "Delete Home Directory :%s"
-msgstr "�ϥΪ̥D�ؿ�"
+msgid "User Data"
+msgstr "�ϥΪ̦C��"
 
-#: ../userdrake_.c:454
+#: ../userdrake:1
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
+msgid "Refresh"
 msgstr ""
 
-#: ../userdrake_.c:480
+#: ../userdrake:1
+#, c-format
+msgid "Full Name"
+msgstr ""
+
+#: ../userdrake:1
+#, c-format
 msgid "Warning : Deleting Group"
 msgstr ""
 
-#: ../userdrake_.c:483
+#: ../userdrake:1
 #, c-format
-msgid "Do you really want to delete the group %s\n"
+msgid " Group Gid is < 500"
 msgstr ""
 
-#: ../userdrake_.c:495
+#: ../userdrake:1
 #, c-format
-msgid ""
-"%s is a primary group for user %s\n"
-" Remove the user first"
+msgid "Edit selected row"
 msgstr ""
 
-#: ../userdrake_.c:550
-msgid "Login"
-msgstr "�ϥΪ̦W��"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Name"
+msgstr "�s��"
+
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Status"
+msgstr "TLS �[�K"
 
-#: ../userdrake_.c:552
+#: ../userdrake:1
+#, c-format
 msgid "Password"
 msgstr "�K�X"
 
-#: ../userdrake_.c:553
-#, fuzzy
-msgid "Confirm Password:"
-msgstr "�K�X�G"
+#: ../userdrake:1
+#, c-format
+msgid "Enable Password Expiration"
+msgstr ""
 
-#: ../userdrake_.c:591
-msgid "Home"
-msgstr "�a�ؿ�"
+#: ../userdrake:1
+#, c-format
+msgid "Select the users to join this group :"
+msgstr ""
 
-#: ../userdrake_.c:593
-#, fuzzy
-msgid "User Data"
-msgstr "�ϥΪ̦C��"
+#: ../userdrake:1
+#, c-format
+msgid "Users"
+msgstr "�ϥΪ�"
 
-#: ../userdrake_.c:596
-msgid "Enable account expiration"
+#: ../userdrake:1
+#, c-format
+msgid "Days before account inactive :"
 msgstr ""
 
-#: ../userdrake_.c:598
-msgid "Account expires (YYYY-MM-DD):"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group ID"
+msgstr "�s��"
 
-#: ../userdrake_.c:604
-msgid "Lock User Account"
+#: ../userdrake:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../userdrake_.c:605
-msgid "Account Info"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_About..."
+msgstr "����"
 
-#: ../userdrake_.c:610
-msgid "User last changed password on : "
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Options"
+msgstr "����"
 
-#: ../userdrake_.c:614
-msgid "Enable Password Expiration"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "User ID"
+msgstr "�ϥΪ�"
 
-#: ../userdrake_.c:617
-msgid "Days before change allowed :"
+#: ../userdrake:1
+#, c-format
+msgid "Enable account expiration"
 msgstr ""
 
-#: ../userdrake_.c:618
-msgid "Days before change required :"
+#: ../userdrake:1
+#, c-format
+msgid "Delete Mailbox :/var/spool/mail/%s"
 msgstr ""
 
-#: ../userdrake_.c:619
-msgid "Days warning before change :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Refresh the list"
+msgstr "�ϥΪ̦C��"
 
-#: ../userdrake_.c:620
-msgid "Days before account inactive :"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Help"
+msgstr "����"
 
-#: ../userdrake_.c:622
-#, fuzzy
-msgid "Password Info"
-msgstr "�K�X"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Delete Home Directory :%s"
+msgstr "�ϥΪ̥D�ؿ�"
 
-#: ../userdrake_.c:626
-msgid "Select the groups that the user will be a member of:"
+#: ../userdrake:1
+#, c-format
+msgid "Users Management \n"
 msgstr ""
 
-#: ../userdrake_.c:671
-#, fuzzy
-msgid "Group Data"
-msgstr "�s�զC��"
+#: ../userdrake:1
+#, c-format
+msgid "Select the groups that the user will be a member of:"
+msgstr ""
 
-#: ../userdrake_.c:674
-msgid "Select the users to join this group :"
+#: ../userdrake:1
+#, c-format
+msgid "Locked"
 msgstr ""
 
-#: ../userdrake_.c:675
-#, fuzzy
-msgid "Group Users"
-msgstr "�s��"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Add Group"
+msgstr "�s�W�s��"
 
-#: ../userdrake_.c:737
+#: ../userdrake:1
+#, c-format
 msgid "Please select at least one group for the user"
 msgstr ""
 
-#: ../userdrake_.c:746
-msgid ""
-"Please specify Year, Month and Day \n"
-" for Account Expiration "
+#: ../userdrake:1
+#, c-format
+msgid "User last changed password on : "
 msgstr ""
 
-#: ../userdrake_.c:753
-msgid "Please fill up all fields in password aging\n"
+#: ../userdrake:1
+#, c-format
+msgid "/_Report Bug"
 msgstr ""
 
-#: ../userdrake_.c:795
+#: ../userdrake:1
 #, c-format
-msgid "You cannot remove user '%s' from their primary group"
+msgid "Yes"
 msgstr ""
 
-#: ../userdrake_.c:900
-#, fuzzy
-msgid "Close"
-msgstr "���X"
-
-#: ../userdrake_.c:906
-#, fuzzy
-msgid "Userdrake"
-msgstr "Userdrake �ϥΪ̺޲z��"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Group Data"
+msgstr "�s�զC��"
 
-#: ../userdrake_.c:912
-msgid "Authors: "
+#: ../userdrake:1
+#, c-format
+msgid "GID: "
 msgstr ""
 
-#: ../userdrake_.c:918
-msgid "Users Management \n"
-msgstr ""
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Confirm Password:"
+msgstr "�K�X�G"
 
-#: ../userdrake_.c:919
-msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "���v�Ҧ� (C) 2003 MandrakeSoft�C"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "/_Add User"
+msgstr "�s�W�ϥΪ�"
 
-#: ../userdrake_.c:925
-msgid "Name field is empty please provide a name"
+#: ../userdrake:1
+#, c-format
+msgid "/_Filter system users"
 msgstr ""
 
-#: ../userdrake_.c:926
-msgid ""
-"The name must contain only lower cased latin letters, numbers, `-' and `_'"
+#: ../userdrake:1
+#, fuzzy, c-format
+msgid "Password Info"
+msgstr "�K�X"
+
+#: ../userdrake:1
+#, c-format
+msgid "Search:"
+msgstr "�M��:"
+
+#: ../userdrake:1
+#, c-format
+msgid "Add to the existing group"
 msgstr ""
 
-#: ../userdrake_.c:927
-msgid "Name is too long"
+#: ../userdrake:1
+#, c-format
+msgid "Choose Group"
 msgstr ""
 
-#: ../userdrake_.c:931
-msgid "Error"
+#: ../userdrake:1
+#, c-format
+msgid "Apply filter"
 msgstr ""
 
 #~ msgid "Help"