3 files changed, 508 insertions, 542 deletions

diff --git a/po/es.po b/po/es.po
index 628ca53..c58c075 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
+"POT-Creation-Date: 2003-07-04 16:26+0200\n"
 "PO-Revision-Date: 2003-07-05 14:10-0300\n"
 "Last-Translator: Fabian Mandelbaum <fmandelbaum@hotmail.com>\n"
 "Language-Team: Espa�ol <es@li.org>\n"
@@ -86,139 +86,140 @@ msgstr "/_Acerca de..."
 msgid "Apply filter"
 msgstr "Aplicar filtro"
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:117
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:118 ../userdrake_.c:615
 msgid "Group Users"
 msgstr "Grupos de usuarios"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:131 ../userdrake_.c:492
 msgid "Full Name"
 msgstr "Nombre completo"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:131
 msgid "Home Directory"
 msgstr "Directorio personal"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:131 ../userdrake_.c:495
 msgid "Login Shell"
 msgstr "Shell de login"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:131 ../userdrake_.c:568
 msgid "Primary Group"
 msgstr "Grupo primario"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:131
 msgid "Status"
 msgstr "Estado"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:131
 msgid "User ID"
 msgstr "ID de usuario"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:131
 msgid "User Name"
 msgstr "Nombre de usuario"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:137
 msgid "Group ID"
 msgstr "ID de grupo"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:137
 msgid "Group Members"
 msgstr "Miembros del grupo"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:137 ../userdrake_.c:506
 msgid "Group Name"
 msgstr "Nombre del grupo"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:143
 msgid "Add User"
 msgstr "A�adir usuario"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:143
 msgid "Add a user to the system"
 msgstr "A�adir un usuario al sistema"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:144
 msgid "Add Group"
 msgstr "A�adir grupo"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:144
 msgid "Add a group to the system"
 msgstr "A�adir un grupo al sistema"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:145
 msgid "Edit"
 msgstr "Editar"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:145
 msgid "Edit selected row"
 msgstr "Editar fila seleccionada"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:146
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:146
 msgid "Delete selected row"
 msgstr "Borrar fila seleccionada"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:147
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:147
 msgid "Refresh the list"
 msgstr "Refrescar la lista"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:148
 msgid "Generic help on userdrake"
 msgstr "Ayuda gen�rica sobre userdrake"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:148
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:175
 msgid "Expired"
 msgstr "Expirado"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:175
 msgid "Locked"
 msgstr "Trabado"
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:210 ../userdrake_.c:344
 msgid "Create New User"
 msgstr "Crear usuario nuevo"
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:217
 msgid "Create home Directory"
 msgstr "Crear directorio personal"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:219
 msgid "Home Directory: "
 msgstr "Directorio personal: "
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:222
 msgid "Create a private group for the user"
 msgstr "Crear un grupo privado para el usuario"
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:223
 msgid "Specify user ID manually"
 msgstr "Especificar ID de usuario manualmente"
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:234
 msgid "User already exists, please choose another User Name"
-msgstr "El usuario ya existe en el sistema, por favor use otro nombre de usuario"
+msgstr ""
+"El usuario ya existe en el sistema, por favor use otro nombre de usuario"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:236 ../userdrake_.c:647
 msgid "Password Mismatch"
 msgstr "No coincide la contrase�a"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:237 ../userdrake_.c:649
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
@@ -226,7 +227,7 @@ msgstr ""
 "Esta contrase�a es demasiado simple. \n"
 " Las contrase�as buenas deber�an tener m�s de 6 caracteres"
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:248
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -236,61 +237,61 @@ msgstr ""
 "�Est� seguro que desea hacer esto?\n"
 "\n"
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:248
 msgid "User Uid is < 500"
 msgstr "El UID del usuario es menor a 500"
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
+#: ../userdrake_.c:286 ../userdrake_.c:322 ../userdrake_.c:375
+#: ../userdrake_.c:753
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
+#: ../userdrake_.c:286 ../userdrake_.c:318 ../userdrake_.c:375
+#: ../userdrake_.c:753 ../userdrake_.c:885
 msgid "Ok"
 msgstr "Aceptar"
 
-#: ../userdrake_.c:294
+#: ../userdrake_.c:297
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:309
 msgid "Choose Group"
 msgstr "Seleccione grupo"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:311
 msgid "Add to the 'users' group"
 msgstr "A�adir al grupo 'users'"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:311
 msgid "Add to the existing group"
 msgstr "A�adir al grupo existente"
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:314
 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:332
+#: ../userdrake_.c:335
 msgid "Yes"
 msgstr "S�"
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:339
 msgid "No"
 msgstr "No"
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:350
 msgid "Specify group ID manually"
 msgstr "Especificar ID de grupo manualmente"
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:361
 msgid "Group already exists, please choose another Group Name"
 msgstr "El grupo ya existe, por favor use otro nombre de grupo"
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:365
 msgid " Group Gid is < 500"
 msgstr "El GID del grupo es menor a 500"
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:365
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -300,19 +301,20 @@ msgstr ""
 "�Est� seguro que desea hacer esto?\n"
 "\n"
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:380
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:431
 msgid " Remove Home Directory"
 msgstr "Quitar directorio personal"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:431
 msgid "Do you want to delete the user's home directory and mail spool?"
-msgstr "�Desea eliminar el directorio personal y la cola de correos del usuario?"
+msgstr ""
+"�Desea eliminar el directorio personal y la cola de correos del usuario?"
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:441
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -321,91 +323,91 @@ msgstr ""
 "%s es un grupo primario para el usuario %s\n"
 "Quite primero al usuario"
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:491
 msgid "Login"
 msgstr "Login"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:493
 msgid "Password"
 msgstr "Contrase�a"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:494
 msgid "Confirm Password:"
 msgstr "Confirmar contrase�a:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:529
 msgid "Home"
 msgstr "Directorio personal"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:531
 msgid "User Data"
 msgstr "Datos del usuario"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:535
 msgid "Enable account expiration"
 msgstr "Habilitar expiraci�n de cuenta"
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:537
 msgid "Account expires   MM/DD/YYYY :"
 msgstr "La cuenta expira   MM/DD/AAAA :"
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:543
 msgid "Lock User Account"
 msgstr "Trabar cuenta de usuario"
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:544
 msgid "Account Info"
 msgstr "Informaci�n de la cuenta"
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:549
 msgid "User last changed password on : "
 msgstr "El usuario cambi� la contrase�a por �ltima vez el : "
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:553
 msgid "Enable Password Expiration"
 msgstr "Habilitar expiraci�n de contrase�a"
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:556
 msgid "Days before change allowed :"
 msgstr "D�as antes que se permita el cambio :"
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:557
 msgid "Days before change required :"
 msgstr "D�as antes que se requiera el cambio :"
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:558
 msgid "Days warning before change :"
 msgstr "D�as de advertencia antes del cambio :"
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:559
 msgid "Days before account inactive :"
 msgstr "D�as antes que la cuenta se inactive :"
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:561
 msgid "Password Info"
 msgstr "Informaci�n de contrase�a"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:565
 msgid "Select the groups that the user will be a member of:"
 msgstr "Seleccione los grupos a los cuales pertenecer� el usuario:"
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:571
 msgid "Groups"
 msgstr "Grupos"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:611
 msgid "Group Data"
 msgstr "Datos del grupo"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:614
 msgid "Select the users to join this group :"
 msgstr "Seleccione los usuarios que formar�n parte de este grupo:"
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:678
 msgid "Please select at least one group for the user"
 msgstr "Por favor, seleccione al menos un grupo para el usuario"
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:687
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
@@ -413,48 +415,49 @@ msgstr ""
 "Por favor, especifique el a�o, mes y d�a\n"
 "para la expiraci�n de la cuenta"
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:694
 msgid "Please specify all field for password aging\n"
-msgstr "Por favor, especifique todos los campos para la caducaci�n de la contrase�a\n"
+msgstr ""
+"Por favor, especifique todos los campos para la caducaci�n de la contrase�a\n"
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:736
 #, 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:824
+#: ../userdrake_.c:848
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:854
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:860
 msgid "Authors: "
 msgstr "Autores: "
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:866
 msgid "Users Management \n"
 msgstr "Administraci�n de usuarios \n"
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:867
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Copyright (C) 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:873
 msgid "Name field is empty please provide a name"
 msgstr "El campo de nombre est� vac�o, por favor proporcione un nombre"
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:874
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "El nombre debe contener s�lo letras min�sculas, n�meros, `-' y `_'"
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:875
 msgid "Name is too long"
 msgstr "El nombre es muy largo"
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:879
 msgid "Error"
 msgstr "Error"
 
@@ -846,4 +849,3 @@ msgstr "Error"
 #~ msgstr ""
 #~ "No se puede bloquear la biblioteca de usuarios,\n"
 #~ "existe el archivo /etc/ptmp o /etc/gtmp"
-
diff --git a/po/ru.po b/po/ru.po
index e829de7..664f581 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,8 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
-"PO-Revision-Date: 2003-06-27 13:19+0200\n"
+"POT-Creation-Date: 2003-07-04 16:26+0200\n"
+"PO-Revision-Date: 2003-07-07 13:39+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <cooker-i18n@linux-mandrake.com>\n"
 "MIME-Version: 1.0\n"
@@ -57,7 +57,7 @@ msgstr "/_�����"
 
 #: ../userdrake_.c:87
 msgid "<control>Q"
-msgstr ""
+msgstr "<control>Q"
 
 #: ../userdrake_.c:89
 msgid "/_Add User"
@@ -81,142 +81,142 @@ msgstr "/_� ���������..."
 
 #: ../userdrake_.c:114
 msgid "Apply filter"
-msgstr ""
+msgstr "��������� ������"
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:117
 msgid "Users"
 msgstr "������������"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
+#: ../userdrake_.c:118 ../userdrake_.c:615
 msgid "Group Users"
 msgstr "������ �������������"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:131 ../userdrake_.c:492
 msgid "Full Name"
 msgstr "������ ���"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:131
 msgid "Home Directory"
 msgstr "�������� �������"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
+#: ../userdrake_.c:131 ../userdrake_.c:495
 msgid "Login Shell"
 msgstr "��������� ���������"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:131 ../userdrake_.c:568
 msgid "Primary Group"
 msgstr "������� ������"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:131
 msgid "Status"
-msgstr ""
+msgstr "������"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:131
 msgid "User ID"
 msgstr "ID ������������"
 
-#: ../userdrake_.c:130
+#: ../userdrake_.c:131
 msgid "User Name"
 msgstr "��� ������������"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:137
 msgid "Group ID"
 msgstr "ID ������"
 
-#: ../userdrake_.c:136
+#: ../userdrake_.c:137
 msgid "Group Members"
 msgstr "����� ������"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
+#: ../userdrake_.c:137 ../userdrake_.c:506
 msgid "Group Name"
 msgstr "��� ������"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:143
 msgid "Add User"
 msgstr "�������� ������������"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:143
 msgid "Add a user to the system"
 msgstr "�������� ������������ � �������"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:144
 msgid "Add Group"
 msgstr "�������� ������"
 
-#: ../userdrake_.c:143
+#: ../userdrake_.c:144
 msgid "Add a group to the system"
 msgstr "�������� ������ � �������"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:145
 msgid "Edit"
 msgstr "�������������"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:145
 msgid "Edit selected row"
 msgstr "������������� ��������� ������"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:146
 msgid "Delete"
 msgstr "�������"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:146
 msgid "Delete selected row"
 msgstr "������� ��������� ������"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:147
 msgid "Refresh"
 msgstr "��������"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:147
 msgid "Refresh the list"
 msgstr "�������� ������"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:148
 msgid "Generic help on userdrake"
 msgstr "������� ������� �� userdrake"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:148
 msgid "Help"
 msgstr "�������"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:175
 msgid "Expired"
-msgstr ""
+msgstr "���� �������� �����"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:175
 msgid "Locked"
-msgstr ""
+msgstr "������������"
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:210 ../userdrake_.c:344
 msgid "Create New User"
 msgstr "������� ������ ������������"
 
-#: ../userdrake_.c:213
+#: ../userdrake_.c:217
 msgid "Create home Directory"
 msgstr "������� �������� �������"
 
-#: ../userdrake_.c:215
+#: ../userdrake_.c:219
 msgid "Home Directory: "
 msgstr "�������� �������:"
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:222
 msgid "Create a private group for the user"
 msgstr "������� ������ ������ ��� ������������"
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:223
 msgid "Specify user ID manually"
 msgstr "������� ID ������������ �������"
 
-#: ../userdrake_.c:230
+#: ../userdrake_.c:234
 msgid "User already exists, please choose another User Name"
 msgstr ""
 "������������ ��� ����������, ����������, �������� ������ ��� ������������"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
+#: ../userdrake_.c:236 ../userdrake_.c:647
 msgid "Password Mismatch"
 msgstr "������ �� ���������"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:237 ../userdrake_.c:649
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
@@ -224,7 +224,7 @@ msgstr ""
 "������ ������� �����. \n"
 "������� ������ ������ ��������� > 6 ��������"
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:248
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -234,61 +234,61 @@ msgstr ""
 "�� �������, ��� ������ ������� ���?\n"
 "\n"
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:248
 msgid "User Uid is < 500"
 msgstr "UID ������������ < 500"
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
+#: ../userdrake_.c:286 ../userdrake_.c:322 ../userdrake_.c:375
+#: ../userdrake_.c:753
 msgid "Cancel"
 msgstr "������"
 
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
+#: ../userdrake_.c:286 ../userdrake_.c:318 ../userdrake_.c:375
+#: ../userdrake_.c:753 ../userdrake_.c:885
 msgid "Ok"
 msgstr "��"
 
-#: ../userdrake_.c:294
+#: ../userdrake_.c:297
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:309
 msgid "Choose Group"
 msgstr "����� ������"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:311
 msgid "Add to the 'users' group"
 msgstr "�������� ������������ � ������ 'users'"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:311
 msgid "Add to the existing group"
 msgstr "�������� � ������������ ������"
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:314
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "������ � ����� ������ ��� ����������. ��� �� ������ �������?"
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:335
 msgid "Yes"
 msgstr "��"
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:339
 msgid "No"
 msgstr "���"
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:350
 msgid "Specify group ID manually"
 msgstr "������� ID ������ �������"
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:361
 msgid "Group already exists, please choose another Group Name"
 msgstr "������ ��� ����������, �����������, �������� ������ ��� ������"
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:365
 msgid " Group Gid is < 500"
 msgstr "GID ������ < 500"
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:365
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
 " Are you sure you want to do this?\n"
@@ -298,19 +298,19 @@ msgstr ""
 "�� �������, ��� ������ ������� ���?\n"
 "\n"
 
-#: ../userdrake_.c:377
+#: ../userdrake_.c:380
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:431
 msgid " Remove Home Directory"
 msgstr "������� �������� �������"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:431
 msgid "Do you want to delete the user's home directory and mail spool?"
 msgstr "������ ������� �������� ������� ������������ � ����������� �����?"
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:441
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -319,91 +319,91 @@ msgstr ""
 "%s �������� ������� ������� ������������ %s\n"
 "������� ������� ������������"
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:491
 msgid "Login"
 msgstr "�����"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:493
 msgid "Password"
 msgstr "������"
 
-#: ../userdrake_.c:491
+#: ../userdrake_.c:494
 msgid "Confirm Password:"
 msgstr "������������� ������:"
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:529
 msgid "Home"
 msgstr "�������� �������"
 
-#: ../userdrake_.c:528
+#: ../userdrake_.c:531
 msgid "User Data"
 msgstr "������ ������������"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:535
 msgid "Enable account expiration"
 msgstr "�������� ���� �������� ������� ������"
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:537
 msgid "Account expires   MM/DD/YYYY :"
 msgstr "���� �������� ������� ������ �������� ��/��/����:"
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:543
 msgid "Lock User Account"
 msgstr "������������� ������� ������ ������������"
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:544
 msgid "Account Info"
 msgstr "���������� �� ������� ������"
 
-#: ../userdrake_.c:546
+#: ../userdrake_.c:549
 msgid "User last changed password on : "
 msgstr "��������� ��� ������������ ������ ������:"
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:553
 msgid "Enable Password Expiration"
 msgstr "�������� ���� �������� ������"
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:556
 msgid "Days before change allowed :"
 msgstr "���������� ���� �� ���������� �����:"
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:557
 msgid "Days before change required :"
 msgstr "���������� ���� �� ���������� �����:"
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:558
 msgid "Days warning before change :"
 msgstr "���������� ���� �� �������������� � �����:"
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:559
 msgid "Days before account inactive :"
 msgstr "���������� ���� �� ���������� ������� ������:"
 
-#: ../userdrake_.c:558
+#: ../userdrake_.c:561
 msgid "Password Info"
 msgstr "���������� � ������"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:565
 msgid "Select the groups that the user will be a member of:"
 msgstr "�������� ������, ������ ������� ����� ������������:"
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:571
 msgid "Groups"
 msgstr "������"
 
-#: ../userdrake_.c:608
+#: ../userdrake_.c:611
 msgid "Group Data"
 msgstr "������ ������"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:614
 msgid "Select the users to join this group :"
 msgstr "�������� ������������� ��� ������������� � ���� ������:"
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:678
 msgid "Please select at least one group for the user"
 msgstr "����������, �������� ��� ������������ �� ������� ���� ���� ������"
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:687
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
@@ -411,63 +411,47 @@ msgstr ""
 "����������, ������� ���, ����� � ����\n"
 "����� �������� ������� ������"
 
-#: ../userdrake_.c:691
-#, fuzzy
+#: ../userdrake_.c:694
 msgid "Please specify all field for password aging\n"
-msgstr "����������, ������� ��� ���� ��� �������� ������"
+msgstr "����������, ������� ��� ���� ��� �������� ������\n"
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:736
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "�� �� ������ ������� ������������ '%s' �� ��� ������� ������"
 
-#: ../userdrake_.c:824
+#: ../userdrake_.c:848
 msgid "Close"
 msgstr "�������"
 
-#: ../userdrake_.c:830
+#: ../userdrake_.c:854
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:860
 msgid "Authors: "
 msgstr "������:"
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:866
 msgid "Users Management \n"
 msgstr "���������� �������������� \n"
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:867
 msgid "Copyright (C) 2003 Mandrakesoft SA"
 msgstr "Copyright (C) 2003 Mandrakesoft SA"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:873
 msgid "Name field is empty please provide a name"
 msgstr "���� ����� �� ���������, ����������, ������� ���"
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:874
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "��� ������ ��������� ������ ������� ������� ��������, �����, `-' � `_'"
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:875
 msgid "Name is too long"
 msgstr "��� ������� �������"
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:879
 msgid "Error"
 msgstr "������"
-
-#~ msgid "/Filter system users"
-#~ msgstr "/������ ������������� �������"
-
-#~ msgid "/Options"
-#~ msgstr "/���������"
-
-#~ msgid "/Actions"
-#~ msgstr "/��������"
-
-#~ msgid "/Edit"
-#~ msgstr "/�������������"
-
-#~ msgid "/Delete"
-#~ msgstr "/�������"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e530abd..e217a30 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,657 +4,637 @@
 #  Chinese messages for userdrake
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Danny Zeng <danny@zeng.com.cn>, 2000
+# Shiyu Tang <shiyutang@netscape.net>, 2003
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
-"POT-Creation-Date: 2003-07-03 23:01+0200\n"
-"PO-Revision-Date: 2002-08-20 14:30+0800\n"
-"Last-Translator: Danny Zeng <danny@zeng.com.cn>\n"
+"POT-Creation-Date: 2003-07-04 16:26+0200\n"
+"PO-Revision-Date: 2003-07-05 19:30+0800\n"
+"Last-Translator: ShiyuTang <shiyutang@netscape.net>\n"
 "Language-Team: Chinese <zh@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=gb2312\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../userdrake_.c:70
 msgid "Mandrake Linux Users Management Tool"
-msgstr ""
+msgstr "Mandrake Linux 用户管理工具"
 
 #: ../userdrake_.c:79 ../userdrake_.c:80 ../userdrake_.c:88 ../userdrake_.c:89
 #: ../userdrake_.c:90
-#, fuzzy
 msgid "/_Actions"
-msgstr "�ж�"
+msgstr "/动作(_A)"
 
 #: ../userdrake_.c:79
-#, fuzzy
 msgid "/_Edit"
-msgstr "�༭"
+msgstr "/编辑(_E)"
 
 #: ../userdrake_.c:80
-#, fuzzy
 msgid "/_Delete"
-msgstr "ɾ��"
+msgstr "/删除(_D)"
 
 #: ../userdrake_.c:81
 msgid "/_Filter system users"
-msgstr ""
+msgstr "/过滤系统用户(_F)"
 
 #: ../userdrake_.c:81 ../userdrake_.c:93
-#, fuzzy
 msgid "/_Options"
-msgstr "�ж�"
+msgstr "/选项(_O)"
 
 #: ../userdrake_.c:85 ../userdrake_.c:86 ../userdrake_.c:87
-#, fuzzy
 msgid "/_File"
-msgstr "�ļ�"
+msgstr "/文件(_F)"
 
 #: ../userdrake_.c:86
 msgid "/_Refresh"
-msgstr ""
+msgstr "/刷新(_R)"
 
 #: ../userdrake_.c:87
 msgid "/_Quit"
-msgstr ""
+msgstr "/退出(_Q)"
 
 #: ../userdrake_.c:87
 msgid "<control>Q"
-msgstr ""
+msgstr "<control>Q"
 
 #: ../userdrake_.c:89
-#, fuzzy
 msgid "/_Add User"
-msgstr "�����û�"
+msgstr "/添加用户(_A)"
 
 #: ../userdrake_.c:90
-#, fuzzy
 msgid "/Add _Group"
-msgstr "������"
+msgstr "/添加组(_G)"
 
 #: ../userdrake_.c:96 ../userdrake_.c:97 ../userdrake_.c:98 ../userdrake_.c:99
-#, fuzzy
 msgid "/_Help"
-msgstr "����"
+msgstr "/帮助(_H)"
 
 #: ../userdrake_.c:98
 msgid "/_Report Bug"
-msgstr ""
+msgstr "/报告错误(_R)"
 
 #: ../userdrake_.c:99
-#, fuzzy
 msgid "/_About..."
-msgstr "����"
+msgstr "/关于(_A)..."
 
 #: ../userdrake_.c:114
 msgid "Apply filter"
 msgstr ""
 
-#: ../userdrake_.c:116
+#: ../userdrake_.c:117
 msgid "Users"
-msgstr "�û�"
+msgstr "用户"
 
-#: ../userdrake_.c:117 ../userdrake_.c:612
-#, fuzzy
+#: ../userdrake_.c:118 ../userdrake_.c:615
 msgid "Group Users"
-msgstr "��"
+msgstr "组用户"
 
-#: ../userdrake_.c:130 ../userdrake_.c:489
+#: ../userdrake_.c:131 ../userdrake_.c:492
 msgid "Full Name"
-msgstr ""
+msgstr "全名"
 
-#: ../userdrake_.c:130
-#, fuzzy
+#: ../userdrake_.c:131
 msgid "Home Directory"
-msgstr "�û���Ŀ¼"
+msgstr "用户主目录"
 
-#: ../userdrake_.c:130 ../userdrake_.c:492
-#, fuzzy
+#: ../userdrake_.c:131 ../userdrake_.c:495
 msgid "Login Shell"
-msgstr "��¼��"
+msgstr "登录 Shell"
 
-#: ../userdrake_.c:130 ../userdrake_.c:565
+#: ../userdrake_.c:131 ../userdrake_.c:568
 msgid "Primary Group"
-msgstr ""
+msgstr "主要的组"
 
-#: ../userdrake_.c:130
-#, fuzzy
+#: ../userdrake_.c:131
 msgid "Status"
-msgstr "��ʼ tls"
+msgstr "状态"
 
-#: ../userdrake_.c:130
-#, fuzzy
+#: ../userdrake_.c:131
 msgid "User ID"
-msgstr "�û�"
+msgstr "用户 ID"
 
-#: ../userdrake_.c:130
-#, fuzzy
+#: ../userdrake_.c:131
 msgid "User Name"
-msgstr "Userdrake ħ���û�����Ա"
+msgstr "用户名"
 
-#: ../userdrake_.c:136
-#, fuzzy
+#: ../userdrake_.c:137
 msgid "Group ID"
-msgstr "��"
+msgstr "组 ID"
 
-#: ../userdrake_.c:136
-#, fuzzy
+#: ../userdrake_.c:137
 msgid "Group Members"
-msgstr "��"
+msgstr "组成员"
 
-#: ../userdrake_.c:136 ../userdrake_.c:503
-#, fuzzy
+#: ../userdrake_.c:137 ../userdrake_.c:506
 msgid "Group Name"
-msgstr "��"
+msgstr "组名"
 
-#: ../userdrake_.c:142
-#, fuzzy
+#: ../userdrake_.c:143
 msgid "Add User"
-msgstr "�����û�"
+msgstr "添加用户"
 
-#: ../userdrake_.c:142
+#: ../userdrake_.c:143
 msgid "Add a user to the system"
-msgstr ""
+msgstr "添加一个用户到系统中"
 
-#: ../userdrake_.c:143
-#, fuzzy
+#: ../userdrake_.c:144
 msgid "Add Group"
-msgstr "������"
+msgstr "添加组"
 
-#: ../userdrake_.c:143
-#, fuzzy
+#: ../userdrake_.c:144
 msgid "Add a group to the system"
-msgstr "����һ����"
+msgstr "添加一个组到系统中"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:145
 msgid "Edit"
-msgstr "�༭"
+msgstr "编辑"
 
-#: ../userdrake_.c:144
+#: ../userdrake_.c:145
 msgid "Edit selected row"
-msgstr ""
+msgstr "编辑所选的列"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:146
 msgid "Delete"
-msgstr "ɾ��"
+msgstr "删除"
 
-#: ../userdrake_.c:145
+#: ../userdrake_.c:146
 msgid "Delete selected row"
-msgstr ""
+msgstr "删除所选的列"
 
-#: ../userdrake_.c:146
+#: ../userdrake_.c:147
 msgid "Refresh"
-msgstr ""
+msgstr "刷新"
 
-#: ../userdrake_.c:146
-#, fuzzy
+#: ../userdrake_.c:147
 msgid "Refresh the list"
-msgstr "�û��б�"
+msgstr "用户列表"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:148
 msgid "Generic help on userdrake"
-msgstr ""
+msgstr "“Drake 用户管理”的简要帮助"
 
-#: ../userdrake_.c:147
+#: ../userdrake_.c:148
 msgid "Help"
-msgstr "����"
+msgstr "帮助"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:175
 msgid "Expired"
-msgstr ""
+msgstr "截止"
 
-#: ../userdrake_.c:184
+#: ../userdrake_.c:175
 msgid "Locked"
-msgstr ""
+msgstr "锁定"
 
-#: ../userdrake_.c:206 ../userdrake_.c:341
+#: ../userdrake_.c:210 ../userdrake_.c:344
 msgid "Create New User"
-msgstr ""
+msgstr "创建新用户"
 
-#: ../userdrake_.c:213
-#, fuzzy
+#: ../userdrake_.c:217
 msgid "Create home Directory"
-msgstr "�û���Ŀ¼"
+msgstr "创建用户主目录"
 
-#: ../userdrake_.c:215
-#, fuzzy
+#: ../userdrake_.c:219
 msgid "Home Directory: "
-msgstr "�û���Ŀ¼"
+msgstr "用户主目录："
 
-#: ../userdrake_.c:218
+#: ../userdrake_.c:222
 msgid "Create a private group for the user"
-msgstr ""
+msgstr "为这个用户创建一个私有组"
 
-#: ../userdrake_.c:219
+#: ../userdrake_.c:223
 msgid "Specify user ID manually"
-msgstr ""
+msgstr "手工指定用户 ID"
 
-#: ../userdrake_.c:230
-#, fuzzy
+#: ../userdrake_.c:234
 msgid "User already exists, please choose another User Name"
-msgstr "ϵͳ���Ѿ����������"
+msgstr "用户已经存在，请使用其他用户名"
 
-#: ../userdrake_.c:232 ../userdrake_.c:644
-#, fuzzy
+#: ../userdrake_.c:236 ../userdrake_.c:647
 msgid "Password Mismatch"
-msgstr "����"
+msgstr "密码不相符"
 
-#: ../userdrake_.c:233 ../userdrake_.c:646
+#: ../userdrake_.c:237 ../userdrake_.c:649
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 caracters"
 msgstr ""
+"这个密码太简单了。\n"
+"好的密码应该大于 6 个字符。"
 
-#: ../userdrake_.c:244
+#: ../userdrake_.c:248
 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:244
+#: ../userdrake_.c:248
 msgid "User Uid is < 500"
-msgstr ""
+msgstr "用户的 UID 小于 500"
 
-#: ../userdrake_.c:283 ../userdrake_.c:319 ../userdrake_.c:372
-#: ../userdrake_.c:750
+#: ../userdrake_.c:286 ../userdrake_.c:322 ../userdrake_.c:375
+#: ../userdrake_.c:753
 msgid "Cancel"
-msgstr "ȡ��"
+msgstr "取消"
 
-#: ../userdrake_.c:283 ../userdrake_.c:315 ../userdrake_.c:372
-#: ../userdrake_.c:750 ../userdrake_.c:861
+#: ../userdrake_.c:286 ../userdrake_.c:318 ../userdrake_.c:375
+#: ../userdrake_.c:753 ../userdrake_.c:885
 msgid "Ok"
-msgstr "ȷ��"
+msgstr "确定"
 
-#: ../userdrake_.c:294
+#: ../userdrake_.c:297
 msgid "UID: "
-msgstr ""
+msgstr "UID："
 
-#: ../userdrake_.c:306
+#: ../userdrake_.c:309
 msgid "Choose Group"
-msgstr ""
+msgstr "选择组"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:311
 msgid "Add to the 'users' group"
-msgstr ""
+msgstr "添加到这个用户的组"
 
-#: ../userdrake_.c:308
+#: ../userdrake_.c:311
 msgid "Add to the existing group"
-msgstr ""
+msgstr "添加到已经存在的组"
 
-#: ../userdrake_.c:311
+#: ../userdrake_.c:314
 msgid "A group with this name already exists.  What would you like to do?"
-msgstr ""
+msgstr "一个有该名字的组已经存在。你想要怎么做？"
 
-#: ../userdrake_.c:332
+#: ../userdrake_.c:335
 msgid "Yes"
-msgstr ""
+msgstr "是"
 
-#: ../userdrake_.c:336
+#: ../userdrake_.c:339
 msgid "No"
-msgstr ""
+msgstr "否"
 
-#: ../userdrake_.c:347
+#: ../userdrake_.c:350
 msgid "Specify group ID manually"
-msgstr ""
+msgstr "手工指定组 ID"
 
-#: ../userdrake_.c:358
+#: ../userdrake_.c:361
 msgid "Group already exists, please choose another Group Name"
-msgstr ""
+msgstr "组已经存在，请使用其他组名"
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:365
 msgid " Group Gid is < 500"
-msgstr ""
+msgstr "组的 GID 小于 500"
 
-#: ../userdrake_.c:362
+#: ../userdrake_.c:365
 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:377
+#: ../userdrake_.c:380
 msgid "GID: "
-msgstr ""
+msgstr "GID："
 
-#: ../userdrake_.c:428
-#, fuzzy
+#: ../userdrake_.c:431
 msgid " Remove Home Directory"
-msgstr "�û���Ŀ¼"
+msgstr "删除用户主目录"
 
-#: ../userdrake_.c:428
+#: ../userdrake_.c:431
 msgid "Do you want to delete the user's home directory and mail spool?"
-msgstr ""
+msgstr "你想要删除这个用户的用户主目录和邮件缓冲吗？"
 
-#: ../userdrake_.c:438
+#: ../userdrake_.c:441
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
 msgstr ""
+"%s 是用户 %s 的私有组\n"
+"先删除这个用户"
 
-#: ../userdrake_.c:488
+#: ../userdrake_.c:491
 msgid "Login"
-msgstr "��¼��"
+msgstr "登录名"
 
-#: ../userdrake_.c:490
+#: ../userdrake_.c:493
 msgid "Password"
-msgstr "����"
+msgstr "密码"
 
-#: ../userdrake_.c:491
-#, fuzzy
+#: ../userdrake_.c:494
 msgid "Confirm Password:"
-msgstr "����"
+msgstr "确认密码："
 
-#: ../userdrake_.c:526
+#: ../userdrake_.c:529
 msgid "Home"
-msgstr "��Ŀ¼"
+msgstr "主目录"
 
-#: ../userdrake_.c:528
-#, fuzzy
+#: ../userdrake_.c:531
 msgid "User Data"
-msgstr "�û��б�"
+msgstr "用户数据"
 
-#: ../userdrake_.c:532
+#: ../userdrake_.c:535
 msgid "Enable account expiration"
-msgstr ""
+msgstr "启用账号期限"
 
-#: ../userdrake_.c:534
+#: ../userdrake_.c:537
 msgid "Account expires   MM/DD/YYYY :"
-msgstr ""
+msgstr "账号期限到 MM/DD/YYYY ："
 
-#: ../userdrake_.c:540
+#: ../userdrake_.c:543
 msgid "Lock User Account"
-msgstr ""
+msgstr "锁定用户账号"
 
-#: ../userdrake_.c:541
+#: ../userdrake_.c:544
 msgid "Account Info"
-msgstr ""
+msgstr "账号信息"
 
-#: ../userdrake_.c:546
-#, fuzzy
+#: ../userdrake_.c:549
 msgid "User last changed password on : "
-msgstr "�����޸Ŀ���"
+msgstr "用户最后一次修改密码在："
 
-#: ../userdrake_.c:550
+#: ../userdrake_.c:553
 msgid "Enable Password Expiration"
-msgstr ""
+msgstr "启用密码期限"
 
-#: ../userdrake_.c:553
+#: ../userdrake_.c:556
 msgid "Days before change allowed :"
-msgstr ""
+msgstr "修改前，允许的日期："
 
-#: ../userdrake_.c:554
+#: ../userdrake_.c:557
 msgid "Days before change required :"
-msgstr ""
+msgstr "修改前，必须的日期："
 
-#: ../userdrake_.c:555
+#: ../userdrake_.c:558
 msgid "Days warning before change :"
-msgstr ""
+msgstr "修改前，警告的日期："
 
-#: ../userdrake_.c:556
+#: ../userdrake_.c:559
 msgid "Days before account inactive :"
-msgstr ""
+msgstr "账号不被激活以前的日期："
 
-#: ../userdrake_.c:558
-#, fuzzy
+#: ../userdrake_.c:561
 msgid "Password Info"
-msgstr "����"
+msgstr "密码信息"
 
-#: ../userdrake_.c:562
+#: ../userdrake_.c:565
 msgid "Select the groups that the user will be a member of:"
-msgstr ""
+msgstr "选择一个组，使这个用户将成为这个组的一个成员："
 
-#: ../userdrake_.c:568
+#: ../userdrake_.c:571
 msgid "Groups"
-msgstr "��"
+msgstr "组"
 
-#: ../userdrake_.c:608
-#, fuzzy
+#: ../userdrake_.c:611
 msgid "Group Data"
-msgstr "���б�"
+msgstr "组数据"
 
-#: ../userdrake_.c:611
+#: ../userdrake_.c:614
 msgid "Select the users to join this group :"
-msgstr ""
+msgstr "选择要加入这个组的用户："
 
-#: ../userdrake_.c:675
+#: ../userdrake_.c:678
 msgid "Please select at least one group for the user"
-msgstr ""
+msgstr "请为这个用户至少选择一个组"
 
-#: ../userdrake_.c:684
+#: ../userdrake_.c:687
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
 msgstr ""
+"请指定账号期限的\n"
+"年月日"
 
-#: ../userdrake_.c:691
+#: ../userdrake_.c:694
+#, fuzzy
 msgid "Please specify all field for password aging\n"
-msgstr ""
+msgstr "请指定密码时效的所有领域"
 
-#: ../userdrake_.c:733
+#: ../userdrake_.c:736
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
-msgstr ""
+msgstr "你不能从用户“%s”的私有组中删除该用户"
 
-#: ../userdrake_.c:824
-#, fuzzy
+#: ../userdrake_.c:848
 msgid "Close"
-msgstr "���"
+msgstr "关闭"
 
-#: ../userdrake_.c:830
-#, fuzzy
+#: ../userdrake_.c:854
 msgid "Userdrake"
-msgstr "Userdrake ħ���û�����Ա"
+msgstr "Drake 用户管理（Userdrake）"
 
-#: ../userdrake_.c:836
+#: ../userdrake_.c:860
 msgid "Authors: "
-msgstr ""
+msgstr "作者："
 
-#: ../userdrake_.c:842
+#: ../userdrake_.c:866
 msgid "Users Management \n"
-msgstr ""
+msgstr "用户管理\n"
 
-#: ../userdrake_.c:843
+#: ../userdrake_.c:867
 msgid "Copyright (C) 2003 Mandrakesoft SA"
-msgstr "��Ȩ (C) 2003 MandrakeSoft."
+msgstr "版权所有 (C) 2003 MandrakeSoft SA"
 
-#: ../userdrake_.c:849
+#: ../userdrake_.c:873
 msgid "Name field is empty please provide a name"
-msgstr ""
+msgstr "名字栏是空着的，请提供一个名字"
 
-#: ../userdrake_.c:850
+#: ../userdrake_.c:874
 msgid "The name must contain only lower cased letters, numbers, `-' and `_'"
-msgstr ""
+msgstr "名字只能包含字母、数字、“-”和“_”"
 
-#: ../userdrake_.c:851
+#: ../userdrake_.c:875
 msgid "Name is too long"
-msgstr ""
+msgstr "名字太长了"
 
-#: ../userdrake_.c:855
+#: ../userdrake_.c:879
 msgid "Error"
-msgstr ""
+msgstr "错误"
 
 #, fuzzy
 #~ msgid "/Options"
-#~ msgstr "�ж�"
+#~ msgstr "行动"
 
 #, fuzzy
 #~ msgid "/Actions"
-#~ msgstr "�ж�"
+#~ msgstr "行动"
 
 #, fuzzy
 #~ msgid "/Edit"
-#~ msgstr "�༭"
+#~ msgstr "编辑"
 
 #, fuzzy
 #~ msgid "/Delete"
-#~ msgstr "ɾ��"
+#~ msgstr "删除"
 
 #~ msgid "Reload"
-#~ msgstr "��������"
+#~ msgstr "重新载入"
 
 #~ msgid "Save"
-#~ msgstr "����"
+#~ msgstr "保存"
 
 #~ msgid "Exit"
-#~ msgstr "�˳�"
+#~ msgstr "退出"
 
 #~ msgid "Settings"
-#~ msgstr "�趨"
+#~ msgstr "设定"
 
 #~ msgid "Show tools bar"
-#~ msgstr "��ʾ������"
+#~ msgstr "显示工具条"
 
 #~ msgid "View users"
-#~ msgstr "�鿴�û�"
+#~ msgstr "查看用户"
 
 #~ msgid "View groups"
-#~ msgstr "�鿴��"
+#~ msgstr "查看组"
 
 #~ msgid "Preferences"
-#~ msgstr "ƫ��"
+#~ msgstr "偏好"
 
 #~ msgid "Ldap Server"
-#~ msgstr "LDAP ������"
+#~ msgstr "LDAP 服务器"
 
 #~ msgid "Save change"
-#~ msgstr "�����޸�"
+#~ msgstr "保存修改"
 
 #~ msgid "Add"
-#~ msgstr "����"
+#~ msgstr "添加"
 
 #~ msgid "Add a user"
-#~ msgstr "����һ���û�"
+#~ msgstr "添加一个用户"
 
 #~ msgid "Edit user(s)"
-#~ msgstr "�༭�û�"
+#~ msgstr "编辑用户"
 
 #~ msgid "Remove"
-#~ msgstr "ɾ��"
+#~ msgstr "删除"
 
 #~ msgid "Remove user(s)"
-#~ msgstr "ɾ���û�"
+#~ msgstr "删除用户"
 
 #~ msgid "Edit group(s)"
-#~ msgstr "�༭��"
+#~ msgstr "编辑组"
 
 #~ msgid "Remove group(s)"
-#~ msgstr "ɾ����"
+#~ msgstr "删除组"
 
 #~ msgid "User id"
-#~ msgstr "�û�ID"
+#~ msgstr "用户ID"
 
 #~ msgid "Group id"
-#~ msgstr "��ID"
+#~ msgstr "组ID"
 
 #~ msgid "Comments"
-#~ msgstr "ע��"
+#~ msgstr "注释"
 
 #~ msgid "Shell"
-#~ msgstr "��dz���"
+#~ msgstr "外壳程序"
 
 #~ msgid "name"
-#~ msgstr "����"
+#~ msgstr "名称"
 
 #~ msgid "gid"
-#~ msgstr "��ID"
+#~ msgstr "组ID"
 
 #~ msgid "passwd"
-#~ msgstr "����"
+#~ msgstr "口令"
 
 #~ msgid "users"
-#~ msgstr "�û�"
+#~ msgstr "用户"
 
 #~ msgid "Parameters"
-#~ msgstr "����"
+#~ msgstr "参数"
 
 #~ msgid "General option"
-#~ msgstr "����ѡ��"
+#~ msgstr "常规选项"
 
 #~ msgid "Edit accounts on a LDAP directory"
-#~ msgstr "�޸� LDAP Ŀ¼�е��ʻ�"
+#~ msgstr "修改 LDAP 目录中的帐户"
 
 #~ msgid "Active autologin support"
-#~ msgstr "�Զ���¼֧����Ч"
+#~ msgstr "自动登录支持有效"
 
 #~ msgid "User creation"
-#~ msgstr "�����û�"
+#~ msgstr "创建用户"
 
 #~ msgid "Default shell:"
-#~ msgstr "ȱʡ����dz���:"
+#~ msgstr "缺省的外壳程序:"
 
 #~ msgid "Default home dir:"
-#~ msgstr "ȱʡ����Ŀ¼:"
+#~ msgstr "缺省的主目录:"
 
 #~ msgid "Default face:"
-#~ msgstr "ȱʡ������:"
+#~ msgstr "缺省的面容:"
 
 #~ msgid "Default group:"
-#~ msgstr "ȱʡ����:"
+#~ msgstr "缺省的组:"
 
 #~ msgid "General"
-#~ msgstr "��ͨ"
+#~ msgstr "普通"
 
 #~ msgid "Don't show user with id less than 500"
-#~ msgstr "����ʾIDС��500 ���û�"
+#~ msgstr "不显示ID小于500 的用户"
 
 #~ msgid "User identifier"
-#~ msgstr "�û�ID"
+#~ msgstr "用户ID"
 
 #~ msgid "Default Group"
-#~ msgstr "ȱʡ����"
+#~ msgstr "缺省的组"
 
 #~ msgid "Groups list"
-#~ msgstr "���б�"
+#~ msgstr "组列表"
 
 #~ msgid "Users View"
-#~ msgstr "�û���ͼ"
+#~ msgstr "用户视图"
 
 #~ msgid "Group identifier"
-#~ msgstr "��ID"
+#~ msgstr "组ID"
 
 #~ msgid "Groups View"
-#~ msgstr "����ͼ"
+#~ msgstr "组视图"
 
 #~ msgid "/bin/bash"
 #~ msgstr "/bin/bash"
 
 #~ msgid "Login:"
-#~ msgstr "��¼��:"
+#~ msgstr "登录名:"
 
 #~ msgid "uid:"
 #~ msgstr "UID:"
 
 #~ msgid "Comment:"
-#~ msgstr "ע��:"
+#~ msgstr "注释:"
 
 #~ msgid "Shell:"
-#~ msgstr "��dz���:"
+#~ msgstr "外壳程序:"
 
 #~ msgid "Home dir:"
-#~ msgstr "��Ŀ¼:"
+#~ msgstr "主目录:"
 
 #~ msgid "passwd:"
-#~ msgstr "����:"
+#~ msgstr "口令:"
 
 #~ msgid "Retype passwd:"
-#~ msgstr "�ٴ��������:"
+#~ msgstr "再次输入口令:"
 
 #~ msgid "Identity"
-#~ msgstr "����"
+#~ msgstr "身份"
 
 #~ msgid "In groups"
-#~ msgstr "��������"
+#~ msgstr "在这些组中"
 
 #~ msgid "Available groups"
-#~ msgstr "���õ���"
+#~ msgstr "可用的组"
 
 #~ msgid "Extended"
-#~ msgstr "��չ"
+#~ msgstr "扩展"
 
 #~ msgid "About UserDrake"
-#~ msgstr "���� UserDrake ħ���û�����Ա"
+#~ msgstr "关于 UserDrake 魔力用户管理员"
 
 #~ msgid ""
 #~ "Userdrake is an application to add and\n"
@@ -671,33 +651,33 @@ msgstr ""
 #~ "You can get support at : \n"
 #~ "http://www.mandrakeexpert.com/"
 #~ msgstr ""
-#~ "Userdrake ħ���û�����Ա�� Mandrake Linux ��һ���������� \n"
-#~ "��ɾ���û��Ĺ���.\n"
+#~ "Userdrake 魔力用户管理员是 Mandrake Linux 中一个用来添加 \n"
+#~ "和删除用户的工具.\n"
 #~ "\n"
-#~ "Userdrake ����֧�� ldap Ŀ¼\n"
-#~ "����, ���� rfc2307bis �ı�׼.\n"
+#~ "Userdrake 现在支持 ldap 目录\n"
+#~ "服务, 符合 rfc2307bis 的标准.\n"
 #~ "\n"
-#~ "��������� GPL �����·���.\n"
-#~ "����û���κε���.\n"
+#~ "这个程序在 GPL 条款下发布.\n"
+#~ "并且没有任何担保.\n"
 #~ "\n"
-#~ "�����Ҫ����֧��, �뵽\n"
+#~ "如果需要技术支持, 请到\n"
 #~ "http://www.mandrakeexpert.com/\n"
-#~ "Danny Zeng<danny@zeng.com.cn> Ϊ���������Ľ���"
+#~ "Danny Zeng<danny@zeng.com.cn> 为您翻译中文界面"
 
 #~ msgid "Name:"
-#~ msgstr "����:"
+#~ msgstr "名称:"
 
 #~ msgid "gid:"
 #~ msgstr "GID:"
 
 #~ msgid "In group"
-#~ msgstr "��������"
+#~ msgstr "包含于组"
 
 #~ msgid "Not in group"
-#~ msgstr "����������"
+#~ msgstr "不包含于组"
 
 #~ msgid "Quit userdrake?"
-#~ msgstr "�˳�userdrake?"
+#~ msgstr "退出userdrake?"
 
 #~ msgid ""
 #~ "You have made changes\n"
@@ -705,152 +685,152 @@ msgstr ""
 #~ "Do you really want to quit\n"
 #~ "userdrake?"
 #~ msgstr ""
-#~ "�������һ�α����Ժ��������޸�\n"
-#~ "��ȷʵҪ�˳�\n"
+#~ "您在最后一次保存以后又做了修改\n"
+#~ "您确实要退出\n"
 #~ "userdrake?"
 
 #~ msgid "Enter new passwd"
-#~ msgstr "�����µĿ���"
+#~ msgstr "输入新的口令"
 
 #~ msgid "new passwd:"
-#~ msgstr "�¿���:"
+#~ msgstr "新口令:"
 
 #~ msgid "Change"
-#~ msgstr "�ı�"
+#~ msgstr "改变"
 
 #~ msgid "Change face"
-#~ msgstr "�ı�����"
+#~ msgstr "改变脸谱"
 
 #~ msgid "Set passwd"
-#~ msgstr "�趨����"
+#~ msgstr "设定口令"
 
 #~ msgid "User autologin"
-#~ msgstr "�û��Զ���¼"
+#~ msgstr "用户自动登录"
 
 #~ msgid "UserDrake - Error"
-#~ msgstr "UserDrake ħ���û�����Ա - ����"
+#~ msgstr "UserDrake 魔力用户管理员 - 错误"
 
 #~ msgid "couldn't find blue color in /usr/lib/X11/rgb.txt file"
-#~ msgstr "��/usr/lib/X11/rgb.txt  ��û��blue ��ɫ"
+#~ msgstr "在/usr/lib/X11/rgb.txt  中没有blue 颜色"
 
 #~ msgid "Select the image to use"
-#~ msgstr "ѡ��Ҫʹ�õľ���"
+#~ msgstr "选择要使用的镜像"
 
 #~ msgid "Custom..."
-#~ msgstr "����..."
+#~ msgstr "定制..."
 
 #~ msgid "couldn't find grey color in /usr/lib/X11/rgb.txt file"
-#~ msgstr "��/usr/lib/X11/rgb.txt  ��û��grey ��ɫ"
+#~ msgstr "在/usr/lib/X11/rgb.txt  中没有grey 颜色"
 
 #~ msgid "couldn't find black color in /usr/lib/X11/rgb.txt file"
-#~ msgstr "��/usr/lib/X11/rgb.txt  ��û��black ��ɫ"
+#~ msgstr "在/usr/lib/X11/rgb.txt  中没有black 颜色"
 
 #~ msgid "login empty"
-#~ msgstr "��¼���ǿյ�"
+#~ msgstr "登录名是空的"
 
 #~ msgid "This login already exists on the system"
-#~ msgstr "�����¼���Ѿ���������"
+#~ msgstr "这个登录名已经有人用了"
 
 #~ msgid "The login is similar to a name's group"
-#~ msgstr "�����¼����һ��������̫����"
+#~ msgstr "这个登录名与一个组名称太相似"
 
 #~ msgid ""
 #~ "%s\n"
 #~ "User id already in use"
 #~ msgstr ""
 #~ "%s\n"
-#~ "�û�ID �Ѿ���ռ��"
+#~ "用户ID 已经被占用"
 
 #~ msgid "User id already in use"
-#~ msgstr "�û�ID �Ѿ���ռ��"
+#~ msgstr "用户ID 已经被占用"
 
 #~ msgid "name empty"
-#~ msgstr "���ƿ�ȱ"
+#~ msgstr "名称开缺"
 
 #~ msgid ""
 #~ "%s\n"
 #~ "Group id already in use"
 #~ msgstr ""
 #~ "%s\n"
-#~ "��ID �Ѿ���ռ��"
+#~ "组ID 已经被占用"
 
 #~ msgid "Group id already in use"
-#~ msgstr "��ID �Ѿ���ռ��"
+#~ msgstr "组ID 已经被占用"
 
 #~ msgid "Couldn't find pixmap file: %s"
-#~ msgstr "�޷��ҵ�λͼ�ļ�: %s"
+#~ msgstr "无法找到位图文件: %s"
 
 #~ msgid "Error loading pixmap file: %s"
-#~ msgstr "����λͼ�ļ�: %s ����"
+#~ msgstr "载入位图文件: %s 出错"
 
 #~ msgid "%s: the file %s is busy (%s present)\n"
-#~ msgstr "%s: �ļ� %s ��ʹ���� (%s ����)\n"
+#~ msgstr "%s: 文件 %s 在使用中 (%s 存在)\n"
 
 #~ msgid "%s: can't link %s: %s\n"
-#~ msgstr "%s: ���� link %s: %s\n"
+#~ msgstr "%s: 不能 link %s: %s\n"
 
 #~ msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
-#~ msgstr "%s: ���ܽ��� %s: %s (�����޸ı����� %s)\n"
+#~ msgstr "%s: 不能解锁 %s: %s (您的修改保存于 %s)\n"
 
 #~ msgid "Error in stat on tmp files when i try to unlock lib\n"
 #~ msgstr "Error in stat on tmp files when i try to unlock lib\n"
 
 #~ msgid "%s: no changes made\n"
-#~ msgstr "%s: δ���ı�\n"
+#~ msgstr "%s: 未做改变\n"
 
 #~ msgid "Select LDAP Directory"
-#~ msgstr "ѡ�� LDAP Ŀ¼"
+#~ msgstr "选择 LDAP 目录"
 
 #~ msgid "Server address:"
-#~ msgstr "��������ַ:"
+#~ msgstr "服务器地址:"
 
 #~ msgid "Search base:"
-#~ msgstr "����������:"
+#~ msgstr "搜索出发点:"
 
 #~ msgid "Bind DN:"
-#~ msgstr "�� DN:"
+#~ msgstr "绑定 DN:"
 
 #~ msgid "Connection Type :"
-#~ msgstr "�������� :"
+#~ msgstr "连接类型 :"
 
 #~ msgid "ssl"
 #~ msgstr "ssl"
 
 #~ msgid "Validate"
-#~ msgstr "��֤"
+#~ msgstr "验证"
 
 #~ msgid "Test"
-#~ msgstr "����"
+#~ msgstr "测试"
 
 #~ msgid "cannot change ldap version to 3: %s"
-#~ msgstr "�޷��� LDAP �汾��Ϊ 3: %s"
+#~ msgstr "无法把 LDAP 版本改为 3: %s"
 
 #~ msgid "cannot connect to the ldap server\n"
-#~ msgstr "�޷����ӵ� LDAP ������\n"
+#~ msgstr "无法连接到 LDAP 服务器\n"
 
 #~ msgid "cannot bind to the ldap server, %d\n"
-#~ msgstr "�޷��� LDAP ������, %d\n"
+#~ msgstr "无法绑定 LDAP 服务器, %d\n"
 
 #~ msgid "Cannot bind to ldap server"
-#~ msgstr "�޷��� LDAP ������"
+#~ msgstr "无法绑定 LDAP 服务器"
 
 #~ msgid "cannot save because the cannot connect to the ldap server"
-#~ msgstr "�޷�����, ��Ϊ�޷��� LDAP ������"
+#~ msgstr "无法保存, 因为无法绑定 LDAP 服务器"
 
 #~ msgid "cannot relock lib"
-#~ msgstr "�޷�����������"
+#~ msgstr "无法重新锁定库"
 
 #~ msgid "The passwords string aren't the same!"
-#~ msgstr "��������Ŀ��ͬ!"
+#~ msgstr "两次输入的口令不同!"
 
 #~ msgid "cannot launch UserDrake"
-#~ msgstr "�������� UserDrake"
+#~ msgstr "不能启动 UserDrake"
 
 #~ msgid "You must be root to use userdrake"
-#~ msgstr "��������Ϊroot ʹ��ħ���û�����Ա"
+#~ msgstr "您必须作为root 使用魔力用户管理员"
 
 #~ msgid "What do you want to show in user list?"
-#~ msgstr "��ϣ�����û��б��п���ʲô?"
+#~ msgstr "您希望在用户列表中看到什么?"
 
 #~ msgid "What do you want to show in group list?"
-#~ msgstr "��ϣ�������б��п���ʲô?"
+#~ msgstr "您希望在组列表中看到什么?"