Removed spaces before colons;

included colons in translatable strings (yes, they are language-dependent,
even if most of them just us ":", some use different things);
Added Punjabi file

1 files changed, 109 insertions, 94 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index ab365a7..8e6a07b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-09 13:30+0100\n"
+"POT-Creation-Date: 2005-03-29 22:15+0200\n"
 "PO-Revision-Date: 2004-01-17 18:50+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Chinese <zh@li.org>\n"
@@ -34,19 +34,19 @@ msgstr "创建“%s”出错：%s"
 msgid "Error removing `%s': %s"
 msgstr "删除“%s”出错：%s"
 
-#: ../USER/USER.xs:531
+#: ../USER/USER.xs:530
 msgid "Error creating mail spool.\n"
 msgstr "创建邮件持出错。\n"
 
-#: ../USER/USER.xs:617
+#: ../USER/USER.xs:616
 msgid "unknown error"
 msgstr "未知错误"
 
-#: ../USER/USER.xs:880
+#: ../USER/USER.xs:879
 msgid "Error deleting mail spool.\n"
 msgstr "删除邮件池出错。\n"
 
-#: ../userdrake:55 ../userdrake:1010
+#: ../userdrake:55 ../userdrake:1019
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
@@ -147,7 +147,7 @@ msgstr "应用过滤器"
 msgid "Users"
 msgstr "用户"
 
-#: ../userdrake:133 ../userdrake:733
+#: ../userdrake:133 ../userdrake:742
 #, c-format
 msgid "Groups"
 msgstr "组"
@@ -162,17 +162,17 @@ msgstr "用户名"
 msgid "User ID"
 msgstr "用户 ID"
 
-#: ../userdrake:154 ../userdrake:730
+#: ../userdrake:154 ../userdrake:739
 #, c-format
 msgid "Primary Group"
 msgstr "主要的组"
 
-#: ../userdrake:154 ../userdrake:640
+#: ../userdrake:154
 #, c-format
 msgid "Full Name"
 msgstr "全名"
 
-#: ../userdrake:154 ../userdrake:644
+#: ../userdrake:154
 #, c-format
 msgid "Login Shell"
 msgstr "登录 Shell"
@@ -187,7 +187,7 @@ msgstr "主目录"
 msgid "Status"
 msgstr "状态"
 
-#: ../userdrake:161 ../userdrake:655
+#: ../userdrake:161
 #, c-format
 msgid "Group Name"
 msgstr "组名"
@@ -222,7 +222,7 @@ msgstr "添加组"
 msgid "Add a group to the system"
 msgstr "向系统中添加一个组"
 
-#: ../userdrake:165 ../userdrake:593
+#: ../userdrake:165 ../userdrake:602
 #, c-format
 msgid "Edit"
 msgstr "编辑"
@@ -232,7 +232,7 @@ msgstr "编辑"
 msgid "Edit selected row"
 msgstr "编辑所选的行"
 
-#: ../userdrake:166 ../userdrake:544 ../userdrake:575 ../userdrake:593
+#: ../userdrake:166 ../userdrake:552 ../userdrake:584 ../userdrake:602
 #, c-format
 msgid "Delete"
 msgstr "删除"
@@ -267,42 +267,42 @@ msgstr "已到期"
 msgid "Click on the icon to change it"
 msgstr "单击图标进行更改"
 
-#: ../userdrake:299
+#: ../userdrake:300
 #, c-format
 msgid "Create New User"
 msgstr "创建新用户"
 
-#: ../userdrake:306
+#: ../userdrake:307
 #, c-format
 msgid "Create Home Directory"
 msgstr "创建主目录"
 
-#: ../userdrake:308
+#: ../userdrake:309
 #, c-format
 msgid "Home Directory: "
 msgstr "用户主目录: "
 
-#: ../userdrake:311
+#: ../userdrake:312
 #, c-format
 msgid "Create a private group for the user"
 msgstr "为该用户创建一个私有组"
 
-#: ../userdrake:312
+#: ../userdrake:313
 #, c-format
 msgid "Specify user ID manually"
 msgstr "手动指定用户 ID"
 
-#: ../userdrake:326
+#: ../userdrake:327
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "用户已经存在，请选择其他用户名"
 
-#: ../userdrake:328 ../userdrake:808
+#: ../userdrake:329 ../userdrake:817
 #, c-format
 msgid "Password Mismatch"
 msgstr "密码不匹配"
 
-#: ../userdrake:329 ../userdrake:810
+#: ../userdrake:330 ../userdrake:819
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -311,12 +311,12 @@ msgstr ""
 "这个密码太简单了。\n"
 "好的密码应该大于 6 个字符"
 
-#: ../userdrake:340
+#: ../userdrake:341
 #, c-format
 msgid "User Uid is < 500"
 msgstr "用户的 UID 小于 500"
 
-#: ../userdrake:340
+#: ../userdrake:341
 #, c-format
 msgid ""
 "Creating a user with a UID less than 500 is not recommended.\n"
@@ -327,79 +327,79 @@ msgstr ""
 "您确定您要这么做吗?\n"
 "\n"
 
-#: ../userdrake:355
+#: ../userdrake:356
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "将 %s 添加到“users”组"
 
-#: ../userdrake:361
+#: ../userdrake:362
 #, c-format
 msgid "Creating new group: %s"
 msgstr "创建新组: %s"
 
-#: ../userdrake:370
+#: ../userdrake:371
 #, c-format
 msgid "Adding user: %s"
 msgstr "添加用户: %s"
 
-#: ../userdrake:382 ../userdrake:421 ../userdrake:465 ../userdrake:544
-#: ../userdrake:575 ../userdrake:912
+#: ../userdrake:383 ../userdrake:422 ../userdrake:466 ../userdrake:552
+#: ../userdrake:584 ../userdrake:921
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../userdrake:382 ../userdrake:416 ../userdrake:465 ../userdrake:912
-#: ../userdrake:1046
+#: ../userdrake:383 ../userdrake:417 ../userdrake:466 ../userdrake:921
+#: ../userdrake:1055
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: ../userdrake:395
+#: ../userdrake:396
 #, c-format
 msgid "UID: "
 msgstr "UID: "
 
-#: ../userdrake:407
+#: ../userdrake:408
 #, c-format
 msgid "Choose group"
 msgstr "选择组"
 
-#: ../userdrake:409
+#: ../userdrake:410
 #, c-format
 msgid "Add to the existing group"
 msgstr "添加到已有组"
 
-#: ../userdrake:409
+#: ../userdrake:410
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "添加到“users”组"
 
-#: ../userdrake:412
+#: ../userdrake:413
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "已经存在同名组。您想要怎么做？"
 
-#: ../userdrake:433
+#: ../userdrake:434
 #, c-format
 msgid "Create New Group"
 msgstr "创建新组"
 
-#: ../userdrake:439
+#: ../userdrake:440
 #, c-format
 msgid "Specify group ID manually"
 msgstr "手动指定组 ID"
 
-#: ../userdrake:450
+#: ../userdrake:451
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "组已经存在，请使用其他组名"
 
-#: ../userdrake:454
+#: ../userdrake:455
 #, c-format
 msgid " Group Gid is < 500"
 msgstr "组的 GID 小于 500"
 
-#: ../userdrake:454
+#: ../userdrake:455
 #, c-format
 msgid ""
 "Creating a group with a GID less than 500 is not recommended.\n"
@@ -410,22 +410,22 @@ msgstr ""
 "您确定您要这么做吗？\n"
 "\n"
 
-#: ../userdrake:459
+#: ../userdrake:460
 #, c-format
 msgid "Adding group: %s "
 msgstr "添加组: %s"
 
-#: ../userdrake:470
+#: ../userdrake:471
 #, c-format
 msgid "GID: "
 msgstr "GID: "
 
-#: ../userdrake:515 ../userdrake:551
+#: ../userdrake:516 ../userdrake:560
 #, c-format
 msgid "Delete files or not?"
 msgstr "删除文件吗？"
 
-#: ../userdrake:518
+#: ../userdrake:520
 #, c-format
 msgid ""
 "Deleting user %s\n"
@@ -434,27 +434,27 @@ msgstr ""
 "删除用户 %s\n"
 " 同时执行下列操作\n"
 
-#: ../userdrake:519
+#: ../userdrake:521
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "删除主目录: %s"
 
-#: ../userdrake:520
+#: ../userdrake:522
 #, c-format
-msgid "Delete Mailbox :/var/spool/mail/%s"
+msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "删除邮箱: /var/spool/mail/%s"
 
-#: ../userdrake:527
+#: ../userdrake:529
 #, c-format
 msgid "Removing user: %s"
 msgstr "删除用户: %s"
 
-#: ../userdrake:554
+#: ../userdrake:563
 #, c-format
 msgid "Do you really want to delete the group %s\n"
 msgstr "您真的想要删除组 %s 吗?\n"
 
-#: ../userdrake:566
+#: ../userdrake:575
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
@@ -463,122 +463,137 @@ msgstr ""
 "%s 是用户 %s 的主要组\n"
 "请先删除这个用户"
 
-#: ../userdrake:571
+#: ../userdrake:580
 #, c-format
 msgid "Removing group: %s"
 msgstr "删除组: %s"
 
-#: ../userdrake:641
+#: ../userdrake:649
+#, c-format
+msgid "Full Name:"
+msgstr "全名:"
+
+#: ../userdrake:650
 #, c-format
-msgid "Login"
-msgstr "登录名"
+msgid "Login:"
+msgstr "登录名:"
 
-#: ../userdrake:642
+#: ../userdrake:651
 #, c-format
-msgid "Password"
-msgstr "密码"
+msgid "Password:"
+msgstr "密码:"
 
-#: ../userdrake:643
+#: ../userdrake:652
 #, c-format
 msgid "Confirm Password:"
 msgstr "确认密码:"
 
-#: ../userdrake:670
+#: ../userdrake:653
+#, c-format
+msgid "Login Shell:"
+msgstr "登录 Shell:"
+
+#: ../userdrake:664
+#, c-format
+msgid "Group Name:"
+msgstr "组名:"
+
+#: ../userdrake:679
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "编辑组/用户"
 
-#: ../userdrake:690
+#: ../userdrake:699
 #, c-format
-msgid "Home"
-msgstr "主目录"
+msgid "Home:"
+msgstr "主目录:"
 
-#: ../userdrake:692
+#: ../userdrake:701
 #, c-format
 msgid "User Data"
 msgstr "用户数据"
 
-#: ../userdrake:695
+#: ../userdrake:704
 #, c-format
 msgid "Enable account expiration"
 msgstr "启用账户过期"
 
-#: ../userdrake:697
+#: ../userdrake:706
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "账户过期到 (YYYY-MM-DD):"
 
-#: ../userdrake:703
+#: ../userdrake:712
 #, c-format
 msgid "Lock User Account"
 msgstr "锁定用户账户"
 
-#: ../userdrake:706
+#: ../userdrake:715
 #, c-format
 msgid "Account Info"
 msgstr "账户信息"
 
-#: ../userdrake:711
+#: ../userdrake:720
 #, c-format
-msgid "User last changed password on : "
+msgid "User last changed password on: "
 msgstr "用户最后一次修改密码的时间: "
 
-#: ../userdrake:715
+#: ../userdrake:724
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "启用密码过期"
 
-#: ../userdrake:718
+#: ../userdrake:727
 #, c-format
-msgid "Days before change allowed :"
+msgid "Days before change allowed:"
 msgstr "允许修改前的天数:"
 
-#: ../userdrake:719
+#: ../userdrake:728
 #, c-format
-msgid "Days before change required :"
+msgid "Days before change required:"
 msgstr "必须修改前的天数:"
 
-#: ../userdrake:720
+#: ../userdrake:729
 #, c-format
-msgid "Days warning before change :"
+msgid "Days warning before change:"
 msgstr "更改前警告的天数:"
 
-#: ../userdrake:721
+#: ../userdrake:730
 #, c-format
-msgid "Days before account inactive :"
+msgid "Days before account inactive:"
 msgstr "账户不被激活前的天数:"
 
-#: ../userdrake:723
+#: ../userdrake:732
 #, c-format
 msgid "Password Info"
 msgstr "密码信息"
 
-#: ../userdrake:727
+#: ../userdrake:736
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "选择该用户将属于哪些组:"
 
-#: ../userdrake:772
+#: ../userdrake:781
 #, c-format
 msgid "Group Data"
 msgstr "组数据"
 
-#: ../userdrake:775
+#: ../userdrake:784
 #, c-format
-msgid "Select the users to join this group :"
+msgid "Select the users to join this group:"
 msgstr "选择要加入这个组的用户:"
 
-#: ../userdrake:776
+#: ../userdrake:785
 #, c-format
 msgid "Group Users"
 msgstr "组用户"
 
-#: ../userdrake:838
+#: ../userdrake:847
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "请为这个用户至少选择一个组"
 
-#: ../userdrake:847
+#: ../userdrake:856
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -587,48 +602,48 @@ msgstr ""
 "请指定账户过期的\n"
 "年月日"
 
-#: ../userdrake:853
+#: ../userdrake:862
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "请填满密码时效的所有域\n"
 
-#: ../userdrake:896
+#: ../userdrake:905
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "您不能从用户“%s”的主要组中删除该用户"
 
-#: ../userdrake:1003
+#: ../userdrake:1012
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: ../userdrake:1016
+#: ../userdrake:1025
 #, c-format
 msgid "Authors: "
 msgstr "作者: "
 
-#: ../userdrake:1022
+#: ../userdrake:1031
 #, c-format
 msgid "Users Management \n"
 msgstr "用户管理\n"
 
-#: ../userdrake:1028
+#: ../userdrake:1037
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "名字栏是空的，请提供一个名字"
 
-#: ../userdrake:1029
+#: ../userdrake:1038
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "名字只能小写的拉丁字母、数字、“-”和“_”"
 
-#: ../userdrake:1030
+#: ../userdrake:1039
 #, c-format
 msgid "Name is too long"
 msgstr "名字太长了"
 
-#: ../userdrake:1040
+#: ../userdrake:1049
 #, c-format
 msgid "Error"
 msgstr "错误"