updated pot file

58 files changed, 10082 insertions, 5224 deletions

diff --git a/po/ar.po b/po/ar.po
index 25dee442..6c90b887 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-08-09 11:45+0200\n"
 "Last-Translator: Youcef Rabah Rahal <rahal@arabeyes.org>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -47,7 +47,7 @@ msgstr "خطأ."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -131,12 +131,13 @@ msgstr "تحذيرأنت في DHCP, الخادم قد لا يعمل بهذه ا�
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "خطأ"
 
@@ -529,7 +530,7 @@ msgid "Domainname:"
 msgstr "إسم المجال:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "قام المعالج بإضافة مضيف في الـDNS الخاصّ بك بنجاح."
 
 #: ../dns_wizard/Bind.pm:256
@@ -903,7 +904,7 @@ msgstr "أدخل كلمة المرور لحساب مدير خادم كولاب."
 msgid "Password mismatch, or null password, please correct."
 msgstr "كلمات المرور غير متطابفة، أو كلمة مرور فارغة، صحّح من فضلك."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "كلمة المرور:"
 
@@ -943,194 +944,239 @@ msgstr "يجري تثبيت خادم كولاب على نظامك..."
 msgid "Configuring Kolab server on your system..."
 msgstr "يجري إعداد خادم كولاب على نظامك..."
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "جاري تهيئة خادم DHCP"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "معالج Ldap"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "جاري تهيئة خادم DHCP"
+msgid "Show Ldap configuration"
+msgstr "معالج إعداد LDAP"
 
-#: ../ldap_wizard/Ldap.pm:81
+#: ../ldap_wizard/Ldap.pm:86
 #, fuzzy
-msgid "Add user in OpenLDAP server"
+msgid "Add user in Ldap server"
 msgstr "أضف - أضف مستخدما في خادم LDAP"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "معالج إعداد LDAP"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "أعدّ خادما لـLDAP."
+msgid "Ldap configuration wizard"
+msgstr "معالج إعداد LDAP"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "أعدّ خادما لـLDAP."
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "خيارك:"
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "احذف مضيف فى من اعدادات DNS "
+msgid "Delete configuration"
+msgstr "إعداد خادم التّثبيت"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 #, fuzzy
 msgid "LDAP Adding User"
 msgstr "أضف مستخدم LDAP"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "إضافة مستخدم في: "
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "الإسم:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 msgid "Name:"
 msgstr "الإسم:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "إسم المستخدم:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "الحاوي:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 #, fuzzy
 msgid "You must enter a valid First Name."
 msgstr "يجب عليك إدخال كلمة مرور لـLDAP."
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 #, fuzzy
 msgid "You must enter a valid Name."
 msgstr "يجب عليك إدخال كلمة مرور لـLDAP."
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 #, fuzzy
 msgid "You must enter a valid User Name."
 msgstr "يجب عليك إدخال كلمة مرور لـLDAP."
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 msgid "LDAP User Password"
 msgstr "كلمة مرور مستخدم LDAP"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "passwords must match"
 msgstr "كلمات المرور غير متطابقة"
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 msgid "Password (again):"
 msgstr "كلمة المرور (مجدّدا):"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr "يجب عليك إدخال كلمة مرور لـLDAP."
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "كلمات المرور غير متطابقة"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Adrministrator"
+msgstr "مدير LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "تجري تهيئة LDAP"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "إسم المجال:"
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP Administrator"
+msgstr "مدير LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "دليل TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "دليل TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+#, fuzzy
+msgid "LDAP Administrator:"
+msgstr "مدير LDAP:"
+
+#: ../ldap_wizard/Ldap.pm:188
 msgid "LDAP Password:"
 msgstr "كلمة مرور LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 msgid "LDAP Password (again):"
 msgstr "كلمة مرور LDAP (مجدّدا):"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
-msgstr "يجب عليك إدخال لاحقة لـLDAP."
+#: ../ldap_wizard/Ldap.pm:192
+#, fuzzy
+msgid "Administrator"
+msgstr "مدير LDAP"
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "يجب عليك إدخال كلمة مرور لـLDAP."
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr "تأكيد المستخدم الّذي سيتمّ إنشاؤه"
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 msgid "First name:"
 msgstr "الإسم:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "إسم المستخدم:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr "أنشئ في:"
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "جاري تهيئة خادم DHCP"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-#, fuzzy
-msgid "Administrator LDAP:"
-msgstr "مدير LDAP:"
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "الحاوي:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "قام المعالج بإعداد الـLDAP بنجاح."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr "تمّت إضافة المستخدم بنجاح"
 
-#: ../ldap_wizard/Ldap.pm:211
-msgid "The wizard successfully added a user in LDAP"
-msgstr "قام المعالج بإضافة مستخدم في LDAP بنجاح"
+#: ../ldap_wizard/Ldap.pm:256
+#, fuzzy
+msgid "Error when adding user in Ldap datase"
+msgstr "أضف - أضف مستخدما في خادم LDAP"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "قام المعالج بتهيئة خادم Samba بنجاح."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "فشِل"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "خطأ"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1900,7 +1946,7 @@ msgstr "أضف صورة إقلاع"
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 #, fuzzy
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "يستعمل وصف PXE لشرح قاعدة صورة الإقلاع، معناه: صورة ماندريك 10، صورة طابخ "
@@ -2038,7 +2084,7 @@ msgid ""
 msgstr "واجهة عميل الشّبكة: واجهة الشّبكة المستعملة لعملية التّثبيت."
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 "حجم ذاكرة التّوصّل العشوائي (RAM): إضبط وسيط ذاكرة التّوصّل العشوائي في قرص "
 "الإقلاع."
@@ -2667,6 +2713,44 @@ msgstr "خادم Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "يجري إعداد نظامك كخادم Apache..."
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "جاري تهيئة خادم DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "جاري تهيئة خادم DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "جاري تهيئة خادم DHCP"
+
+#, fuzzy
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "أضف - أضف مستخدما في خادم LDAP"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "معالج إعداد LDAP"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "أعدّ خادما لـLDAP."
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "أعدّ خادما لـLDAP."
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "احذف مضيف فى من اعدادات DNS "
+
+#~ msgid "You must enter a suffix for LDAP."
+#~ msgstr "يجب عليك إدخال لاحقة لـLDAP."
+
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "قام المعالج بإضافة مستخدم في LDAP بنجاح"
+
 #~ msgid "LDAP User Add"
 #~ msgstr "أضف مستخدم LDAP"
 
diff --git a/po/az.po b/po/az.po
index 192ae1f3..cb30f928 100644
--- a/po/az.po
+++ b/po/az.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-az\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-02-20 18:30+0200\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani Turkish <gnome@azitt.com>\n"
@@ -42,7 +42,7 @@ msgstr "Xəta"
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -137,12 +137,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Xəta"
 
@@ -536,7 +537,7 @@ msgstr "Domen adı:"
 
 #: ../dns_wizard/Bind.pm:246
 #, fuzzy
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Sehirbaz alıcını müvəffəqiyyətlə əlavə etdi."
 
 #: ../dns_wizard/Bind.pm:256
@@ -916,7 +917,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Şifrə:"
 
@@ -962,198 +963,240 @@ msgstr "Sisteminiz Nis Alıcısı olaraq quraşdırılır ..."
 msgid "Configuring Kolab server on your system..."
 msgstr "Sisteminiz Nis Alıcısı olaraq quraşdırılır ..."
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "DHCP Vericisi Quraşdırılır"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Ldap sehirbazı"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "DHCP Vericisi Quraşdırılır"
+msgid "Show Ldap configuration"
+msgstr "DNS quraşdırma sehirbazı"
 
-#: ../ldap_wizard/Ldap.pm:81
+#: ../ldap_wizard/Ldap.pm:86
 #, fuzzy
-msgid "Add user in OpenLDAP server"
+msgid "Add user in Ldap server"
 msgstr "LDAP vericisinə giriş əlavə et"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "DNS quraşdırma sehirbazı"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "PXE vericisini seç."
+msgid "Ldap configuration wizard"
+msgstr "DNS quraşdırma sehirbazı"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "PXE vericisini seç."
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "bu quraşdırma ilə:"
+msgid "Delete configuration"
+msgstr "Zaman verici quraşdırılması qeyd edildi"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Xəbərlər Vericisi Adı:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Ad:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Xəbərlər Vericisi Adı:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
+#: ../ldap_wizard/Ldap.pm:144
 #, fuzzy
-msgid "User Name:"
-msgstr "Xəbərlər Vericisi Adı:"
+msgid "User Login:"
+msgstr "Konteyner:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Şifrə"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Şifrə:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Şifrələr uyğun gəlmir"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Samba Quraşdırılır"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Domen adı:"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "TFTP cərgəsi: "
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "TFTP cərgəsi: "
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Şifrə:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Şifrə:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "TFTP cərgəsi: "
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Ad:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+#, fuzzy
+msgid "User Name:"
+msgstr "Xəbərlər Vericisi Adı:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "DHCP Vericisi Quraşdırılır"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Konteyner:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "Sehirbaz NFS Vericinizi müvəffəqiyyətlə quraşdırdı"
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 #, fuzzy
 msgid "Successfully added User"
 msgstr "Məlumat müvəffəqiyyətlə əlavə edildi"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:256
 #, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Sehirbaz alıcını müvəffəqiyyətlə əlavə etdi."
+msgid "Error when adding user in Ldap datase"
+msgstr "LDAP vericisinə giriş əlavə et"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Sehirbaz Samba vericinizi müvəffəqiyyətlə quraşdırdı."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Bacarılmadı"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Xəta"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1954,7 +1997,7 @@ msgstr "Açılış əksi əlavə et"
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 
@@ -2083,7 +2126,7 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2728,6 +2771,42 @@ msgstr "Apache vericisi"
 msgid "Configuring your system as Apache server ..."
 msgstr "Sisteminiz Nis+Autofs(nfs) vericisi olaraq quraşdırılır ..."
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "DHCP Vericisi Quraşdırılır"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "DHCP Vericisi Quraşdırılır"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "DHCP Vericisi Quraşdırılır"
+
+#, fuzzy
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "LDAP vericisinə giriş əlavə et"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "DNS quraşdırma sehirbazı"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "PXE vericisini seç."
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "PXE vericisini seç."
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "bu quraşdırma ilə:"
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Sehirbaz alıcını müvəffəqiyyətlə əlavə etdi."
+
 #~ msgid "Apache web server"
 #~ msgstr "Apache veb vericisi"
 
diff --git a/po/bg.po b/po/bg.po
index 548fc69c..ebb6de91 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2003-08-29 00:54+0300\n"
 "Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -42,7 +42,7 @@ msgstr ""
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -134,12 +134,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Грешка"
 
@@ -540,7 +541,7 @@ msgstr ""
 
 #: ../dns_wizard/Bind.pm:246
 #, fuzzy
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Помощникът успешно добави клиента"
 
 #: ../dns_wizard/Bind.pm:256
@@ -922,7 +923,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Парола:"
 
@@ -967,195 +968,236 @@ msgstr "Настройване на FTP сървър"
 msgid "Configuring Kolab server on your system..."
 msgstr "Настройване на FTP сървър"
 
-#: ../ldap_wizard/Ldap.pm:26
+#: ../ldap_wizard/Ldap.pm:27
 #, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Настройване на DHCP сървъра"
+msgid "Ldap wizard"
+msgstr "MySQL помощник"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Настройване на DHCP сървъра"
+msgid "Show Ldap configuration"
+msgstr "Конфигурационен магьосник"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
+#: ../ldap_wizard/Ldap.pm:86
+msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "Конфигурационен магьосник"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Сървър за база данни"
+msgid "Ldap configuration wizard"
+msgstr "Конфигурационен магьосник"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "Сървър за база данни"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
+msgid "Delete configuration"
 msgstr "DNS помощник (настройка)"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Добавяне на потребител"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Потребителско име:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
+#: ../ldap_wizard/Ldap.pm:144
 #, fuzzy
-msgid "User Name:"
-msgstr "Потребителско име:"
+msgid "User Login:"
+msgstr "Добавяне на потребител"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Парола:"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Парола:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Паролите не съвпадат"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Настройване на DHCP сървъра"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Domain name: "
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Потребителска директория:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Потребителска директория:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Парола:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Парола:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Потребителска директория:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Име на новинарския сървър:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+#, fuzzy
+msgid "User Name:"
+msgstr "Потребителско име:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Настройване на DHCP сървъра"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Добавяне на потребител"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "Помощникът успешно настрои вашият NFS сървър."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:211
-#, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Помощникът успешно добави клиента"
+#: ../ldap_wizard/Ldap.pm:256
+msgid "Error when adding user in Ldap datase"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Помощникът успешно настрои вашият NFS сървър."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "включен"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 msgid "Error!"
 msgstr "Грешка!"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1922,7 +1964,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 
@@ -2048,7 +2090,7 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2646,6 +2688,38 @@ msgstr "Новинарски сървър"
 msgid "Configuring your system as Apache server ..."
 msgstr "Настройване на DNS сървъра"
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "Настройване на DHCP сървъра"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Настройване на DHCP сървъра"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Настройване на DHCP сървъра"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Конфигурационен магьосник"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Сървър за база данни"
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Сървър за база данни"
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "DNS помощник (настройка)"
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Помощникът успешно добави клиента"
+
 #~ msgid "The wizard successfully configured the DHCP services of your server."
 #~ msgstr "Помощникът успешно настрои DHCP услугите на сървъра ви."
 
diff --git a/po/bn.po b/po/bn.po
index 0e3e6591..b1624d4c 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-08-26 16:46+0600\n"
 "Last-Translator: Jamil Ahmed <jamil@bengalinux.org>\n"
 "Language-Team: Bangla <mdk-translation@bengalinux.org>\n"
@@ -43,7 +43,7 @@ msgstr "ত্রুটি।"
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -135,12 +135,13 @@ msgstr "আপনি dhcp-তে আছেন, আপনার করা কন�
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "ত্রুটি"
 
@@ -562,7 +563,7 @@ msgid "Domainname:"
 msgstr "ডোমেইনের নাম:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "উইজার্ড সাফল্যের সাথে DNS-এ একটি হোস্ট যোগ করেছে।"
 
 #: ../dns_wizard/Bind.pm:256
@@ -952,7 +953,7 @@ msgstr "Kolab সার্ভারের ম্যানেজার অ্য�
 msgid "Password mismatch, or null password, please correct."
 msgstr "পাসওয়ার্ডে গরমিল অথবা শূন্য পাসওয়ার্ড, অনুগ্রহ করে সংশোধন করুন। "
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "পাসওয়ার্ড:"
 
@@ -992,181 +993,227 @@ msgstr "আপনার সিস্টেমে Kolab সার্ভার ই
 msgid "Configuring Kolab server on your system..."
 msgstr "আপনার সিস্টেমে Kolab সার্ভার কনফিগার করবার প্রক্রিয়া..."
 
-#: ../ldap_wizard/Ldap.pm:26
-msgid "Configure OpenLDAP Server "
-msgstr "OpenLDAP সার্ভার কনফিগার করা হচ্ছে"
-
-#: ../ldap_wizard/Ldap.pm:80
-msgid "Configure OpenLDAP server"
-msgstr "OpenLDAP সার্ভার কনফিগার করো"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "সাম্বা উইজার্ড"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
-msgstr "OpenLDAP সার্ভারে একজন ব্যবহারকারী যোগ করো"
+#: ../ldap_wizard/Ldap.pm:85
+#, fuzzy
+msgid "Show Ldap configuration"
+msgstr "Ldap কনফিগারেশন উইজার্ড"
 
 #: ../ldap_wizard/Ldap.pm:86
-msgid "OpenLDAP configuration wizard"
-msgstr "OpenLDAP কনফিগারেশন উইজার্ড"
+msgid "Add user in Ldap server"
+msgstr "Ldap সার্ভারে একজন ব্যবহারকারী যোগ করো"
 
-#: ../ldap_wizard/Ldap.pm:86
-msgid "Setup an OpenLDAP server."
-msgstr "একটি OpenLDAP সার্ভার সেটআপ করো।"
+#: ../ldap_wizard/Ldap.pm:87
+#, fuzzy
+msgid "Delete Ldap configuration"
+msgstr "Ldap কনফিগারেশন উইজার্ড"
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
+msgid "Ldap configuration wizard"
+msgstr "Ldap কনফিগারেশন উইজার্ড"
 
-#: ../ldap_wizard/Ldap.pm:93
-msgid "You must setup an OpenLDAP server first."
-msgstr "আপনাকে অবশ্যই প্রথমে একটি OpenLDAP সার্ভার সেটআপ করতে হবে।"
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
+msgid "You must setup an Ldap server first."
+msgstr "আপনাকে অবশ্যই প্রথমে একটি Ldap সার্ভার সেটআপ করতে হবে।"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "আপনার পছন্দ:"
 
-#: ../ldap_wizard/Ldap.pm:110
-msgid "Save an existing configuration"
-msgstr "উপস্হিত একটি কনফিগারেশন সংরক্ষন করো"
+#: ../ldap_wizard/Ldap.pm:132
+#, fuzzy
+msgid "Delete configuration"
+msgstr "ইনস্টল সার্ভার-এর কনফিগারেশন"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr "LDAP ব্যবহারকারী যোগ করা হচ্ছে"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 msgid "User Created in: "
 msgstr "এর ভিতর ব্যবহারকারী তৈরি করা হয়েছে:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "নাম:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 msgid "Name:"
 msgstr "নাম:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "ব্যবহারকারীর নাম:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "ব্যবহারকারী সমুহের ধারক:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr "আপনাকে অবশ্যই একটি বৈধ প্রথম নাম দিতে হবে।"
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr "আপনাকে অবশ্যই একটি বৈধ নাম দিতে হবে।"
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr "আপনাকে অবশ্যই একজন বৈধ ব্যবহারকারীর নাম দিতে হবে।"
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 msgid "LDAP User Password"
 msgstr "LDAP ব্যবহারকারীর পাসওয়ার্ড"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr "পাসওয়ার্ডসমুহ অবশ্যই মিলতে হবে"
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 msgid "Password (again):"
 msgstr "পুনরায় পাসওয়ার্ড লিখুন:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr "আপনাকে অবশ্যই LDAP এর জন্য একটি পাসওয়ার্ড দিতে হবে।"
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "পাসওয়ার্ডসমুহ মিলছে না"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Adrministrator"
+msgstr "অ্যাডমিনস্ট্রেটর LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
 msgid "Configuring LDAP Server"
 msgstr "LDAP সার্ভার কনফিগার করা হচ্ছে"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
-msgstr ""
-"LDAP সাফিক্স:\n"
-" যেমন: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "ডোমেইনের নাম:"
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
+msgstr "অ্যাডমিনস্ট্রেটর LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "TFTP ডিরেক্টরি:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
-"LDAP অ্যাডমিনিস্ট্রেটর:\n"
-" ex: cn=admin,dc=example,dc=com\n"
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "TFTP ডিরেক্টরি:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr "অ্যাডমিনস্ট্রেটর LDAP:"
+
+#: ../ldap_wizard/Ldap.pm:188
 msgid "LDAP Password:"
 msgstr "LDAP পাসওয়ার্ড:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 msgid "LDAP Password (again):"
 msgstr "পুনরায় LDAP পাসওয়ার্ড লিখুন:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
-msgstr "আপনাকে অবশ্যই LDAP এর জন্য একটি সাফিক্স (suffix) দিতে হবে।"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:192
+#, fuzzy
+msgid "Administrator"
+msgstr "অ্যাডমিনস্ট্রেটর LDAP"
+
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "আপনাকে অবশ্যই একটি বৈধ প্রথম নাম দিতে হবে।"
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr "ব্যবহারকারী তৈরির নিশ্চিতকরণ"
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 msgid "First name:"
 msgstr "প্রথম নাম:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "ব্যবহারকারীর নাম:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr "এর ভিতর তৈরি করো:"
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 msgid "Confirmation Information for create an LDAP server"
 msgstr "LDAP সার্ভার তৈরির জন্য নিশ্চিতকরণ তথ্য"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr "LDAP কাঠামো:"
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr "অ্যাডমিনস্ট্রেটর LDAP:"
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 msgid "Users Container:"
 msgstr "ব্যবহারকারী সমুহের ধারক:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "উইজার্ড সাফল্যের সাথে LDAP কনফিগার করেছে।"
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr "সাফল্যের সাথে ব্যবহারকারী যোগ করা হয়েছে"
 
-#: ../ldap_wizard/Ldap.pm:211
-msgid "The wizard successfully added a user in LDAP"
-msgstr "উইজার্ড সাফল্যের সাথে ldap-তে একজন ব্যবহারকারী যোগ করেছে"
+#: ../ldap_wizard/Ldap.pm:256
+#, fuzzy
+msgid "Error when adding user in Ldap datase"
+msgstr "Ldap সার্ভারে একজন ব্যবহারকারী যোগ করো"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr "ইতিমধ্যেই সার্ভার কনফিগার করা হয়েছে"
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
-"আপনি ইতিমধ্যেই drakwizard এর মাধ্যমে আপনার OpenLDAP সার্ভার কনফিগার করেছেন\n"
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "আপনি ইতিমধ্যেই drakwizard এর মাধ্যমে আপনার Ldap সার্ভার কনফিগার করেছেন\n"
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, perl-format
 msgid "%s Failed"
 msgstr "%s বিফল"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 msgid "Error!"
 msgstr "ত্রুটি!"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr "%s এর সাথে সংযোগ করা যাচ্ছে নাহ্"
@@ -1977,7 +2024,7 @@ msgstr "একটি বুট চিত্র যোগ করুন"
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "PXE বিবরণ-এর সাহায্যে বুট ইমেজের নিয়ম ব্যাখ্যা করা হয়, অর্থাত্‍ Mandrakelinux ১০ "
@@ -2124,7 +2171,7 @@ msgstr ""
 "করা হয়।"
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr "Ramsize: বুট ডিস্কে ramsize প্যারামিটারটি পরিবর্তন করুন।"
 
 # msgstr "VGA অপশন: VGA সংক্রান্ত কোনো সমস্যা হলে, অনুগ্রহ করে সুবিন্যাস করুন"
@@ -2765,3 +2812,54 @@ msgstr "অ্যাপাচে সার্ভার"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "আপনার সিস্টেমকে অ্যাপাচে সার্ভার হিসাবে কনফিগার করবার প্রক্রিয়া..."
+
+#~ msgid "Configure Ldap server"
+#~ msgstr "Ldap সার্ভার কনফিগার করো"
+
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "OpenLDAP সার্ভার কনফিগার করা হচ্ছে"
+
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "OpenLDAP সার্ভার কনফিগার করো"
+
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "OpenLDAP সার্ভারে একজন ব্যবহারকারী যোগ করো"
+
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "OpenLDAP কনফিগারেশন উইজার্ড"
+
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "একটি OpenLDAP সার্ভার সেটআপ করো।"
+
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "আপনাকে অবশ্যই প্রথমে একটি OpenLDAP সার্ভার সেটআপ করতে হবে।"
+
+#~ msgid "Save an existing configuration"
+#~ msgstr "উপস্হিত একটি কনফিগারেশন সংরক্ষন করো"
+
+#~ msgid ""
+#~ "LDAP Suffix:\n"
+#~ " ex: dc=example,dc=com\n"
+#~ msgstr ""
+#~ "LDAP সাফিক্স:\n"
+#~ " যেমন: dc=example,dc=com\n"
+
+#~ msgid ""
+#~ "LDAP Administrator:\n"
+#~ " ex: cn=admin,dc=example,dc=com\n"
+#~ msgstr ""
+#~ "LDAP অ্যাডমিনিস্ট্রেটর:\n"
+#~ " ex: cn=admin,dc=example,dc=com\n"
+
+#~ msgid "You must enter a suffix for LDAP."
+#~ msgstr "আপনাকে অবশ্যই LDAP এর জন্য একটি সাফিক্স (suffix) দিতে হবে।"
+
+#~ msgid "Organisation LDAP:"
+#~ msgstr "LDAP কাঠামো:"
+
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "উইজার্ড সাফল্যের সাথে ldap-তে একজন ব্যবহারকারী যোগ করেছে"
+
+#~ msgid "You have already configured your OpenLDAP Server with drakwizard\n"
+#~ msgstr ""
+#~ "আপনি ইতিমধ্যেই drakwizard এর মাধ্যমে আপনার OpenLDAP সার্ভার কনফিগার করেছেন\n"
diff --git a/po/br.po b/po/br.po
index e5986222..ca4d1014 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-2.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-03-30 10:11+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: breton <LL@li.org>\n"
@@ -39,7 +39,7 @@ msgstr "Fazi."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -118,12 +118,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Fazi"
 
@@ -489,7 +490,7 @@ msgid "Domainname:"
 msgstr ""
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr ""
 
 #: ../dns_wizard/Bind.pm:256
@@ -837,7 +838,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Tremenger :"
 
@@ -875,184 +876,219 @@ msgstr ""
 msgid "Configuring Kolab server on your system..."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Servijer Postfix"
-
-#: ../ldap_wizard/Ldap.pm:80
-#, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Servijer Postfix"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Skoazeller Ldap"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
+#: ../ldap_wizard/Ldap.pm:85
+msgid "Show Ldap configuration"
 msgstr ""
 
 #: ../ldap_wizard/Ldap.pm:86
-msgid "OpenLDAP configuration wizard"
+msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:86
-#, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Servijer Postfix"
+#: ../ldap_wizard/Ldap.pm:87
+msgid "Delete Ldap configuration"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:93
-msgid "You must setup an OpenLDAP server first."
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
+msgid "Ldap configuration wizard"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
+msgid "You must setup an Ldap server first."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
-msgid "Save an existing configuration"
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Delete configuration"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 msgid "User Created in: "
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Ker :"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
+#: ../ldap_wizard/Ldap.pm:144
+msgid "User Login:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 msgid "LDAP User Password"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 msgid "Password (again):"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "An tremegerioù ne glot ket"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Servijer Postfix"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Domain name: "
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP directory tree"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+msgid "LDAP directory tree:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:188
 msgid "LDAP Password:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 msgid "LDAP Password (again):"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:197
+msgid "You must enter a valid LDAP directory tree."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Anv ar ostiz :"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Servijer Postfix"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 msgid "Users Container:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:211
-msgid "The wizard successfully added a user in LDAP"
+#: ../ldap_wizard/Ldap.pm:256
+msgid "Error when adding user in Ldap datase"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Servijer Postfix"
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Sac'het"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Fazi"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1749,7 +1785,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 
@@ -1870,7 +1906,7 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2450,3 +2486,19 @@ msgstr "Servijer Apache"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr ""
+
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "Servijer Postfix"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Servijer Postfix"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Servijer Postfix"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Servijer Postfix"
diff --git a/po/bs.po b/po/bs.po
index 119f5eba..963a958c 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-bs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-08-17 15:40+0200\n"
 "Last-Translator: Amila Akagić <bono@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -44,7 +44,7 @@ msgstr "Greška."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -133,12 +133,13 @@ msgstr "Nalazite se u dhcp-u, server možda neće raditi sa ovom konfiguracijom.
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Greška"
 
@@ -538,7 +539,7 @@ msgstr ""
 
 #: ../dns_wizard/Bind.pm:246
 #, fuzzy
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Čarobnjak je uspješno dodao klijenta."
 
 #: ../dns_wizard/Bind.pm:256
@@ -924,7 +925,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Šifra:"
 
@@ -968,197 +969,238 @@ msgstr "Podešavanje FTP servera"
 msgid "Configuring Kolab server on your system..."
 msgstr "Podešavanje FTP servera"
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Podešavanje DHCP servera"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Ldap čarobnjak"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Podešavanje DHCP servera"
+msgid "Show Ldap configuration"
+msgstr "Čarobnjak za podešavanje"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
+#: ../ldap_wizard/Ldap.pm:86
+msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "Čarobnjak za podešavanje"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Server baze podataka"
+msgid "Ldap configuration wizard"
+msgstr "Čarobnjak za podešavanje"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "Server baze podataka"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "DNS čarobnjak (podešavanje)"
+msgid "Delete configuration"
+msgstr "Konfiguracija time servera sačuvana"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Dodavanje korisnika"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 #, fuzzy
 msgid "First Name:"
 msgstr "Ime računara:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Korisničko ime:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
+#: ../ldap_wizard/Ldap.pm:144
 #, fuzzy
-msgid "User Name:"
-msgstr "Korisničko ime:"
+msgid "User Login:"
+msgstr "Dodavanje korisnika"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Šifra:"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Šifra:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Šifre se ne poklapaju"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Podešavanje Sambe"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Maskirano ime domena:"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Korisnički direktorij:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Korisnički direktorij:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Šifra:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Šifra:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Korisnički direktorij:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Ime računara:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+#, fuzzy
+msgid "User Name:"
+msgstr "Korisničko ime:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Podešavanje DHCP servera"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Dodavanje korisnika"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "Čarobnjak je uspješno podesio proxy server."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:211
-#, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Čarobnjak je uspješno dodao klijenta."
+#: ../ldap_wizard/Ldap.pm:256
+msgid "Error when adding user in Ldap datase"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Čarobnjak je uspješno podesio Samba server."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "uključen"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Greška."
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1957,7 +1999,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 
@@ -2083,7 +2125,7 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2119,6 +2161,8 @@ msgid ""
 "Now the wizard will configure all needed default configuration files to "
 "allow computers to boot through the network."
 msgstr ""
+"Sada će čarobnjak podesiti sve potrebne konfiguracijske datoteke kako bi "
+"omogućio računarima da pokreću sistem putem mreže sa ovog računara."
 
 #: ../pxe_wizard/Pxe.pm:192
 msgid ""
@@ -2126,6 +2170,9 @@ msgid ""
 "a DHCP server, launch the DHCP wizard and check the box 'Enable PXE'. If you "
 "don't do that, PXE query will not be answered by this server."
 msgstr ""
+"Moramo koristiti posebnu dhcpd.conf datoteku sa PXE parametrima. Da biste "
+"podesili takav DHCP server, pokrenite čarobnjak za DHCP i izaberite opciju "
+"'Uključi PCE'. Ako ne uradite to, ovaj server neće odgovarati na PXE upite."
 
 #: ../pxe_wizard/Pxe.pm:196
 msgid ""
@@ -2727,6 +2774,38 @@ msgstr "Apache server"
 msgid "Configuring your system as Apache server ..."
 msgstr "Podešavanje sistema kao Apache servera..."
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "Podešavanje DHCP servera"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Podešavanje DHCP servera"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Podešavanje DHCP servera"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Čarobnjak za podešavanje"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Server baze podataka"
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Server baze podataka"
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "DNS čarobnjak (podešavanje)"
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Čarobnjak je uspješno dodao klijenta."
+
 #~ msgid ""
 #~ "You need to readjust your domainname. For a DNS server you need a correct "
 #~ "domainname, not equal to localdomain or none. Hostname mut be a FQDN: "
diff --git a/po/ca.po b/po/ca.po
index 0e30e1bf..6018b364 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-08-09 11:22+0200\n"
 "Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -44,7 +44,7 @@ msgstr "Error."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -134,12 +134,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Error"
 
@@ -542,7 +543,7 @@ msgstr "Nom de domini:"
 
 #: ../dns_wizard/Bind.pm:246
 #, fuzzy
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "L'auxiliar ha afegit el client amb èxit."
 
 #: ../dns_wizard/Bind.pm:256
@@ -923,7 +924,7 @@ msgstr "Introduïu la contrasenya pel compte de gestor del servidor Kolab."
 msgid "Password mismatch, or null password, please correct."
 msgstr "Les contrasenyes no concoden o és nul·la, si us plau corregiu-ho."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Contrasenya:"
 
@@ -963,193 +964,238 @@ msgstr "S'està instal·lant el servidor Kolab al vostre sistema..."
 msgid "Configuring Kolab server on your system..."
 msgstr "S'està configurant el servidor Kolab al vostre sistema..."
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "S'està configurant el servidor DHCP"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Auxiliar del Ldap"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "S'està configurant el servidor DHCP"
+msgid "Show Ldap configuration"
+msgstr "Auxiliar de configuració LDAP"
 
-#: ../ldap_wizard/Ldap.pm:81
+#: ../ldap_wizard/Ldap.pm:86
 #, fuzzy
-msgid "Add user in OpenLDAP server"
+msgid "Add user in Ldap server"
 msgstr "Afegeix - Afegeix usuari al servidor LDAP"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "Auxiliar de configuració LDAP"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Configura un servidor LDAP."
+msgid "Ldap configuration wizard"
+msgstr "Auxiliar de configuració LDAP"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "Configura un servidor LDAP."
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "Elimina una màquina de la configuració DNS existent."
+msgid "Delete configuration"
+msgstr "Configuració del servidor d'instal·lació"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Crea a:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Nom:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 msgid "Name:"
 msgstr "Nom:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
 msgstr "Nom d'usuari:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 #, fuzzy
 msgid "You must enter a valid First Name."
 msgstr "Heu d'introduir una contrasenta per LDAP."
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 #, fuzzy
 msgid "You must enter a valid Name."
 msgstr "Heu d'introduir una contrasenta per LDAP."
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 #, fuzzy
 msgid "You must enter a valid User Name."
 msgstr "Heu d'introduir una contrasenta per LDAP."
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 msgid "LDAP User Password"
 msgstr "Contrasenya de l'usuari LDAP"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "passwords must match"
 msgstr "Les contrasenyes no concorden"
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 msgid "Password (again):"
 msgstr "Contrasenya (un altre cop):"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr "Heu d'introduir una contrasenta per LDAP."
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Les contrasenyes no concorden"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Adrministrator"
+msgstr "Administrador LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "S'està configurant LDAP"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Nom de domini:"
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP Administrator"
+msgstr "Administrador LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Directori TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Directori TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+#, fuzzy
+msgid "LDAP Administrator:"
+msgstr "Administrador LDAP:"
+
+#: ../ldap_wizard/Ldap.pm:188
 msgid "LDAP Password:"
 msgstr "Contrasenya LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 msgid "LDAP Password (again):"
 msgstr "Contrasenya LDAP (un altre cop):"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:192
+#, fuzzy
+msgid "Administrator"
+msgstr "Administrador LDAP"
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Heu d'introduir una contrasenta per LDAP."
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr "Confirmació de l'usuari a crear"
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 msgid "First name:"
 msgstr "Nom:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Nom d'usuari:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr "Crea a:"
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "S'està configurant el servidor DHCP"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-#, fuzzy
-msgid "Administrator LDAP:"
-msgstr "Administrador LDAP:"
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Nom d'usuari:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "L'auxiliar ha configurat LDAP amb èxit."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr "L'usuari s'ha afegit amb èxit"
 
-#: ../ldap_wizard/Ldap.pm:211
-msgid "The wizard successfully added a user in LDAP"
-msgstr "L'auxiliar ha afegit un usuri LDAP amb èxit"
+#: ../ldap_wizard/Ldap.pm:256
+#, fuzzy
+msgid "Error when adding user in Ldap datase"
+msgstr "Afegeix - Afegeix usuari al servidor LDAP"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "L'auxiliar ha configurat el servidor Samba amb èxit."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Ha fallat"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Error"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1930,7 +1976,7 @@ msgstr "Afegeix una imatge d'arrencada"
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 
@@ -2059,7 +2105,7 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2697,6 +2743,41 @@ msgstr "Servidor Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "S'està configurant el vostre sistema con servidor Apache ..."
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "S'està configurant el servidor DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "S'està configurant el servidor DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "S'està configurant el servidor DHCP"
+
+#, fuzzy
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Afegeix - Afegeix usuari al servidor LDAP"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Auxiliar de configuració LDAP"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Configura un servidor LDAP."
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Configura un servidor LDAP."
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "Elimina una màquina de la configuració DNS existent."
+
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "L'auxiliar ha afegit un usuri LDAP amb èxit"
+
 #~ msgid ""
 #~ "PXE name: the name displayed in PXE menu (please provide an ASCII word or "
 #~ "a number, without spaces)"
diff --git a/po/cs.po b/po/cs.po
index d3c3a8a8..cb2d1657 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-cs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-08-26 20:34+0200\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -57,7 +57,7 @@ msgstr "Chyba."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -149,12 +149,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Chyba"
 
@@ -567,7 +568,7 @@ msgid "Domainname:"
 msgstr "Název domény:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Průvodce úspěšně přidal počítač do vaší DNS."
 
 #: ../dns_wizard/Bind.pm:256
@@ -948,7 +949,7 @@ msgstr "Zadejte heslo pro účet správce serveru Kolab."
 msgid "Password mismatch, or null password, please correct."
 msgstr "Heslo není shodné nebo je prázdné, opravte jej prosím."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Heslo:"
 
@@ -988,180 +989,227 @@ msgstr "Na váš systém se instaluje server Kolab..."
 msgid "Configuring Kolab server on your system..."
 msgstr "Nastavuje se server Kolab na vašem systému..."
 
-#: ../ldap_wizard/Ldap.pm:26
-msgid "Configure OpenLDAP Server "
-msgstr "Nastavení serveru OpenLDAP"
-
-#: ../ldap_wizard/Ldap.pm:80
-msgid "Configure OpenLDAP server"
-msgstr "Nastavit server OpenLDAP"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Průvodce pro server Ldap"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
-msgstr "Přidat uživatele do OpenLDAP serveru"
+#: ../ldap_wizard/Ldap.pm:85
+#, fuzzy
+msgid "Show Ldap configuration"
+msgstr "Průvodce nastavením Ldap"
 
 #: ../ldap_wizard/Ldap.pm:86
-msgid "OpenLDAP configuration wizard"
-msgstr "Průvodce nastavením OpenLDAP"
+msgid "Add user in Ldap server"
+msgstr "Přidat uživatele do Ldap serveru"
 
-#: ../ldap_wizard/Ldap.pm:86
-msgid "Setup an OpenLDAP server."
-msgstr "Nastavení OpenLDAP serveru."
+#: ../ldap_wizard/Ldap.pm:87
+#, fuzzy
+msgid "Delete Ldap configuration"
+msgstr "Průvodce nastavením Ldap"
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:93
-msgid "You must setup an OpenLDAP server first."
-msgstr "Musíte nejprve nastavit server OpenLDAP."
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
+msgid "Ldap configuration wizard"
+msgstr "Průvodce nastavením Ldap"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
+msgid "You must setup an Ldap server first."
+msgstr "Musíte nejprve nastavit server Ldap."
+
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Vaše volba:"
 
-#: ../ldap_wizard/Ldap.pm:110
-msgid "Save an existing configuration"
-msgstr "Uložit stávající nastavení"
+#: ../ldap_wizard/Ldap.pm:132
+#, fuzzy
+msgid "Delete configuration"
+msgstr "Nastavení instalačního serveru"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr "Přidání uživatele LDAP"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 msgid "User Created in: "
 msgstr "Uživatel vytvořen v:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Jméno:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 msgid "Name:"
 msgstr "Příjmení:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Uživatelské jméno:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Kontejner uživatelů:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr "Musíte zadat platné jméno."
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr "Musíte zadat platné celé jméno."
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr "Musíte zadat platné uživatelské jméno."
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 msgid "LDAP User Password"
 msgstr "Heslo uživatele LDAP"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr "Hesla se musí shodovat"
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 msgid "Password (again):"
 msgstr "Heslo (znovu):"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr "Musíte zadat heslo pro LDAP."
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Hesla se neshodují"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Adrministrator"
+msgstr "Správce LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
 msgid "Configuring LDAP Server"
 msgstr "Nastavuji server LDAP"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
-msgstr ""
-"LDAP Přípona:\n"
-" např.: dc=priklad,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Název domény:"
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
+msgstr "Správce LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Adresář TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
-"Správce LDAP:\n"
-" např: cn=admin,dc=priklad,dc=cz\n"
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Adresář TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr "Správce LDAP:"
+
+#: ../ldap_wizard/Ldap.pm:188
 msgid "LDAP Password:"
 msgstr "Heslo LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 msgid "LDAP Password (again):"
 msgstr "Heslo LDAP (znovu):"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
-msgstr "Musíte zadat příponu pro LDAP."
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:192
+#, fuzzy
+msgid "Administrator"
+msgstr "Správce LDAP"
+
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Musíte zadat platné jméno."
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr "Potvrzení vytvoření uživatele"
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 msgid "First name:"
 msgstr "Jméno:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Uživatelské jméno:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr "Vytvořit v:"
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Potvrzení informací pro vytvoření LDAP serveru"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr "Organizace LDAP:"
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr "Správce LDAP:"
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 msgid "Users Container:"
 msgstr "Kontejner uživatelů:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "Tento průvodce úspěšně nastavil váš LDAP server."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr "Uživatel byl úspěšně přidán"
 
-#: ../ldap_wizard/Ldap.pm:211
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Průvodce úspěšně přidal uživatele do LDAP"
+#: ../ldap_wizard/Ldap.pm:256
+#, fuzzy
+msgid "Error when adding user in Ldap datase"
+msgstr "Přidat uživatele do Ldap serveru"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr "Server je již nastaven"
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr "Váš OpenLDAP server byl již pomocí aplikace drakwizard nastaven\n"
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Váš Ldap server byl již pomocí aplikace drakwizard nastaven\n"
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, perl-format
 msgid "%s Failed"
 msgstr "Selhalo %s"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 msgid "Error!"
 msgstr "Chyba!"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr "Nelze se připojit k %s"
@@ -1957,7 +2005,7 @@ msgstr "Přidat zaváděcí obraz"
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "Popis PXE se používá pro vysvětlení účelu zaváděcího obrazu, např: obraz "
@@ -2100,7 +2148,7 @@ msgid ""
 msgstr "Síťové rozhraní klienta: síťové rozhraní použité instalačním procesem."
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr "Velikost RAM: úprava velikosti paměti na zaváděcím disku."
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2747,3 +2795,53 @@ msgstr "Server Apache"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "Nastavuji váš systém jako server Apache..."
+
+#~ msgid "Configure Ldap server"
+#~ msgstr "Nastavit server Ldap"
+
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Nastavení serveru OpenLDAP"
+
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Nastavit server OpenLDAP"
+
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Přidat uživatele do OpenLDAP serveru"
+
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Průvodce nastavením OpenLDAP"
+
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Nastavení OpenLDAP serveru."
+
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Musíte nejprve nastavit server OpenLDAP."
+
+#~ msgid "Save an existing configuration"
+#~ msgstr "Uložit stávající nastavení"
+
+#~ msgid ""
+#~ "LDAP Suffix:\n"
+#~ " ex: dc=example,dc=com\n"
+#~ msgstr ""
+#~ "LDAP Přípona:\n"
+#~ " např.: dc=priklad,dc=com\n"
+
+#~ msgid ""
+#~ "LDAP Administrator:\n"
+#~ " ex: cn=admin,dc=example,dc=com\n"
+#~ msgstr ""
+#~ "Správce LDAP:\n"
+#~ " např: cn=admin,dc=priklad,dc=cz\n"
+
+#~ msgid "You must enter a suffix for LDAP."
+#~ msgstr "Musíte zadat příponu pro LDAP."
+
+#~ msgid "Organisation LDAP:"
+#~ msgstr "Organizace LDAP:"
+
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Průvodce úspěšně přidal uživatele do LDAP"
+
+#~ msgid "You have already configured your OpenLDAP Server with drakwizard\n"
+#~ msgstr "Váš OpenLDAP server byl již pomocí aplikace drakwizard nastaven\n"
diff --git a/po/cy.po b/po/cy.po
index 9e1b5a01..0ecfb290 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-03-28 22:26-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <rhoslyn.prys@meddal.org.uk>\n"
@@ -39,7 +39,7 @@ msgstr "Gwall."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -129,12 +129,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Gwall"
 
@@ -544,7 +545,7 @@ msgid "Domainname:"
 msgstr "Enw Parth:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Mae'r dewin wedi ychwanegu'r gwestai'n llwyddiannus i'ch DNS."
 
 #: ../dns_wizard/Bind.pm:256
@@ -939,7 +940,7 @@ msgstr "Rhowch gyfrinair ar gyfer cyfrif rheolwr gweinydd Kolab"
 msgid "Password mismatch, or null password, please correct."
 msgstr "Cyfrinair gwallus, cywirwch."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Cyfrinair:"
 
@@ -979,196 +980,238 @@ msgstr "Gosod gweinydd Kolab ar eich system..."
 msgid "Configuring Kolab server on your system..."
 msgstr "Ffurfweddu gweinydd Kolab ar eich system..."
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Ffurfweddu'r Gweinydd DHCP"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Dewin Ldap"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Ffurfweddu'r Gweinydd DHCP"
+msgid "Show Ldap configuration"
+msgstr "Dewin ffurfweddu LDAP"
 
-#: ../ldap_wizard/Ldap.pm:81
+#: ../ldap_wizard/Ldap.pm:86
 #, fuzzy
-msgid "Add user in OpenLDAP server"
+msgid "Add user in Ldap server"
 msgstr "Ychwanegu - ychwanegu cofnod mewn gweinydd LDAP"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "Dewin ffurfweddu LDAP"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Gosod gweinydd PXE"
+msgid "Ldap configuration wizard"
+msgstr "Dewin ffurfweddu LDAP"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "Gosod gweinydd PXE"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "Tynwch westeiwr o'r ffurfweddiad DNS presennol."
+msgid "Delete configuration"
+msgstr "Gosod ffurfweddiad gweinydd"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Enw Defnyddiwr:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Enw Cyntaf:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Enw Defnyddiwr:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Enw Defnyddiwr:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Cynhwysydd:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Cyfrinair:"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Cyfrinair eto:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Nid yw'r cyfrineiriau'n cyd-fynd"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Ffurfweddu Samba"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Enw Parth:"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Cyfeiriadur TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Cyfeiriadur TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Cyfrinair:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Cyfrinair eto:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Cyfeiriadur TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Enw Cyntaf:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Enw Defnyddiwr:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Ffurfweddu'r Gweinydd DHCP"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Cynhwysydd:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "Mae'r dewin wedi ffurfweddu'r LDAPt yn llwyddiannus."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 #, fuzzy
 msgid "Successfully added User"
 msgstr "Ychwanegu data'n llwyddiannus"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:256
 #, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Mae'r dewin wedi ychwanegu cofnod yn ldap"
+msgid "Error when adding user in Ldap datase"
+msgstr "Ychwanegu - ychwanegu cofnod mewn gweinydd LDAP"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Llwyddiant! Mae'r dewin wedi ffurfweddu eich gweinydd Samba."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Methwyd"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Gwall"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1973,7 +2016,7 @@ msgstr "Ychwanegu delwedd cychwyn"
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 #, fuzzy
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "Mae disgrifiad PXE yn cael ei ddefnyddio i esbonio rheol y delwedd cychwyn, "
@@ -2119,7 +2162,7 @@ msgstr ""
 "ddefnyddio ar gyfer y proses osod."
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr "Ramsize: newid paramedrau ramsize ar y disg cychwyn."
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2755,6 +2798,42 @@ msgstr "Gweinydd gwe Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Ffurfweddu eich system fel gweinydd Apache..."
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "Ffurfweddu'r Gweinydd DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Ffurfweddu'r Gweinydd DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Ffurfweddu'r Gweinydd DHCP"
+
+#, fuzzy
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Ychwanegu - ychwanegu cofnod mewn gweinydd LDAP"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Dewin ffurfweddu LDAP"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Gosod gweinydd PXE"
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Gosod gweinydd PXE"
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "Tynwch westeiwr o'r ffurfweddiad DNS presennol."
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Mae'r dewin wedi ychwanegu cofnod yn ldap"
+
 #~ msgid ""
 #~ "PXE name: the name displayed in PXE menu (please provide an ASCII word or "
 #~ "a number, without spaces)"
diff --git a/po/da.po b/po/da.po
index 4e6ade9e..9c0b7eea 100644
--- a/po/da.po
+++ b/po/da.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-08-15 22:46+0200\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <<dansk@klid.dk>>\n"
@@ -47,7 +47,7 @@ msgstr "Fejl."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -135,12 +135,13 @@ msgstr "Du er i dhcp, serveren vil muligvis ikke virke med din konfiguration."
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Fejl"
 
@@ -556,7 +557,7 @@ msgid "Domainname:"
 msgstr "Domænenavn:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Hjælperen tilføjede vært i din DNS uden problemer."
 
 #: ../dns_wizard/Bind.pm:256
@@ -943,7 +944,7 @@ msgstr "Indtast adgangskode for administrationskontoen for Kolab-serveren."
 msgid "Password mismatch, or null password, please correct."
 msgstr "Uoverensstemmende adgangskoder, eller blank adgangskode; ret venligst."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Adgangskode:"
 
@@ -983,196 +984,238 @@ msgstr "Installerer Kolab-server på dit system..."
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurerer Kolab-server på dit system..."
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Konfigurerer DHCP-serveren"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Ldap-hjælper"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Konfigurerer DHCP-serveren"
+msgid "Show Ldap configuration"
+msgstr "Konfigurationshjælper for LDAP"
 
-#: ../ldap_wizard/Ldap.pm:81
+#: ../ldap_wizard/Ldap.pm:86
 #, fuzzy
-msgid "Add user in OpenLDAP server"
+msgid "Add user in Ldap server"
 msgstr "Tilføj - Tilføj indgang i LDAP-server"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "Konfigurationshjælper for LDAP"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Indstil en PXE-server."
+msgid "Ldap configuration wizard"
+msgstr "Konfigurationshjælper for LDAP"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "Indstil en PXE-server."
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "Fjern en vært i eksisterende DNS-konfiguration."
+msgid "Delete configuration"
+msgstr "Installerings-serverkonfiguration"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Brugernavn:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Fornavn:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Brugernavn:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Brugernavn:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Beholder:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Adgangskode"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Adgangskode igen:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Adgangskoderne stemmer ikke overens"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Konfigurerer Samba"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Domænenavn:"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "TFTP-katalog:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "TFTP-katalog:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Adgangskode:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Adgangskode igen:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "TFTP-katalog:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Fornavn:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Brugernavn:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Konfigurerer DHCP-serveren"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Beholder:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "Hjælperen har konfigureret LDAP uden problemer."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 #, fuzzy
 msgid "Successfully added User"
 msgstr "Tilføjede data uden problemer"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:256
 #, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Hjælperen tilføjede indgang i LDAP uden problemer."
+msgid "Error when adding user in Ldap datase"
+msgstr "Tilføj - Tilføj indgang i LDAP-server"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Hjælperen konfigurerede din Samba-server uden problemer."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Mislykkedes"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Fejl"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1975,7 +2018,7 @@ msgstr "Tilføj et opstartsaftryk"
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 #, fuzzy
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "PXE-beskrivelse bruges til at forklare opstartsaftrykkets regler, dvs "
@@ -2124,7 +2167,7 @@ msgstr ""
 "installeringsprocessen."
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr "Ramsize: justér ramsize-parametren på opstartsdisketten."
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2766,6 +2809,42 @@ msgstr "Apache-server"
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurerer dit system som en Apache-server ..."
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "Konfigurerer DHCP-serveren"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Konfigurerer DHCP-serveren"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Konfigurerer DHCP-serveren"
+
+#, fuzzy
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Tilføj - Tilføj indgang i LDAP-server"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Konfigurationshjælper for LDAP"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Indstil en PXE-server."
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Indstil en PXE-server."
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "Fjern en vært i eksisterende DNS-konfiguration."
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Hjælperen tilføjede indgang i LDAP uden problemer."
+
 #~ msgid ""
 #~ "PXE name: the name displayed in PXE menu (please provide an ASCII word or "
 #~ "a number, without spaces)"
diff --git a/po/de.po b/po/de.po
index 5423f59c..f39ecb0c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-05-12 00:10+0200\n"
 "Last-Translator: Christian Meyer <chrisime@gnome.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -49,7 +49,7 @@ msgstr "Fehler."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -143,12 +143,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Fehler"
 
@@ -579,7 +580,7 @@ msgid "Domainname:"
 msgstr "Domänen-Name:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr ""
 "Der Rechner wurde vom Assistenten erfolgreich zu Ihrem DNS hinzugefügt."
 
@@ -1000,7 +1001,7 @@ msgstr ""
 "Die Passwörter stimmen nicht überein, oder es wurde kein Passwort "
 "eingegeben. Bitte korrigieren Sie dies."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Passwort:"
 
@@ -1048,196 +1049,239 @@ msgstr "Konfiguriere Ihren PXE-Server..."
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfiguriere Ihren PXE-Server..."
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "DHCP-Server konfigurieren"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Ldap-Assistent"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "DHCP-Server konfigurieren"
+msgid "Show Ldap configuration"
+msgstr "LDAP-Konfigurations-Assistent"
 
-#: ../ldap_wizard/Ldap.pm:81
+#: ../ldap_wizard/Ldap.pm:86
 #, fuzzy
-msgid "Add user in OpenLDAP server"
+msgid "Add user in Ldap server"
 msgstr "Eintrag zum LDAP-Server hinzufügen"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "LDAP-Konfigurations-Assistent"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "PXE-Server angeben."
+msgid "Ldap configuration wizard"
+msgstr "LDAP-Konfigurations-Assistent"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "PXE-Server angeben."
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "Entfernen Sie einen Rechner aus der existierenden DNS-Konfiguration."
+msgid "Delete configuration"
+msgstr "Installations-Server-Konfiguration"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Benutzername:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Erster Name:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Benutzername:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Benutzername:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Container:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Passwort"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Passwort:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Die Passwörter stimmen nicht überein"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Konfiguriere Samba"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Domänen-Name:"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "TFTP-Verzeichnis:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "TFTP-Verzeichnis:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Passwort:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Passwort:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "TFTP-Verzeichnis:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Erster Name:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Benutzername:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "DHCP-Server konfigurieren"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Container:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "Der Assistent hat den LDAP-Server erfolgreich eingerichtet."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 #, fuzzy
 msgid "Successfully added User"
 msgstr "Daten erfolgreich hinzugefügt"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:256
 #, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Der Assistent hat erfolgreich den Eintrag ins LDAP gemacht.."
+msgid "Error when adding user in Ldap datase"
+msgstr "Eintrag zum LDAP-Server hinzufügen"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
 msgstr ""
+"Der Assistent hat den Samba-Dienst Ihres Servers erfolgreich eingerichtet."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Fehler"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Fehler"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -2090,7 +2134,7 @@ msgstr "Boot-Image hinzufügen"
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 #, fuzzy
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "Die PXE-Beschreibung wird verwendet um die Rolle der Start-Abbilde zu "
@@ -2254,7 +2298,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
 #, fuzzy
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr "RAM-Größe: adjust ramsize on boot disk."
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2928,6 +2972,43 @@ msgstr "Apache Web-Server"
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfiguriere Ihr System als Slave-DNS-Server..."
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "DHCP-Server konfigurieren"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "DHCP-Server konfigurieren"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "DHCP-Server konfigurieren"
+
+#, fuzzy
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Eintrag zum LDAP-Server hinzufügen"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "LDAP-Konfigurations-Assistent"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "PXE-Server angeben."
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "PXE-Server angeben."
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr ""
+#~ "Entfernen Sie einen Rechner aus der existierenden DNS-Konfiguration."
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Der Assistent hat erfolgreich den Eintrag ins LDAP gemacht.."
+
 #~ msgid "Server - Set configuration of LDAP server"
 #~ msgstr "LDAP-Server konfigurieren"
 
diff --git a/po/drakwizard.pot b/po/drakwizard.pot
index f9619373..3f0ed27c 100644
--- a/po/drakwizard.pot
+++ b/po/drakwizard.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+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"
@@ -41,7 +41,7 @@ msgstr ""
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -120,12 +120,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr ""
 
@@ -491,7 +492,7 @@ msgid "Domainname:"
 msgstr ""
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr ""
 
 #: ../dns_wizard/Bind.pm:256
@@ -838,7 +839,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr ""
 
@@ -876,176 +877,212 @@ msgstr ""
 msgid "Configuring Kolab server on your system..."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:26
-msgid "Configure OpenLDAP Server "
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:80
-msgid "Configure OpenLDAP server"
+#: ../ldap_wizard/Ldap.pm:85
+msgid "Show Ldap configuration"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
+#: ../ldap_wizard/Ldap.pm:86
+msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:86
-msgid "OpenLDAP configuration wizard"
+#: ../ldap_wizard/Ldap.pm:87
+msgid "Delete Ldap configuration"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:86
-msgid "Setup an OpenLDAP server."
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:93
-msgid "You must setup an OpenLDAP server first."
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
+msgid "Ldap configuration wizard"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
+msgid "You must setup an Ldap server first."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
-msgid "Save an existing configuration"
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Delete configuration"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 msgid "User Created in: "
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 msgid "Name:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
+#: ../ldap_wizard/Ldap.pm:144
+msgid "User Login:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 msgid "LDAP User Password"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 msgid "Password (again):"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 msgid "Configuring LDAP Server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Domain name: "
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP directory tree"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+msgid "LDAP directory tree:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:188
 msgid "LDAP Password:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 msgid "LDAP Password (again):"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
-msgid "Confirmation of the user to create"
+#: ../ldap_wizard/Ldap.pm:197
+msgid "You must enter a valid LDAP directory tree."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
-msgid "First name:"
+#: ../ldap_wizard/Ldap.pm:213
+msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:186
-msgid "Create in:"
+#: ../ldap_wizard/Ldap.pm:217
+msgid "First name:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
-msgid "Confirmation Information for create an LDAP server"
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
+#: ../ldap_wizard/Ldap.pm:219
+msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
+#: ../ldap_wizard/Ldap.pm:225
+msgid "Confirmation Information for create an LDAP server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 msgid "Users Container:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:211
-msgid "The wizard successfully added a user in LDAP"
+#: ../ldap_wizard/Ldap.pm:256
+msgid "Error when adding user in Ldap datase"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
+#: ../ldap_wizard/Ldap.pm:269
+msgid "You have already configured your Ldap Server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, perl-format
 msgid "%s Failed"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 msgid "Error!"
 msgstr ""
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1742,7 +1779,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 
@@ -1863,7 +1900,7 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
diff --git a/po/el.po b/po/el.po
index d5503104..e84297ce 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-03-01 14:48+0200\n"
 "Last-Translator: Dimitris Korbetis <korb@uth.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -40,7 +40,7 @@ msgstr "Σφάλμα."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -131,12 +131,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -525,7 +526,7 @@ msgid "Domainname:"
 msgstr ""
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Ο οδηγός πρόσθεσε με επιτυχία τον υπολογιστή στο DNS σας"
 
 #: ../dns_wizard/Bind.pm:256
@@ -897,7 +898,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Κωδικός:"
 
@@ -942,195 +943,236 @@ msgstr "Ρύθμιση του εξυπηρετητή PXE στο σύστημά �
 msgid "Configuring Kolab server on your system..."
 msgstr "Ρύθμιση του εξυπηρετητή PXE στο σύστημά σας"
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Ρυθμίζεται ο Διακομιστή DHCP"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Οδηγός Ldap"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Ρυθμίζεται ο Διακομιστή DHCP"
+msgid "Show Ldap configuration"
+msgstr "Οδηγός Ρυθμίσεων LDAP"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
+#: ../ldap_wizard/Ldap.pm:86
+msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "Οδηγός Ρυθμίσεων LDAP"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Set PXE server"
+msgid "Ldap configuration wizard"
+msgstr "Οδηγός Ρυθμίσεων LDAP"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "Set PXE server"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "με αυτή τη ρύθμιση:"
+msgid "Delete configuration"
+msgstr "Εγατάσταση εργαλείων ρύθμισης εξυπηρετητή"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Όνομα Χρήστη:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Όνομα:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Όνομα Χρήστη:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Όνομα Χρήστη:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Container:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Κωδικός πρόσβασης"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Κωδικός:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Οι κωδικοί πρόσβασης είναι ανόμοιοι"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Ρυθμίζεται το Samba"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Πελάτης NIS"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Κατάλογος TFTP"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Κατάλογος TFTP"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Κωδικός:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Κωδικός:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Κατάλογος TFTP"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Όνομα:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Όνομα Χρήστη:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Ρυθμίζεται ο Διακομιστή DHCP"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Container:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "Ο οδηγός ρύθμισε με επιτυχία τον εξυπηρετητή LDAP."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 #, fuzzy
 msgid "Successfully added User"
 msgstr "Επιτυχής προσθήκη δεδομένων"
 
-#: ../ldap_wizard/Ldap.pm:211
-#, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Ο οδηγός πρόσθεσε με επιτυχία την καταχώρηση στο ldap"
+#: ../ldap_wizard/Ldap.pm:256
+msgid "Error when adding user in Ldap datase"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Ο οδηγός ρύθμισε με επιτυχία τον διακομιστή Samba."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Ανεπιτυχές"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Σφάλμα"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1915,7 +1957,7 @@ msgstr "ディレクトリをリストに追加"
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 
@@ -2038,7 +2080,7 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2691,6 +2733,38 @@ msgstr "Εξυπηρετητής Apache "
 msgid "Configuring your system as Apache server ..."
 msgstr "Το σύστημα σας ρυθμίζεται σαν εξυπηρετητής Apache "
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "Ρυθμίζεται ο Διακομιστή DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Ρυθμίζεται ο Διακομιστή DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Ρυθμίζεται ο Διακομιστή DHCP"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Οδηγός Ρυθμίσεων LDAP"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Set PXE server"
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Set PXE server"
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "με αυτή τη ρύθμιση:"
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Ο οδηγός πρόσθεσε με επιτυχία την καταχώρηση στο ldap"
+
 #~ msgid "Apache web server"
 #~ msgstr "Διακομιστής ιστοσελίδων Apache"
 
diff --git a/po/eo.po b/po/eo.po
index f84476cc..fd38a736 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-eo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2003-08-09 15:18+0000\n"
 "Last-Translator: Vilhelmo Lutermano <vlutermano@free.fr>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -44,7 +44,7 @@ msgstr "Sorĉil-eraro."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -136,12 +136,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
 msgstr "Sorĉil-eraro."
@@ -550,7 +551,7 @@ msgstr ""
 
 #: ../dns_wizard/Bind.pm:246
 #, fuzzy
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "La sorĉilo sukcese aldonis la klienton."
 
 #: ../dns_wizard/Bind.pm:256
@@ -930,7 +931,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Pasvorto:"
 
@@ -975,197 +976,238 @@ msgstr "Mi konfiguras la FTP-servilon"
 msgid "Configuring Kolab server on your system..."
 msgstr "Mi konfiguras la FTP-servilon"
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Konfigurante la DHCP-servilon"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Ldap-sorĉilo"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Konfigurante la DHCP-servilon"
+msgid "Show Ldap configuration"
+msgstr "Konfigurad-sorĉilo"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
+#: ../ldap_wizard/Ldap.pm:86
+msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "Konfigurad-sorĉilo"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Datenbaz-servilo"
+msgid "Ldap configuration wizard"
+msgstr "Konfigurad-sorĉilo"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "Datenbaz-servilo"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "DNS-sorĉilo (konfigurado)"
+msgid "Delete configuration"
+msgstr "Konfiguraĵo de tempo-servilo konservita"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Uzul-aldono"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 #, fuzzy
 msgid "First Name:"
 msgstr "Gastiganto-nomo:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Uzulnomo:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
+#: ../ldap_wizard/Ldap.pm:144
 #, fuzzy
-msgid "User Name:"
-msgstr "Uzulnomo:"
+msgid "User Login:"
+msgstr "Uzul-aldono"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Pasvorto:"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Pasvorto:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "La pasvortoj ne egalas"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Mi konfiguras Samba-on"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Komputita domajno-nomo"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Uzul-dosierujo:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Uzul-dosierujo:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Pasvorto:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Pasvorto:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Uzul-dosierujo:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Gastiganto-nomo:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+#, fuzzy
+msgid "User Name:"
+msgstr "Uzulnomo:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Konfigurante la DHCP-servilon"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Uzul-aldono"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "La sorĉilo sukcese konfiguris vian prokur-servilon."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:211
-#, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "La sorĉilo sukcese aldonis la klienton."
+#: ../ldap_wizard/Ldap.pm:256
+msgid "Error when adding user in Ldap datase"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "La sorĉilo sukcese konfiguris vian Samba-servilon."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "enŝaltita"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Sorĉil-eraro."
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1956,7 +1998,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 
@@ -2080,7 +2122,7 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2721,6 +2763,38 @@ msgstr "Intrareta teksaĵ-servilo:"
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurante la DNS-servilon"
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "Konfigurante la DHCP-servilon"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Konfigurante la DHCP-servilon"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Konfigurante la DHCP-servilon"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Konfigurad-sorĉilo"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Datenbaz-servilo"
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Datenbaz-servilo"
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "DNS-sorĉilo (konfigurado)"
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "La sorĉilo sukcese aldonis la klienton."
+
 #~ msgid "The wizard successfully configured your NFS server"
 #~ msgstr "La sorĉilo sukcese konfiguris vian NFS-servilon"
 
diff --git a/po/es.po b/po/es.po
index bdc92011..a3aa441a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-08-09 09:43-0300\n"
 "Last-Translator: Fabian Mandelbaum <fmandelbaum@hotmail.com>\n"
 "Language-Team: Español <es@li.org>\n"
@@ -39,7 +39,7 @@ msgstr "Error."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -129,12 +129,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Error"
 
@@ -551,7 +552,7 @@ msgid "Domainname:"
 msgstr "Nombre de dominio:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "El asistente añadió exitosamente al host en su DNS."
 
 #: ../dns_wizard/Bind.pm:256
@@ -936,7 +937,7 @@ msgstr "Ingrese contraseña para la cuenta administrador del servidor Kolab."
 msgid "Password mismatch, or null password, please correct."
 msgstr "La contraseña no coinicide, o está vacía, por favor corrija."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Contraseña:"
 
@@ -976,180 +977,219 @@ msgstr "Instalando servidor Kolab en su sistema..."
 msgid "Configuring Kolab server on your system..."
 msgstr "Configurando servidor Kolab en su sistema..."
 
-#: ../ldap_wizard/Ldap.pm:26
-msgid "Configure OpenLDAP Server "
-msgstr "Configurando el servidor de OpenLDAP "
-
-#: ../ldap_wizard/Ldap.pm:80
-msgid "Configure OpenLDAP server"
-msgstr "Configurar el servidor OpenLDAP"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Asistente de Ldap"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
-msgstr "Añadir usuario en servidor OpenLDAP"
+#: ../ldap_wizard/Ldap.pm:85
+msgid "Show Ldap configuration"
+msgstr "Mostrar la configuración Ldap"
 
 #: ../ldap_wizard/Ldap.pm:86
-msgid "OpenLDAP configuration wizard"
-msgstr "Asistente de configuración OpenLDAP"
+msgid "Add user in Ldap server"
+msgstr "Añadir usuario en servidor Ldap"
 
-#: ../ldap_wizard/Ldap.pm:86
-msgid "Setup an OpenLDAP server."
-msgstr "Configurar un servidor OpenLDAP."
+#: ../ldap_wizard/Ldap.pm:87
+msgid "Delete Ldap configuration"
+msgstr "Borrar la configuración Ldap"
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:93
-msgid "You must setup an OpenLDAP server first."
-msgstr "Debe primero configurar un servidor OpenLDAP."
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
+msgid "Ldap configuration wizard"
+msgstr "Asistente de configuración Ldap"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
+msgid "You must setup an Ldap server first."
+msgstr "Debe primero configurar un servidor Ldap."
+
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Su elección:"
 
-#: ../ldap_wizard/Ldap.pm:110
-msgid "Save an existing configuration"
-msgstr "Guardar una configuración existente."
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Delete configuration"
+msgstr "Borrar la configuración"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr "Añadiendo usuario LDAP"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 msgid "User Created in: "
 msgstr "Usuario creado en: "
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Nombre:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 msgid "Name:"
 msgstr "Nombre:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Nombre de usuario:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Contenedor de usuarios:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr "Debe ingresar un nombre válido."
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr "Debe ingresar un apellido válido."
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr "Debe ingresar un nombre de usuario válido."
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 msgid "LDAP User Password"
 msgstr "Contraseña de usuario LDAP"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr "las contraseñas no coinciden"
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 msgid "Password (again):"
 msgstr "Contraseña (de nuevo):"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr "Debe ingresar una contraseña para LDAP."
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Las contraseñas no coinciden"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr "Administrador"
+
+#: ../ldap_wizard/Ldap.pm:183
 msgid "Configuring LDAP Server"
 msgstr "Configurando servidor LDAP"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
-msgstr ""
-"Sufijo LDAP:\n"
-" ejemplo: dc=ejemplo,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Domain name: "
+msgstr "Nombre de dominio: "
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
+msgstr "Administrador LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Directorio TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
-"Administrador LDAP:\n"
-" ejemplo: cn=admin,dc=ejemplo,dc=com\n"
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Directorio TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr "Administrador LDAP:"
+
+#: ../ldap_wizard/Ldap.pm:188
 msgid "LDAP Password:"
 msgstr "Contraseña LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 msgid "LDAP Password (again):"
 msgstr "Contraseña LDAP (de nuevo):"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
-msgstr "Debe ingresar un sufijo para LDAP."
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
+msgstr "Administrador"
+
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Debe ingresar un nombre válido."
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr "Confirmación del usuario a crear"
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 msgid "First name:"
 msgstr "Nombre:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Nombre de usuario:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr "Crear en:"
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Confirmación de la información para crear el servidor LDAP"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr "Organización LDAP:"
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr "Administrador LDAP:"
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 msgid "Users Container:"
 msgstr "Contenedor de usuarios:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "El asistente configuró LDAP exitosamente."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr "Usuario añadido con éxito"
 
-#: ../ldap_wizard/Ldap.pm:211
-msgid "The wizard successfully added a user in LDAP"
-msgstr "El asistente añadió exitosamente un usuario en LDAP"
+#: ../ldap_wizard/Ldap.pm:256
+msgid "Error when adding user in Ldap datase"
+msgstr "Error al añadir usuario en servidor Ldap"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr "Servidor ya configurado"
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr "Su servidor OpenLDAP ya a sido configurado con el asistente\n"
+#: ../ldap_wizard/Ldap.pm:269
+msgid "You have already configured your Ldap Server"
+msgstr "Su servidor Ldap ya ha sido configurado"
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, perl-format
 msgid "%s Failed"
 msgstr "%s falló"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 msgid "Error!"
 msgstr "¡Error!"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr "Imposible conectarse a %s"
@@ -1958,7 +1998,7 @@ msgstr "Añadir una imagen de arranque"
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "La descripción PXE se usa para explicar el rol de una imagen de arranque, "
@@ -2110,7 +2150,7 @@ msgstr ""
 "proceso de instalación."
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr "Ramsize: ajustar el parámetro ramsize en el disco de arranque."
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2762,6 +2802,56 @@ msgstr "Servidor Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurando su sistema como un servidor Apache ..."
 
+#~ msgid "Configure Ldap server"
+#~ msgstr "Configurar el servidor Ldap"
+
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Configurando el servidor de OpenLDAP "
+
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Configurar el servidor OpenLDAP"
+
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Añadir usuario en servidor OpenLDAP"
+
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Asistente de configuración OpenLDAP"
+
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Configurar un servidor OpenLDAP."
+
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Debe primero configurar un servidor OpenLDAP."
+
+#~ msgid "Save an existing configuration"
+#~ msgstr "Guardar una configuración existente."
+
+#~ msgid ""
+#~ "LDAP Suffix:\n"
+#~ " ex: dc=example,dc=com\n"
+#~ msgstr ""
+#~ "Sufijo LDAP:\n"
+#~ " ejemplo: dc=ejemplo,dc=com\n"
+
+#~ msgid ""
+#~ "LDAP Administrator:\n"
+#~ " ex: cn=admin,dc=example,dc=com\n"
+#~ msgstr ""
+#~ "Administrador LDAP:\n"
+#~ " ejemplo: cn=admin,dc=ejemplo,dc=com\n"
+
+#~ msgid "You must enter a suffix for LDAP."
+#~ msgstr "Debe ingresar un sufijo para LDAP."
+
+#~ msgid "Organisation LDAP:"
+#~ msgstr "Organización LDAP:"
+
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "El asistente añadió exitosamente un usuario en LDAP"
+
+#~ msgid "You have already configured your OpenLDAP Server with drakwizard\n"
+#~ msgstr "Su servidor OpenLDAP ya ha sido configurado con el asistente\n"
+
 #~ msgid "LDAP User Add"
 #~ msgstr "Añadir usuario LDAP"
 
diff --git a/po/et.po b/po/et.po
index 7e147653..2e0f2231 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-08-25 12:04+0200\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -40,7 +40,7 @@ msgstr "Viga."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -129,12 +129,13 @@ msgstr "Te kasutate DHCP-d, server ei pruugi Teie seadistusega töötada."
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Viga"
 
@@ -543,7 +544,7 @@ msgid "Domainname:"
 msgstr "Domeeninimi:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Nõustaja lisas edukalt DNS-ile masina."
 
 #: ../dns_wizard/Bind.pm:256
@@ -916,7 +917,7 @@ msgstr "Sisestage Kolabi serveri haldurikonto parool."
 msgid "Password mismatch, or null password, please correct."
 msgstr "Parool ei ole õige või jäi andmata, palun parandage viga."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Parool:"
 
@@ -957,180 +958,227 @@ msgstr "Kolabi serveri paigaldamine Teie süsteemi..."
 msgid "Configuring Kolab server on your system..."
 msgstr "Teie süsteemi seadistamine Kolabi serveriks..."
 
-#: ../ldap_wizard/Ldap.pm:26
-msgid "Configure OpenLDAP Server "
-msgstr "OpenLDAP serveri seadistamine "
-
-#: ../ldap_wizard/Ldap.pm:80
-msgid "Configure OpenLDAP server"
-msgstr "OpenLDAP serveri seadistamine"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Ldap nõustaja"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
-msgstr "Kasutaja lisamine OpenLDAP serverile"
+#: ../ldap_wizard/Ldap.pm:85
+#, fuzzy
+msgid "Show Ldap configuration"
+msgstr "Ldap seadistuste nõustaja"
 
 #: ../ldap_wizard/Ldap.pm:86
-msgid "OpenLDAP configuration wizard"
-msgstr "OpenLDAP seadistuste nõustaja"
+msgid "Add user in Ldap server"
+msgstr "Kasutaja lisamine Ldap serverile"
 
-#: ../ldap_wizard/Ldap.pm:86
-msgid "Setup an OpenLDAP server."
-msgstr "OpenLDAP serveri seadistamine."
+#: ../ldap_wizard/Ldap.pm:87
+#, fuzzy
+msgid "Delete Ldap configuration"
+msgstr "Ldap seadistuste nõustaja"
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:93
-msgid "You must setup an OpenLDAP server first."
-msgstr "Kõigepealt tuleb OpenLDAP server seadistada."
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
+msgid "Ldap configuration wizard"
+msgstr "Ldap seadistuste nõustaja"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
+msgid "You must setup an Ldap server first."
+msgstr "Kõigepealt tuleb Ldap server seadistada."
+
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Teie valik:"
 
-#: ../ldap_wizard/Ldap.pm:110
-msgid "Save an existing configuration"
-msgstr "Olemasoleva seadistuse salvestamine"
+#: ../ldap_wizard/Ldap.pm:132
+#, fuzzy
+msgid "Delete configuration"
+msgstr "Paigaldusserveri seadistus"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr "LDAP kasutaja lisamine"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 msgid "User Created in: "
 msgstr "Kasutaja loomine asukohta: "
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Eesnimi:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Kasutajatunnus:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Kasutajate konteiner:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr "Anda tuleb kehtiv eesnimi."
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr "Anda tuleb kehtiv nimi."
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr "Anda tuleb kehtiv kasutajatunnus."
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 msgid "LDAP User Password"
 msgstr "LDAP kasutaja parool"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr "paroolid peavad klappima"
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 msgid "Password (again):"
 msgstr "Parool teist korda:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr "LDAP vajab parooli andmist."
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Paroolid ei klapi"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Adrministrator"
+msgstr "LDAP administraator"
+
+#: ../ldap_wizard/Ldap.pm:183
 msgid "Configuring LDAP Server"
 msgstr "LDAP serveri seadistamine"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
-msgstr ""
-"LDAP sufiks:\n"
-" nt.: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Domeeninimi:"
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
+msgstr "LDAP administraator"
+
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "TFTP kataloog:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
-"LDAP administraator:\n"
-" nt.: cn=admin,dc=example,dc=com\n"
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "TFTP kataloog:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr "LDAP administraator:"
+
+#: ../ldap_wizard/Ldap.pm:188
 msgid "LDAP Password:"
 msgstr "LDAP parool:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 msgid "LDAP Password (again):"
 msgstr "LDAP parool teist korda:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
-msgstr "LDAP vajab sufiksit."
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:192
+#, fuzzy
+msgid "Administrator"
+msgstr "LDAP administraator"
+
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Anda tuleb kehtiv eesnimi."
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr "Kasutaja loomise kinnitus"
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 msgid "First name:"
 msgstr "Eesnimi:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Kasutajatunnus:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr "Luuakse asukohta:"
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 msgid "Confirmation Information for create an LDAP server"
 msgstr "LDAP serveri loomise kinnitus"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr "LDAP organisatsioon:"
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr "LDAP administraator:"
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 msgid "Users Container:"
 msgstr "Kasutajate konteiner:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "Nõustaja seadistas edukalt Teie LDAP serveri."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr "Kasutaja edukalt lisatud"
 
-#: ../ldap_wizard/Ldap.pm:211
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Nõustaja lisas edukalt kasutaja LDAP-ile"
+#: ../ldap_wizard/Ldap.pm:256
+#, fuzzy
+msgid "Error when adding user in Ldap datase"
+msgstr "Kasutaja lisamine Ldap serverile"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr "Server on juba seadistatud"
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr "Te olete juba seadistanud oma OpenLDAP serveri Drakwizardi abil\n"
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Te olete juba seadistanud oma Ldap serveri Drakwizardi abil\n"
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, perl-format
 msgid "%s Failed"
 msgstr "%s ebaõnnestus"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 msgid "Error!"
 msgstr "Viga!"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr "Ühendus %s-ga ebaõnnestus"
@@ -1920,7 +1968,7 @@ msgstr "Alglaadimistõmmise lisamine"
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "PXE kirjeldust kasutatakse alglaadimistõmmise rolli selgitamiseks, nt. "
@@ -2059,7 +2107,7 @@ msgid ""
 msgstr "Kliendi võrguliides: millise liidese kaudu klient paigaldada."
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr "RAM-i suurus: laadeketta RAM-i suuruse täpsustamine."
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2693,6 +2741,56 @@ msgstr "Apache server"
 msgid "Configuring your system as Apache server ..."
 msgstr "Süsteemi seadistamine Apache serveriks..."
 
+#~ msgid "Configure Ldap server"
+#~ msgstr "Ldap serveri seadistamine"
+
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "OpenLDAP serveri seadistamine "
+
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "OpenLDAP serveri seadistamine"
+
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Kasutaja lisamine OpenLDAP serverile"
+
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "OpenLDAP seadistuste nõustaja"
+
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "OpenLDAP serveri seadistamine."
+
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Kõigepealt tuleb OpenLDAP server seadistada."
+
+#~ msgid "Save an existing configuration"
+#~ msgstr "Olemasoleva seadistuse salvestamine"
+
+#~ msgid ""
+#~ "LDAP Suffix:\n"
+#~ " ex: dc=example,dc=com\n"
+#~ msgstr ""
+#~ "LDAP sufiks:\n"
+#~ " nt.: dc=example,dc=com\n"
+
+#~ msgid ""
+#~ "LDAP Administrator:\n"
+#~ " ex: cn=admin,dc=example,dc=com\n"
+#~ msgstr ""
+#~ "LDAP administraator:\n"
+#~ " nt.: cn=admin,dc=example,dc=com\n"
+
+#~ msgid "You must enter a suffix for LDAP."
+#~ msgstr "LDAP vajab sufiksit."
+
+#~ msgid "Organisation LDAP:"
+#~ msgstr "LDAP organisatsioon:"
+
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Nõustaja lisas edukalt kasutaja LDAP-ile"
+
+#~ msgid "You have already configured your OpenLDAP Server with drakwizard\n"
+#~ msgstr "Te olete juba seadistanud oma OpenLDAP serveri Drakwizardi abil\n"
+
 #~ msgid "Add Kerberos"
 #~ msgstr "Kerberose lisamine"
 
diff --git a/po/eu.po b/po/eu.po
index b1f4def0..84a1a7e0 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-08-19 12:44+0200\n"
 "Last-Translator: Iñigo Salvador Azurmend <xalba@euskalnet.net>\n"
 "Language-Team: EUSKARA <itzulpena@euskalgnu.org>\n"
@@ -44,7 +44,7 @@ msgstr "Errorea."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -134,12 +134,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Errorea"
 
@@ -554,7 +555,7 @@ msgid "Domainname:"
 msgstr "Domeinu-izena:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Morroiak behar bezala gehitu du ostalaria zure DNSan."
 
 #: ../dns_wizard/Bind.pm:256
@@ -943,7 +944,7 @@ msgstr "Sartu Kolab zerbitzariaren kudeatzaile-kontuaren pasahitza."
 msgid "Password mismatch, or null password, please correct."
 msgstr "Pasahitza ez dator bat edo nulua da, zuzendu."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Pasahitza:"
 
@@ -984,186 +985,230 @@ msgstr "Kolab zerbitzaria sisteman instalatzen..."
 msgid "Configuring Kolab server on your system..."
 msgstr "Kolab zerbitzaria sisteman konfiguratzen..."
 
-#: ../ldap_wizard/Ldap.pm:26
-msgid "Configure OpenLDAP Server "
-msgstr "Konfigurazioa OpenLDAP Zerbitzaria "
-
-#: ../ldap_wizard/Ldap.pm:80
-msgid "Configure OpenLDAP server"
-msgstr "Konfiguratu OpenLDAP zerbitzaria"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Ldapren morroia"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
-msgstr "Erantsi erabiltzailea OpenLDAP zerbitzarian"
+#: ../ldap_wizard/Ldap.pm:85
+#, fuzzy
+msgid "Show Ldap configuration"
+msgstr "Ldap konfigurazio morroia"
 
 #: ../ldap_wizard/Ldap.pm:86
-msgid "OpenLDAP configuration wizard"
-msgstr "OpenLDAP konfigurazio morroia"
+msgid "Add user in Ldap server"
+msgstr "Erantsi erabiltzailea Ldap zerbitzarian"
 
-#: ../ldap_wizard/Ldap.pm:86
-msgid "Setup an OpenLDAP server."
-msgstr "Ezarri OpenLDAP zerbitzari bat."
+#: ../ldap_wizard/Ldap.pm:87
+#, fuzzy
+msgid "Delete Ldap configuration"
+msgstr "Ldap konfigurazio morroia"
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:93
-msgid "You must setup an OpenLDAP server first."
-msgstr "OpenLDAP zerbitzari bat ezarri behar duzu aurrena."
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
+msgid "Ldap configuration wizard"
+msgstr "Ldap konfigurazio morroia"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
+msgid "You must setup an Ldap server first."
+msgstr "Ldap zerbitzari bat ezarri behar duzu aurrena."
+
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Zure aukera:"
 
-#: ../ldap_wizard/Ldap.pm:110
-msgid "Save an existing configuration"
-msgstr "Gorde dagoen konfigurazio bat"
+#: ../ldap_wizard/Ldap.pm:132
+#, fuzzy
+msgid "Delete configuration"
+msgstr "Instalazio-zerbitzariaren konfigurazioa"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 #, fuzzy
 msgid "LDAP Adding User"
 msgstr "LDAP Erabiltzailea Erantsi"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Erabiltzailea Sortu hemen: "
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Izena:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 msgid "Name:"
 msgstr "Izena:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Erabiltzaile-izena:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Erabiltzailea Sortu hemen: "
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr "Izen balioduna sartu behar duzu."
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr "Izen balioduna sartu behar duzu."
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr "Erabiltzaile Izen balioduna sartu behar duzu."
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 msgid "LDAP User Password"
 msgstr "LDA Erabiltzaile Pasahitza"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr "Pasahitzak bat etorri behar dute"
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 msgid "Password (again):"
 msgstr "Pasahitza (berriro):"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr "LDAPentzako pasahitza sartu behar duzu."
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Pasahitzak ez datoz bat"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Adrministrator"
+msgstr "LDAP Administratzailea"
+
+#: ../ldap_wizard/Ldap.pm:183
 msgid "Configuring LDAP Server"
 msgstr "LDAP Zerbitzaria Konfiguratzen"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
-msgstr ""
-"LDAP Atzizkia:\n"
-" adib: dc=adibidea,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Domeinu-izena:"
 
-#: ../ldap_wizard/Ldap.pm:159
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+msgid "LDAP Administrator"
+msgstr "LDAP Administratzailea"
+
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "TFTP direktorioa:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
-"LDAP Atzizkia:\n"
-" adib: dc=adibidea,dc=com\n"
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "TFTP direktorioa:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+#, fuzzy
+msgid "LDAP Administrator:"
+msgstr "LDAP Administratzailea:"
+
+#: ../ldap_wizard/Ldap.pm:188
 msgid "LDAP Password:"
 msgstr "LDAP Pasahitza:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 msgid "LDAP Password (again):"
 msgstr "LDAP Pasahitza (berriro):"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
-msgstr "LDAPentzako atzizki bat sartu behar duzu."
+#: ../ldap_wizard/Ldap.pm:192
+#, fuzzy
+msgid "Administrator"
+msgstr "LDAP Administratzailea"
+
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Izen balioduna sartu behar duzu."
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr "Sortu beharreko erabiltzailearen onespena"
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 msgid "First name:"
 msgstr "Izena:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Erabiltzaile-izena:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr "Sortu hemen:"
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "LDAP zerbitzaria sortzeko Baieztapen Informazioa"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-#, fuzzy
-msgid "Administrator LDAP:"
-msgstr "LDAP Administratzailea:"
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Erabiltzailea Sortu hemen: "
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "Morroiak behar bezala konfiguratu du LDAP."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr "Erabiltzailea arrakastaz erantsia"
 
-#: ../ldap_wizard/Ldap.pm:211
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Morroiak arrakastaz erantsi du erabiltzailea LDAPn"
+#: ../ldap_wizard/Ldap.pm:256
+#, fuzzy
+msgid "Error when adding user in Ldap datase"
+msgstr "Erantsi erabiltzailea Ldap zerbitzarian"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Morroiak behar bezala konfiguratu du zure Sambaren zerbitzaria."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, perl-format
 msgid "%s Failed"
 msgstr "%s-k huts egin du"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 msgid "Error!"
 msgstr "Akatsa!"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr "Ezin da %s-ra konektatu"
@@ -1964,7 +2009,7 @@ msgstr "Gehitu abioko irudia"
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 #, fuzzy
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "PXE azalpena abioko irudiaren araua azaltzeko erabiltzen da, adibidez: "
@@ -2112,7 +2157,7 @@ msgstr ""
 "interfazea."
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr "Ramsize: abioko diskoko ramsize parametroa egokitzen du."
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2763,6 +2808,51 @@ msgstr "Apache zerbitzaria"
 msgid "Configuring your system as Apache server ..."
 msgstr "Sistema Apache zerbitzari gisa konfiguratzen..."
 
+#~ msgid "Configure Ldap server"
+#~ msgstr "Konfiguratu Ldap zerbitzaria"
+
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Konfigurazioa OpenLDAP Zerbitzaria "
+
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Konfiguratu OpenLDAP zerbitzaria"
+
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Erantsi erabiltzailea OpenLDAP zerbitzarian"
+
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "OpenLDAP konfigurazio morroia"
+
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Ezarri OpenLDAP zerbitzari bat."
+
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "OpenLDAP zerbitzari bat ezarri behar duzu aurrena."
+
+#~ msgid "Save an existing configuration"
+#~ msgstr "Gorde dagoen konfigurazio bat"
+
+#~ msgid ""
+#~ "LDAP Suffix:\n"
+#~ " ex: dc=example,dc=com\n"
+#~ msgstr ""
+#~ "LDAP Atzizkia:\n"
+#~ " adib: dc=adibidea,dc=com\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "LDAP Administrator:\n"
+#~ " ex: cn=admin,dc=example,dc=com\n"
+#~ msgstr ""
+#~ "LDAP Atzizkia:\n"
+#~ " adib: dc=adibidea,dc=com\n"
+
+#~ msgid "You must enter a suffix for LDAP."
+#~ msgstr "LDAPentzako atzizki bat sartu behar duzu."
+
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Morroiak arrakastaz erantsi du erabiltzailea LDAPn"
+
 #~ msgid "LDAP User Add"
 #~ msgstr "LDAP Erabiltzailea Erantsi"
 
diff --git a/po/fa.po b/po/fa.po
index 4a87b30b..0b6c0ca3 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-fa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-04-01 22:07+0430\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
 "Language-Team: Persian <fa@li.org>\n"
@@ -41,7 +41,7 @@ msgstr "خطا."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -129,12 +129,13 @@ msgstr "شما در dhcp هستید, کارگزار ممکن است با پیک�
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "خطا"
 
@@ -548,7 +549,7 @@ msgid "Domainname:"
 msgstr "نام‌دامنه:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "جادوگر با موفقیت میزبان را به DNS شما اضافه کرد."
 
 #: ../dns_wizard/Bind.pm:256
@@ -934,7 +935,7 @@ msgstr "گذرواژه‌‌ی برای حساب مدیر کارگزار Kolab �
 msgid "Password mismatch, or null password, please correct."
 msgstr "عدم تطابق گذرواژه، یا هیچ گذرواژه، لطفا درستش کنید."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "گذرواژه:"
 
@@ -974,196 +975,238 @@ msgstr "در حال نصب کردن کارگزار Kolab بر سیستم شما.
 msgid "Configuring Kolab server on your system..."
 msgstr "در حال پیکربندی کارگزار Kolab بر سیستم شما..."
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "پیکربندی کارگزار DHCP"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "جادوگر سامبا"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "پیکربندی کارگزار DHCP"
+msgid "Show Ldap configuration"
+msgstr "جادوگر پیکربندی LDAP"
 
-#: ../ldap_wizard/Ldap.pm:81
+#: ../ldap_wizard/Ldap.pm:86
 #, fuzzy
-msgid "Add user in OpenLDAP server"
+msgid "Add user in Ldap server"
 msgstr "افزودن - افزودن ورودی در کارگزار LDAP"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "جادوگر پیکربندی LDAP"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "گذاردن یک کارگزار PXE.‌"
+msgid "Ldap configuration wizard"
+msgstr "جادوگر پیکربندی LDAP"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "گذاردن یک کارگزار PXE.‌"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "برداشتن میزبانی از پیکربندی موجود DNS."
+msgid "Delete configuration"
+msgstr "پیکربندی کارگزار نصب"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "افزایش کاربر"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "نام کوچک:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "نام کاربر:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "نام کاربر:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "محتوی:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "گذرواژه"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "گذرواژه دوباره:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "گذرواژه‌ها مطابقت نمی‌کنند"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "پیکربندی سامبا"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "نام‌دامنه:"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "شاخه‌ی TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "شاخه‌ی TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "گذرواژه:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "گذرواژه دوباره:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "شاخه‌ی TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "نام کوچک:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "نام کاربر:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "پیکربندی کارگزار DHCP"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "محتوی:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "جادوگر با موفقیت کارگزار LDAP را پیکربندی کرد."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 #, fuzzy
 msgid "Successfully added User"
 msgstr "با موفقیت داده‌ها اضافه گردید"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:256
 #, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "جادوگر با موفقیت ورودی را در ldap اضافه کرد"
+msgid "Error when adding user in Ldap datase"
+msgstr "افزودن - افزودن ورودی در کارگزار LDAP"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "جادوگر با موفقیت کارگزار سامبای شما را پیکربندی کرد."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "شکست خورد"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "خطا"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1951,7 +1994,7 @@ msgstr "افزودن تصویر آغازگری"
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 #, fuzzy
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "توضیح PXE برای تشریح قاعده‌ی تصویر آغازگری، که: تصویر ماندرایک، تصویر کوکر "
@@ -2094,7 +2137,7 @@ msgid ""
 msgstr "واسط کارگیر شبکه: واسط شبکه‌ای استفاده شده برای پردازش نصب"
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr "Ramsize: میزان کردن پارامتر ramsize بر دیسک آغازگری."
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2727,6 +2770,42 @@ msgstr "کارگزار آپاچی"
 msgid "Configuring your system as Apache server ..."
 msgstr "پیکربندی سیستم شما مانند کارگزار آپاچی ..."
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "پیکربندی کارگزار DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "پیکربندی کارگزار DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "پیکربندی کارگزار DHCP"
+
+#, fuzzy
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "افزودن - افزودن ورودی در کارگزار LDAP"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "جادوگر پیکربندی LDAP"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "گذاردن یک کارگزار PXE.‌"
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "گذاردن یک کارگزار PXE.‌"
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "برداشتن میزبانی از پیکربندی موجود DNS."
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "جادوگر با موفقیت ورودی را در ldap اضافه کرد"
+
 #~ msgid ""
 #~ "PXE name: the name displayed in PXE menu (please provide an ASCII word or "
 #~ "a number, without spaces)"
diff --git a/po/fi.po b/po/fi.po
index 13b23c80..55a9632e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-fi - Mandrakelinux  10.0 Release\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-04-01 18:19+0300\n"
 "Last-Translator: Thomas Backlund <tmb@mandrake.org>\n"
 "Language-Team: Finnish <cooker-i18n@mandrakelinux.xom>\n"
@@ -47,7 +47,7 @@ msgstr "Virhe."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -136,12 +136,13 @@ msgstr "Käytät DHCP-osoitetta, voi olla ettei palvelin toimi asetuksillasi."
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Virhe"
 
@@ -555,7 +556,7 @@ msgid "Domainname:"
 msgstr "Verkkoalue:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Velho lisäsi koneen DNS-palveluun onnistuneesti."
 
 #: ../dns_wizard/Bind.pm:256
@@ -940,7 +941,7 @@ msgstr "Anna Kolab-palvelimen hallintatilin salasanaa."
 msgid "Password mismatch, or null password, please correct."
 msgstr "Salasana ei täsmää, tai tyhjää salasanaa, ole hyvä ja korjaa."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Salasana:"
 
@@ -980,196 +981,238 @@ msgstr "Asennetaan Kolab-palvelinta järjestelmääsi..."
 msgid "Configuring Kolab server on your system..."
 msgstr "Asetetaan järjestelmäsi Kolab-palvelinta..."
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Asetetaan DHCP-palvelin"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Ldap velho"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Asetetaan DHCP-palvelin"
+msgid "Show Ldap configuration"
+msgstr "LDAP asetusvelho"
 
-#: ../ldap_wizard/Ldap.pm:81
+#: ../ldap_wizard/Ldap.pm:86
 #, fuzzy
-msgid "Add user in OpenLDAP server"
+msgid "Add user in Ldap server"
 msgstr "Lisää - Lisää tietue LDAP palvelimeen"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "LDAP asetusvelho"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Aseta PXE-palvelinta."
+msgid "Ldap configuration wizard"
+msgstr "LDAP asetusvelho"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "Aseta PXE-palvelinta."
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "Poista kone olemassaolevasta DNS-asetuksesta."
+msgid "Delete configuration"
+msgstr "Asenna palvelinasetukset"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Käyttäjänimi:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Etunimi:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Käyttäjänimi:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Käyttäjänimi:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Säiliö:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Salasana"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Salasana uudestaan:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Salasanat poikkeavat toisistaan"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Asetetaan Samba"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Verkkoalue:"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "TFTP hakemisto:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "TFTP hakemisto:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Salasana:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Salasana uudestaan:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "TFTP hakemisto:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Etunimi:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Käyttäjänimi:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Asetetaan DHCP-palvelin"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Säiliö:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "Velho asetti LDAP onnistuneesti."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 #, fuzzy
 msgid "Successfully added User"
 msgstr "Tiedot lisätty onnistuneesti"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:256
 #, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Velho lisäsi tietueen LDAP:iin onnistuneesti."
+msgid "Error when adding user in Ldap datase"
+msgstr "Lisää - Lisää tietue LDAP palvelimeen"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Velho asetti Samba-palvelimesi onnistuneesti."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Epäonnistui"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Virhe"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1968,7 +2011,7 @@ msgstr "Lisää käynnistyskuvatiedosto"
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 #, fuzzy
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "PXE selitys käytetään käynnistyskuvatiedostojen selityksenä, esim. Mandrake "
@@ -2119,7 +2162,7 @@ msgid ""
 msgstr "Verkkoasiakas liityntä: minkä liitynnän kautta haluat asentaa."
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr "Muistikoko: aseta muistikoon käynnistyslevykkeellä."
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2759,6 +2802,42 @@ msgstr "Apache palvelin"
 msgid "Configuring your system as Apache server ..."
 msgstr "Asetetaan järjestelmäsi Apache-palvelimeksi ..."
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "Asetetaan DHCP-palvelin"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Asetetaan DHCP-palvelin"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Asetetaan DHCP-palvelin"
+
+#, fuzzy
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Lisää - Lisää tietue LDAP palvelimeen"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "LDAP asetusvelho"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Aseta PXE-palvelinta."
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Aseta PXE-palvelinta."
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "Poista kone olemassaolevasta DNS-asetuksesta."
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Velho lisäsi tietueen LDAP:iin onnistuneesti."
+
 #~ msgid ""
 #~ "PXE name: the name displayed in PXE menu (please provide an ASCII word or "
 #~ "a number, without spaces)"
diff --git a/po/fr.po b/po/fr.po
index d12c4951..95d6c220 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-09-03 11:14+0200\n"
 "Last-Translator: Lecureuil Nicolas <n1c0l4s.l3@wanadoo.fr>\n"
 "Language-Team: francais <fr@li.org>\n"
@@ -48,7 +48,7 @@ msgstr "Erreur."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -139,12 +139,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Erreur"
 
@@ -566,7 +567,7 @@ msgid "Domainname:"
 msgstr "Nom du domaine :"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "L'assistant a ajouté avec succès le client au DNS."
 
 #: ../dns_wizard/Bind.pm:256
@@ -963,7 +964,7 @@ msgid "Password mismatch, or null password, please correct."
 msgstr ""
 "Le mot de passe ne correspond pas, ou a une valeur nulle. Corrigez SVP."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Mot de Passe :"
 
@@ -1005,182 +1006,223 @@ msgstr "Installation du serveur Kolab sur votre système..."
 msgid "Configuring Kolab server on your system..."
 msgstr "Configuration du serveur Kolab sur votre système..."
 
-#: ../ldap_wizard/Ldap.pm:26
-msgid "Configure OpenLDAP Server "
-msgstr "Configurer serveur OpenLDAP "
-
-#: ../ldap_wizard/Ldap.pm:80
-msgid "Configure OpenLDAP server"
-msgstr "Configurer serveur OpenLDAP"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Assistant Ldap"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
-msgstr "Ajouter un utilisateur au serveur OpenLDAP"
+#: ../ldap_wizard/Ldap.pm:85
+msgid "Show Ldap configuration"
+msgstr "Montrer la configuration Ldap"
 
 #: ../ldap_wizard/Ldap.pm:86
-msgid "OpenLDAP configuration wizard"
-msgstr "Assistant de configuration OpenLDAP"
+msgid "Add user in Ldap server"
+msgstr "Ajouter un utilisateur au serveur Ldap"
 
-#: ../ldap_wizard/Ldap.pm:86
-msgid "Setup an OpenLDAP server."
-msgstr "Configurer un serveur OpenLDAP."
+#: ../ldap_wizard/Ldap.pm:87
+msgid "Delete Ldap configuration"
+msgstr "Effacer la configuration Ldap"
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
+msgid "Ldap configuration wizard"
+msgstr "Assistant de configuration Ldap"
 
-#: ../ldap_wizard/Ldap.pm:93
-msgid "You must setup an OpenLDAP server first."
-msgstr "Vous devez d'abord configurer un serveur OpenLDAP."
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
+msgid "You must setup an Ldap server first."
+msgstr "Vous devez d'abord configurer un serveur Ldap."
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Votre choix :"
 
-#: ../ldap_wizard/Ldap.pm:110
-msgid "Save an existing configuration"
-msgstr "Sauvegarder une configuration existante"
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Delete configuration"
+msgstr "Effacer la configuration"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr "Ajout d'utilisateurs LDAP"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 msgid "User Created in: "
 msgstr "Utilisateur crée dans :"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Prénom :"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 msgid "Name:"
 msgstr "Nom :"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Nom d'utilisateur :"
+# non breaking space before colon in french
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Contenant :"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr "Vous devez entrer un prénom valide."
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr "Vous devez entrer un nom valide."
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr "Vous devez entrer un nom d'utilisateur valide."
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 msgid "LDAP User Password"
 msgstr "Mot de passe de l'utilisateur LDAP :"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr "Les mots de passe doivent correspondre"
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 msgid "Password (again):"
 msgstr "Mot de passe (encore une fois) :"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr "Vous devez entrer un mot de passe pour LDAP."
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Les mots de passe ne sont pas identiques"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr "Administrateur"
+
+#: ../ldap_wizard/Ldap.pm:183
 msgid "Configuring LDAP Server"
 msgstr "Configuration du serveur LDAP"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
-msgstr ""
-"Suffixe LDAP :\n"
-" ex : dc=exemple,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Domain name: "
+msgstr "Nom du domaine : "
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
+msgstr "Administrateur LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Répertoire TFTP :"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
-"Administrateur LDAP :\n"
-" ex : cn=admin,dc=exemple,dc=com\n"
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Répertoire TFTP :"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr "Administrateur LDAP :"
+
+#: ../ldap_wizard/Ldap.pm:188
 msgid "LDAP Password:"
 msgstr "Mot de passe LDAP :"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 msgid "LDAP Password (again):"
 msgstr "Mot de passe LDAP (encore une fois) :"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
-msgstr "Vous devez entrer un suffix pour LDAP"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
+msgstr "Administrateur"
+
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Vous devez entrer un prénom valide."
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr "Confirmation de l'utilisateur a créer"
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 msgid "First name:"
 msgstr "Prénom :"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Nom d'utilisateur :"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr "Créer dans :"
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Confirmation des informations afin de créer un serveur LDAP"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr "Organisation LDAP :"
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr "Administrateur LDAP :"
-
 # non breaking space before colon in french
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Contenant :"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "L'assistant a configuré LDAP avec succès."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr "Utilisateur ajouté avec succès"
 
-#: ../ldap_wizard/Ldap.pm:211
-msgid "The wizard successfully added a user in LDAP"
-msgstr "L'assistant a ajouté avec succès l'utilisateur dans LDAP."
+#: ../ldap_wizard/Ldap.pm:256
+#, fuzzy
+msgid "Error when adding user in Ldap datase"
+msgstr "Ajouter un utilisateur au serveur Ldap"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr "Serveur déjà configuré"
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr "Vous avez déjà configuré votre serveur OpenLDAP avec drakwizard\n"
+#: ../ldap_wizard/Ldap.pm:269
+msgid "You have already configured your Ldap Server"
+msgstr "Vous avez déjà configuré votre serveur Ldap"
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, perl-format
 msgid "%s Failed"
 msgstr "%s Échec"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 msgid "Error!"
 msgstr "Erreur !"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr "Impossible de se connecter à %s"
@@ -1993,7 +2035,7 @@ msgstr "Ajouter une image de démarrage"
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "La description PXE est utilise pour définir le rôle de l'image, par "
@@ -2148,7 +2190,7 @@ msgstr ""
 "doit être installée."
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr "Taille de la RAM : ajuste la taille de la RAM sur votre disque."
 
 # mistake in msgid whith-> with
@@ -2258,7 +2300,9 @@ msgstr "Veuillez en indiquer un autre."
 
 #: ../pxe_wizard/Pxe.pm:237
 msgid "The wizard will now prepare all default files to set your PXE server"
-msgstr "L'assistant va maintenant préparer tous les fichiers nécessaire afin de configurer votre serveur PXE"
+msgstr ""
+"L'assistant va maintenant préparer tous les fichiers nécessaire afin de "
+"configurer votre serveur PXE"
 
 #: ../pxe_wizard/Pxe.pm:239
 msgid "TFTP directory:"
@@ -2818,3 +2862,71 @@ msgstr "Serveur Apache"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurer votre système en tant que serveur Apache ..."
+
+#~ msgid "Configure Ldap server"
+#~ msgstr "Configurer serveur Ldap"
+
+#~ msgid "The wizard successfully added host in your DNS."
+#~ msgstr "L'assistant a ajouté avec succès le client au DNS."
+
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Configurer serveur OpenLDAP "
+
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Configurer serveur OpenLDAP"
+
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Ajouter un utilisateur au serveur OpenLDAP"
+
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Assistant de configuration OpenLDAP"
+
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Configurer un serveur OpenLDAP."
+
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Vous devez d'abord configurer un serveur OpenLDAP."
+
+#~ msgid "Save an existing configuration"
+#~ msgstr "Sauvegarder une configuration existante"
+
+#~ msgid ""
+#~ "LDAP Suffix:\n"
+#~ " ex: dc=example,dc=com\n"
+#~ msgstr ""
+#~ "Suffixe LDAP :\n"
+#~ " ex : dc=exemple,dc=com\n"
+
+#~ msgid ""
+#~ "LDAP Administrator:\n"
+#~ " ex: cn=admin,dc=example,dc=com\n"
+#~ msgstr ""
+#~ "Administrateur LDAP :\n"
+#~ " ex : cn=admin,dc=exemple,dc=com\n"
+
+#~ msgid "You must enter a suffix for LDAP."
+#~ msgstr "Vous devez entrer un suffix pour LDAP"
+
+#~ msgid "Organisation LDAP:"
+#~ msgstr "Organisation LDAP :"
+
+#~ msgid "Administrator LDAP:"
+#~ msgstr "Administrateur LDAP :"
+
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "L'assistant a ajouté avec succès l'utilisateur dans LDAP."
+
+#~ msgid "You have already configured your OpenLDAP Server with drakwizard\n"
+#~ msgstr "Vous avez déjà configuré votre serveur OpenLDAP avec drakwizard\n"
+
+#~ msgid ""
+#~ "PXE description is used to explain the role of the boot image, ie: "
+#~ "Mandrakelinux 10 image, Mandrakelinux cooker image.."
+#~ msgstr ""
+#~ "La description PXE est utilise pour définir le rôle de l'image, par "
+#~ "exemple :\n"
+#~ "image de démarrage Mandrakelinux 10, image de démarrage Mandrakelinux "
+#~ "cooker.."
+
+#~ msgid "Ramsize: adjust the ramsize parameter on boot disk."
+#~ msgstr "Taille de la RAM : ajuste la taille de la RAM sur votre disque."
diff --git a/po/fur.po b/po/fur.po
index 97b582ea..ae524e20 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-06-28 17:19+0200\n"
 "Last-Translator: Andrea Gracco <graccoandrea@tin.it>\n"
 "Language-Team: furlan <gft@freelists.org>\n"
@@ -42,7 +42,7 @@ msgstr "Fal."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -131,12 +131,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Fal"
 
@@ -551,7 +552,7 @@ msgid "Domainname:"
 msgstr "Non di domini:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "L'assistent al à zontât l'host tal to DNS cun sucès."
 
 #: ../dns_wizard/Bind.pm:256
@@ -942,7 +943,7 @@ msgstr "Insede le password par l'account dal aministratôr dial server Kolab."
 msgid "Password mismatch, or null password, please correct."
 msgstr "Password no corispondent, o password vueide, par plasè, juste."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Password:"
 
@@ -982,196 +983,238 @@ msgstr "O stoi instalant il server Kolab tal to sisteme..."
 msgid "Configuring Kolab server on your system..."
 msgstr "O stoi configurant il server Kolab tal to sisteme..."
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "O configuri il server DHCP"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Assistent Ldap"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "O configuri il server DHCP"
+msgid "Show Ldap configuration"
+msgstr "Assistent di configurazion LDAP"
 
-#: ../ldap_wizard/Ldap.pm:81
+#: ../ldap_wizard/Ldap.pm:86
 #, fuzzy
-msgid "Add user in OpenLDAP server"
+msgid "Add user in Ldap server"
 msgstr "Zonte - Zonte une vôs tal server LDAP"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "Assistent di configurazion LDAP"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Sielç un server PXE."
+msgid "Ldap configuration wizard"
+msgstr "Assistent di configurazion LDAP"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "Sielç un server PXE."
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "Rimôf un host di une configurazion DNS esistint."
+msgid "Delete configuration"
+msgstr "Configurazion dal server di instalazion"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Non utent:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Non:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Non utent:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Non utent:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Contenidôr:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Password"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Password ancjemò:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Le password no corispuint"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "O configuri Samba"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Non di domini:"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Cartele TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Cartele TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Password:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Password ancjemò:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Cartele TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Non:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Non utent:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "O configuri il server DHCP"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Contenidôr:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "L'assistent al à configurât LDAP cun sucès."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 #, fuzzy
 msgid "Successfully added User"
 msgstr "Dâts zontâts cun sucès"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:256
 #, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "L'assistent al à zontât une vôs in ldap cun sucès"
+msgid "Error when adding user in Ldap datase"
+msgstr "Zonte - Zonte une vôs tal server LDAP"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "L'assistent al à configurât cun sucès il to server Samba."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Falât"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Fal"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1967,7 +2010,7 @@ msgstr "Zonte une imagjin di inviament"
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 #, fuzzy
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "Le descrizion PXE e je doprade par spiegâ le regule de imagjin di inviament, "
@@ -2121,7 +2164,7 @@ msgstr ""
 "instalazion."
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 "Dimension de ram: juste il parametri de dimension de ram tal disc di "
 "inviament."
@@ -2766,6 +2809,42 @@ msgstr "Server Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "O configuri il to sisteme sicu server Apache ..."
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "O configuri il server DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "O configuri il server DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "O configuri il server DHCP"
+
+#, fuzzy
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Zonte - Zonte une vôs tal server LDAP"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Assistent di configurazion LDAP"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Sielç un server PXE."
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Sielç un server PXE."
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "Rimôf un host di une configurazion DNS esistint."
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "L'assistent al à zontât une vôs in ldap cun sucès"
+
 #~ msgid ""
 #~ "PXE name: the name displayed in PXE menu (please provide an ASCII word or "
 #~ "a number, without spaces)"
diff --git a/po/he.po b/po/he.po
index b12f2c30..6d4a9763 100644
--- a/po/he.po
+++ b/po/he.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-08-08 23:24+0300\n"
 "Last-Translator: dovix <dovix2003@yahoo.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -45,7 +45,7 @@ msgstr "שגיאה"
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -128,12 +128,13 @@ msgstr "הנך בהגדרת DHCP, השרת עלול שלא לעבוד עם תצ�
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "שגיאה"
 
@@ -530,7 +531,7 @@ msgid "Domainname:"
 msgstr "מתחם כתובות:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "האשף הוסיף את הלקוח ל DNS שלך."
 
 #: ../dns_wizard/Bind.pm:256
@@ -904,7 +905,7 @@ msgstr "עליך להגדיר סיסמת חשבון מנהל עבור שרת Kol
 msgid "Password mismatch, or null password, please correct."
 msgstr "אין התאמה בין הסיסמאות, או הוגדרה סיסמה ריקה. עליך לתקן זאת."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "סיסמה:"
 
@@ -944,194 +945,239 @@ msgstr "מתקין שרת Kolab על המערכת שלך..."
 msgid "Configuring Kolab server on your system..."
 msgstr "הגדרת שרת Kolab על המערכת שלך..."
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "הגדרת שרת ה-DHCP"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "אשף Ldap"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "הגדרת שרת ה-DHCP"
+msgid "Show Ldap configuration"
+msgstr "אשף הגדרת LDAP"
 
-#: ../ldap_wizard/Ldap.pm:81
+#: ../ldap_wizard/Ldap.pm:86
 #, fuzzy
-msgid "Add user in OpenLDAP server"
+msgid "Add user in Ldap server"
 msgstr "הוספה - הוספת משתמש בשרת LDAP"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "אשף הגדרת LDAP"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "הגדרת שרת LDAP."
+msgid "Ldap configuration wizard"
+msgstr "אשף הגדרת LDAP"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "הגדרת שרת LDAP."
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "בחירתך:"
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "הסרת לקוח מתצורת DNS נוכחית."
+msgid "Delete configuration"
+msgstr "הגדרת שרת התקנה"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 #, fuzzy
 msgid "LDAP Adding User"
 msgstr "הוספת משתמש LDAP"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "יצירת משתמש ב:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "שם פרטי:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 msgid "Name:"
 msgstr "שם:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "שם משתמש:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "יצירת משתמש ב:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 #, fuzzy
 msgid "You must enter a valid First Name."
 msgstr "עליך להגדיר סיסמה עבור ה LDAP."
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 #, fuzzy
 msgid "You must enter a valid Name."
 msgstr "עליך להגדיר סיסמה עבור ה LDAP."
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 #, fuzzy
 msgid "You must enter a valid User Name."
 msgstr "עליך להגדיר סיסמה עבור ה LDAP."
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 msgid "LDAP User Password"
 msgstr "סיסמת משתמש LDAP"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "passwords must match"
 msgstr "הסיסמאות לא תואמות"
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 msgid "Password (again):"
 msgstr "סיסמה (שוב):"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr "עליך להגדיר סיסמה עבור ה LDAP."
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "הסיסמאות לא תואמות"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Adrministrator"
+msgstr "מנהל LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "הגדרת LDAP"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "מתחם כתובות:"
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP Administrator"
+msgstr "מנהל LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "ספריית TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "ספריית TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+#, fuzzy
+msgid "LDAP Administrator:"
+msgstr "מנהל LDAP:"
+
+#: ../ldap_wizard/Ldap.pm:188
 msgid "LDAP Password:"
 msgstr "סיסמת LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 msgid "LDAP Password (again):"
 msgstr "סיסמת LDAP (שוב):"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
-msgstr "עליך להגדיר סיומת עבור LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+#, fuzzy
+msgid "Administrator"
+msgstr "מנהל LDAP"
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "עליך להגדיר סיסמה עבור ה LDAP."
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr "אישור יצירת המשתמש"
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 msgid "First name:"
 msgstr "שם פרטי:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "שם משתמש:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr "צור ב:"
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "הגדרת שרת ה-DHCP"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-#, fuzzy
-msgid "Administrator LDAP:"
-msgstr "מנהל LDAP:"
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "יצירת משתמש ב:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "אשף זה סיים בהצלחה את הגדרת שרת LDAP."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr "המשתמש נוסף בהצלחה"
 
-#: ../ldap_wizard/Ldap.pm:211
-msgid "The wizard successfully added a user in LDAP"
-msgstr "האשף הוסיף בהצלחה משתמש ל LDAP"
+#: ../ldap_wizard/Ldap.pm:256
+#, fuzzy
+msgid "Error when adding user in Ldap datase"
+msgstr "הוספה - הוספת משתמש בשרת LDAP"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "אשף זה סיים בהצלחה את הגדרת שרת ה-Samba שלך."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "נכשל"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "שגיאה"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1896,7 +1942,7 @@ msgstr "הוספת תמונת אתחול"
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 #, fuzzy
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "תיאור PXE משמש להגדרת החוק של תמונת האיתחול, למשל: תמונת איתחול של Mandrake "
@@ -2032,7 +2078,7 @@ msgid ""
 msgstr "ממשק לקוח רשת: ממשק הרשת המשמש את תהליך ההתקנה."
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr "גודל זיכרון ראשי: כוונון הגדרת גודל זיכרון ראשי בתקליטון אתחול."
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2656,6 +2702,44 @@ msgstr "שרת Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "הגדרת המערכת שלך כשרת Apache ..."
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "הגדרת שרת ה-DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "הגדרת שרת ה-DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "הגדרת שרת ה-DHCP"
+
+#, fuzzy
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "הוספה - הוספת משתמש בשרת LDAP"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "אשף הגדרת LDAP"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "הגדרת שרת LDAP."
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "הגדרת שרת LDAP."
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "הסרת לקוח מתצורת DNS נוכחית."
+
+#~ msgid "You must enter a suffix for LDAP."
+#~ msgstr "עליך להגדיר סיומת עבור LDAP."
+
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "האשף הוסיף בהצלחה משתמש ל LDAP"
+
 #~ msgid "LDAP User Add"
 #~ msgstr "הוספת משתמש LDAP"
 
diff --git a/po/hi.po b/po/hi.po
index d99bbdcc..daa118e8 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-08-29 21:34+0530\n"
 "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma) <dysxhi@yahoo.co.in>\n"
 "Language-Team: हिन्दी, भारत (Hindi, India) <dysxhi@yahoo.co.in>\n"
@@ -43,7 +43,7 @@ msgstr "त्रुटि ।"
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -132,12 +132,13 @@ msgstr "आप डीएचसीपी में है, सर्वर इस
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "त्रुटि"
 
@@ -547,7 +548,7 @@ msgid "Domainname:"
 msgstr "डोमेन का नाम:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "विजार्ड ने होस्ट को सफ़लतापूर्वक आपके डीएनएस में जोड़ा ।"
 
 #: ../dns_wizard/Bind.pm:256
@@ -927,7 +928,7 @@ msgstr "कोलैब सर्वर के प्रबंधक खात�
 msgid "Password mismatch, or null password, please correct."
 msgstr "कूटशब्द बेमेल, या शून्य कूटशब्द, कृपया ठीक करें।"
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "कूट-शब्द:"
 
@@ -967,180 +968,227 @@ msgstr "आपके तंत्र पर कोलैब सर्वर क�
 msgid "Configuring Kolab server on your system..."
 msgstr "आपके तंत्र पर कोलैब सर्वर को संरचित किया जा रहा है ..."
 
-#: ../ldap_wizard/Ldap.pm:26
-msgid "Configure OpenLDAP Server "
-msgstr "ओपेन एलडीऐपी सर्वर की संरचना "
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "सॉबा जादूगरी"
 
-#: ../ldap_wizard/Ldap.pm:80
-msgid "Configure OpenLDAP server"
-msgstr "ओपेन एलडीऐपी सर्वर की संरचना"
+#: ../ldap_wizard/Ldap.pm:85
+#, fuzzy
+msgid "Show Ldap configuration"
+msgstr "ओपेन एलडीऐपी संरचना विजार्ड"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
+#: ../ldap_wizard/Ldap.pm:86
+msgid "Add user in Ldap server"
 msgstr "ओपेन एलडीऐपी सर्वर में उपयोगकर्ता को जोड़ना"
 
-#: ../ldap_wizard/Ldap.pm:86
-msgid "OpenLDAP configuration wizard"
+#: ../ldap_wizard/Ldap.pm:87
+#, fuzzy
+msgid "Delete Ldap configuration"
 msgstr "ओपेन एलडीऐपी संरचना विजार्ड"
 
-#: ../ldap_wizard/Ldap.pm:86
-msgid "Setup an OpenLDAP server."
-msgstr "एक ओपेन एलडीऐपी सर्वर की स्थापना ।"
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:93
-msgid "You must setup an OpenLDAP server first."
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
+msgid "Ldap configuration wizard"
+msgstr "ओपेन एलडीऐपी संरचना विजार्ड"
+
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
+msgid "You must setup an Ldap server first."
 msgstr "आपको एक ओपेन एलडीऐपी सर्वर को सबसे पहिले स्थापित करना चाहिये ।"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "आपकी पसन्द:"
 
-#: ../ldap_wizard/Ldap.pm:110
-msgid "Save an existing configuration"
-msgstr "एक विद्यमान संरचना को सुरक्षित करना।"
+#: ../ldap_wizard/Ldap.pm:132
+#, fuzzy
+msgid "Delete configuration"
+msgstr "सर्वर संरचना का संसाधन"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr "एलडीऐपी उपयोगकर्ता जोड़ा जा रहा है"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 msgid "User Created in: "
 msgstr "उपयोगकर्ता का निर्माण में किया गया:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "प्रथम नाम:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 msgid "Name:"
 msgstr "नाम:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "उपयोगकर्ता का नाम:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "उपयोगकर्ताओं का पात्र:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr "आपको एक वैध प्रथम-नाम बताना चाहिए।"
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr "आपको एक वैध नाम बताना चाहिए।"
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr "आपको एक वैध उपयोगकर्ता-नाम बताना चाहिए।"
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 msgid "LDAP User Password"
 msgstr "एलडीऐपी उपयोगकर्ता कूट-शब्द"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr "कूट-शब्दों को एक जैसा होना चाहिए"
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 msgid "Password (again):"
 msgstr "कूट-शब्द (पुनः बतायें):"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr "एलडीऐपी हेतु आपको एक कूट-शब्द बताना चाहिए ।"
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "कूटशब्द आपस में नहीं मिलते है"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Adrministrator"
+msgstr "एलडीऐपी प्रबंधक"
+
+#: ../ldap_wizard/Ldap.pm:183
 msgid "Configuring LDAP Server"
 msgstr "एलडीऐपी सर्वर को संरचित किया जा रहा है"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
-msgstr ""
-"एलडीऐपी प्रत्यय:\n"
-" उदाहरण: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "डोमेन का नाम:"
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
+msgstr "एलडीऐपी प्रबंधक"
+
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "टीएफ़टीपी निर्देशिका:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
-"एलडीऐपी प्रबंधक:\n"
-" उदाहरण: cn=admin,dc=example,dc=com\n"
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "टीएफ़टीपी निर्देशिका:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr "एलडीऐपी प्रबंधक:"
+
+#: ../ldap_wizard/Ldap.pm:188
 msgid "LDAP Password:"
 msgstr "एलडीऐपी कूट-शब्द:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 msgid "LDAP Password (again):"
 msgstr "एलडीऐपी कूट-शब्द (पुनः बतायें):"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
-msgstr "एलडीऐपी हेतु आपको एक प्रत्यय बताना चाहिए ।"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:192
+#, fuzzy
+msgid "Administrator"
+msgstr "एलडीऐपी प्रबंधक"
+
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "आपको एक वैध प्रथम-नाम बताना चाहिए।"
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr "निर्मित किये जाने वाले उपयोगकर्ता के लिए पुष्टि"
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 msgid "First name:"
 msgstr "प्रथमनाम:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "उपयोगकर्ता का नाम:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr "में निर्मित:"
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 msgid "Confirmation Information for create an LDAP server"
 msgstr "एलडीऐपी सर्वर को निर्माण करने हेतु सूचना हेतु पुष्टि"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr "एलडीऐपी संगठन:"
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr "एलडीऐपी प्रबंधक:"
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 msgid "Users Container:"
 msgstr "उपयोगकर्ताओं का पात्र:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "जादूगरी ने एलडीऐपी को सफ़लता-पूर्वक संरचित कर दिया है।"
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr "उपयोगकर्ता को सफ़लता-पूर्वक जोड़ा गया"
 
-#: ../ldap_wizard/Ldap.pm:211
-msgid "The wizard successfully added a user in LDAP"
-msgstr "जादूगरी ने एक उपयोगकर्ता को एलडीऐपी में सफ़लतापूर्वक जोड़ा"
+#: ../ldap_wizard/Ldap.pm:256
+#, fuzzy
+msgid "Error when adding user in Ldap datase"
+msgstr "ओपेन एलडीऐपी सर्वर में उपयोगकर्ता को जोड़ना"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr "सर्वर पहिले से संरचित है"
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
 msgstr "आपने पहिले से ही अपने ओपेनएलडीऐपी सर्वर की संरचना ड्रैकविज़ार्ड द्वारा कर चुके है\n"
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, perl-format
 msgid "%s Failed"
 msgstr "%s असफ़ल रहा"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 msgid "Error!"
 msgstr "त्रुटि!"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr "%s से जुड़ने में असमर्थ"
@@ -1937,7 +1985,7 @@ msgstr "एक बूट प्रतिबिंब को जोड़ना"
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "बूट प्रतिबिंब के नियम को विस्तार में बताने के लिए पीएक्सई विवरण का उपयोग होता है, "
@@ -2081,7 +2129,7 @@ msgstr ""
 "नेटवर्क ग्राहक इन्टरफ़ेस: संसाधन प्रक्रिया के लिए उपयोग में लाया जाने वालानेटवर्क इन्टरफ़ेस ।"
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr "रैमआकार: बूट डिस्क पर रैमआकार पैरामीटर को ठीक करना ।"
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2720,3 +2768,54 @@ msgstr "आपाचे सर्वर"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "आपके तंत्र को एक आपाचे सर्वर की भांति संरचित किया जा रहा है ..."
+
+#~ msgid "Configure Ldap server"
+#~ msgstr "ओपेन एलडीऐपी सर्वर की संरचना"
+
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "ओपेन एलडीऐपी सर्वर की संरचना "
+
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "ओपेन एलडीऐपी सर्वर की संरचना"
+
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "ओपेन एलडीऐपी सर्वर में उपयोगकर्ता को जोड़ना"
+
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "ओपेन एलडीऐपी संरचना विजार्ड"
+
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "एक ओपेन एलडीऐपी सर्वर की स्थापना ।"
+
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "आपको एक ओपेन एलडीऐपी सर्वर को सबसे पहिले स्थापित करना चाहिये ।"
+
+#~ msgid "Save an existing configuration"
+#~ msgstr "एक विद्यमान संरचना को सुरक्षित करना।"
+
+#~ msgid ""
+#~ "LDAP Suffix:\n"
+#~ " ex: dc=example,dc=com\n"
+#~ msgstr ""
+#~ "एलडीऐपी प्रत्यय:\n"
+#~ " उदाहरण: dc=example,dc=com\n"
+
+#~ msgid ""
+#~ "LDAP Administrator:\n"
+#~ " ex: cn=admin,dc=example,dc=com\n"
+#~ msgstr ""
+#~ "एलडीऐपी प्रबंधक:\n"
+#~ " उदाहरण: cn=admin,dc=example,dc=com\n"
+
+#~ msgid "You must enter a suffix for LDAP."
+#~ msgstr "एलडीऐपी हेतु आपको एक प्रत्यय बताना चाहिए ।"
+
+#~ msgid "Organisation LDAP:"
+#~ msgstr "एलडीऐपी संगठन:"
+
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "जादूगरी ने एक उपयोगकर्ता को एलडीऐपी में सफ़लतापूर्वक जोड़ा"
+
+#~ msgid "You have already configured your OpenLDAP Server with drakwizard\n"
+#~ msgstr ""
+#~ "आपने पहिले से ही अपने ओपेनएलडीऐपी सर्वर की संरचना ड्रैकविज़ार्ड द्वारा कर चुके है\n"
diff --git a/po/hu.po b/po/hu.po
index b6bf292c..82ba34ce 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-08-25 00:48+0200\n"
 "Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
 "Language-Team: Hungarian\n"
@@ -47,7 +47,7 @@ msgstr "Hiba."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -88,7 +88,8 @@ msgstr ""
 
 #: ../client_wizard/Bind_client.pm:55
 msgid "This wizard will help you in adding a new client in your local DNS."
-msgstr "Ez a varázsló segítséget nyújt egy kliens helyi DNS-be való felvételéhez."
+msgstr ""
+"Ez a varázsló segítséget nyújt egy kliens helyi DNS-be való felvételéhez."
 
 #: ../client_wizard/Bind_client.pm:61
 msgid "(you don't need to type the domain after the name)"
@@ -102,7 +103,8 @@ msgstr "A kliens azonosítása:"
 msgid ""
 "Note that the given IP address and client name should be unique in the "
 "network."
-msgstr "A megadott IP-címnek és kliensnévnek egyedinek kell lenni a hálózaton belül."
+msgstr ""
+"A megadott IP-címnek és kliensnévnek egyedinek kell lenni a hálózaton belül."
 
 #: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:127
 msgid ""
@@ -137,12 +139,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Hiba"
 
@@ -187,7 +190,8 @@ msgid "The wizard successfully added the client."
 msgstr "A varázsló felvette a klienst."
 
 #: ../common/Wizcommon.pm:86
-msgid "The command is still running. Do you want to kill it and quit the Wizard?"
+msgid ""
+"The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 "A program még végrehajtás alatt áll. Szeretné leállítani azt, és kilépni a "
 "varázslóból?"
@@ -322,7 +326,8 @@ msgstr "Sikertelen"
 #: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
 #: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
-msgstr "Indítsa el újra a \"drakwizard\" programot, és módosítson néhány paramétert."
+msgstr ""
+"Indítsa el újra a \"drakwizard\" programot, és módosítson néhány paramétert."
 
 #: ../dns_wizard/Bind.pm:74
 msgid "You need to readjust your hostname."
@@ -472,7 +477,8 @@ msgid "Default domain name to search:"
 msgstr "Az alapértelmezésben keresendő tartománynév:"
 
 #: ../dns_wizard/Bind.pm:169
-msgid "This is not a valid IP address for your forwarder... press next to continue"
+msgid ""
+"This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Érvénytelen IP-cím a továbbító számára. A folytatáshoz nyomja le a "
 "\"Következő\" gombot."
@@ -516,7 +522,8 @@ msgstr ""
 "varázsló \"Elsődleges DNS-kiszolgáló\" funkcióját."
 
 #: ../dns_wizard/Bind.pm:204
-msgid "It seems that you are not a master DNS server, so I can't add/remove host."
+msgid ""
+"It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Úgy tűnik, a gép nem elsődleges DNS-kiszolgáló, ezért a gép felvétele/"
 "eltávolítása nem lehetséges."
@@ -546,7 +553,8 @@ msgid "Client with this identification will be removed from your DNS"
 msgstr "Az itt megadott azonosítású kliens el lesz távolítva a DNS-ből"
 
 #: ../dns_wizard/Bind.pm:234
-msgid "The DNS server is about to be configured with the following configuration"
+msgid ""
+"The DNS server is about to be configured with the following configuration"
 msgstr "A DNS-kiszolgáló a következő módon lesz beállítva:"
 
 #: ../dns_wizard/Bind.pm:236
@@ -558,7 +566,7 @@ msgid "Domainname:"
 msgstr "Tartománynév:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "A varázsló felvette a gépet a DNS-be."
 
 #: ../dns_wizard/Bind.pm:256
@@ -571,7 +579,8 @@ msgstr "A varázsló beállította a kiszolgáló DNS-szolgáltatását."
 
 #: ../dns_wizard/Bind.pm:270
 msgid "Please Relaunch drakwizard, and try to change some parameters."
-msgstr "Indítsa el újra a \"drakwizard\" programot, és módosítson néhány paramétert."
+msgstr ""
+"Indítsa el újra a \"drakwizard\" programot, és módosítson néhány paramétert."
 
 #: ../dns_wizard/Bind.pm:707
 msgid "Configuring your system as Master DNS server ..."
@@ -704,7 +713,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
 msgid "Allow FXP: allow file transfer via another FTP."
-msgstr "FXP engedélyezése: fájlátvitel engedélyezése egy másik FTP-n keresztül."
+msgstr ""
+"FXP engedélyezése: fájlátvitel engedélyezése egy másik FTP-n keresztül."
 
 #: ../ftp_wizard/Proftpd.pm:88
 msgid "Chroot home user: users will only see their home directory."
@@ -823,11 +833,13 @@ msgstr "A varázsló beállította az intranetes/internetes FTP-kiszolgálót."
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
-msgstr "Indítsa el újra a \"drakwizard\" programot, és módosítson néhány paramétert."
+msgstr ""
+"Indítsa el újra a \"drakwizard\" programot, és módosítson néhány paramétert."
 
 #: ../installsrv_wizard/Installsrv.pm:53
 msgid "Configure a Mandrakelinux install server (via NFS and http)"
-msgstr "Mandrakelinux-telepítési kiszolgáló beállítása (NFS-en és HTTP-n keresztül)"
+msgstr ""
+"Mandrakelinux-telepítési kiszolgáló beállítása (NFS-en és HTTP-n keresztül)"
 
 #: ../installsrv_wizard/Installsrv.pm:53
 msgid ""
@@ -944,7 +956,7 @@ msgstr "Adja meg a Kolab-kiszolgáló rendszergazdai jelszavát."
 msgid "Password mismatch, or null password, please correct."
 msgstr "A jelszavak nem egyeznek, vagy pedig üres a jelszó - javítsa ki."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Jelszó:"
 
@@ -985,180 +997,227 @@ msgstr "A Kolab-kiszolgáló telepítése a rendszerre..."
 msgid "Configuring Kolab server on your system..."
 msgstr "A Kolab-kiszolgáló beállítása a rendszeren..."
 
-#: ../ldap_wizard/Ldap.pm:26
-msgid "Configure OpenLDAP Server "
-msgstr "OpenLDAP-kiszolgáló beállítása "
-
-#: ../ldap_wizard/Ldap.pm:80
-msgid "Configure OpenLDAP server"
-msgstr "OpenLDAP-kiszolgáló beállítása"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Ldap-varázsló"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
-msgstr "Felhasználó felvétele az OpenLDAP-kiszolgálóba"
+#: ../ldap_wizard/Ldap.pm:85
+#, fuzzy
+msgid "Show Ldap configuration"
+msgstr "Ldap-beállításvarázsló"
 
 #: ../ldap_wizard/Ldap.pm:86
-msgid "OpenLDAP configuration wizard"
-msgstr "OpenLDAP-beállításvarázsló"
+msgid "Add user in Ldap server"
+msgstr "Felhasználó felvétele az Ldap-kiszolgálóba"
 
-#: ../ldap_wizard/Ldap.pm:86
-msgid "Setup an OpenLDAP server."
-msgstr "OpenLDAP-kiszolgáló beállítása."
+#: ../ldap_wizard/Ldap.pm:87
+#, fuzzy
+msgid "Delete Ldap configuration"
+msgstr "Ldap-beállításvarázsló"
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:93
-msgid "You must setup an OpenLDAP server first."
-msgstr "Előbb be kell állítani egy OpenLDAP-kiszolgálót."
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
+msgid "Ldap configuration wizard"
+msgstr "Ldap-beállításvarázsló"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
+msgid "You must setup an Ldap server first."
+msgstr "Előbb be kell állítani egy Ldap-kiszolgálót."
+
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Az Ön választása:"
 
-#: ../ldap_wizard/Ldap.pm:110
-msgid "Save an existing configuration"
-msgstr "Egy meglevő beállítás elmentése"
+#: ../ldap_wizard/Ldap.pm:132
+#, fuzzy
+msgid "Delete configuration"
+msgstr "A telepítési kiszolgáló beállításai"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr "LDAP-felhasználó felvétele"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 msgid "User Created in: "
 msgstr "Felhasználó létrehozási helye: "
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Keresztnév:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 msgid "Name:"
 msgstr "Név:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Felhasználónév:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Felhasználói tárolóhely:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr "Érvényes keresztnevet kell megadni."
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr "Érvényes nevet kell megadni."
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr "Érvényes felhasználónevet kell megadni."
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 msgid "LDAP User Password"
 msgstr "Az LDAP-felhasználó jelszava"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr "A jelszavaknak egyezniük kell"
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 msgid "Password (again):"
 msgstr "Jelszó (ismét):"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr "Meg kell adni egy jelszót az LDAP-hoz."
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "A jelszavak nem egyeznek"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Adrministrator"
+msgstr "LDAP-adminisztrátor"
+
+#: ../ldap_wizard/Ldap.pm:183
 msgid "Configuring LDAP Server"
 msgstr "Az LDAP-kiszolgáló beállítása"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
-msgstr ""
-"LDAP-utótag:\n"
-" példa: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Tartománynév:"
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
+msgstr "LDAP-adminisztrátor"
+
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "TFTP-könyvtár:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
-"LDAP-adminisztrátor:\n"
-" példa: cn=admin,dc=example,dc=com\n"
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "TFTP-könyvtár:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr "LDAP-adminisztrátor:"
+
+#: ../ldap_wizard/Ldap.pm:188
 msgid "LDAP Password:"
 msgstr "LDAP-jelszó:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 msgid "LDAP Password (again):"
 msgstr "LDAP-jelszó (ismét):"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
-msgstr "Meg kell adni utótagot az LDAP-hoz."
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:192
+#, fuzzy
+msgid "Administrator"
+msgstr "LDAP-adminisztrátor"
+
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Érvényes keresztnevet kell megadni."
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr "A felhasználólétrehozás megerősítése"
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 msgid "First name:"
 msgstr "Keresztnév:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Felhasználónév:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr "Létrehozás itt:"
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Megerősítés az LDAP-kiszolgáló létrehozásához"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr "LDAP-szervezet:"
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr "LDAP-adminisztrátor:"
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 msgid "Users Container:"
 msgstr "Felhasználói tárolóhely:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "A varázsló beállította az LDAP-t."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr "A felhasználó fel lett véve"
 
-#: ../ldap_wizard/Ldap.pm:211
-msgid "The wizard successfully added a user in LDAP"
-msgstr "A varázsló felvett egy felhasználót az LDAP-ba"
+#: ../ldap_wizard/Ldap.pm:256
+#, fuzzy
+msgid "Error when adding user in Ldap datase"
+msgstr "Felhasználó felvétele az Ldap-kiszolgálóba"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr "A kiszolgáló már be lett állítva"
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr "Az OpenLDAP-kiszolgáló már be lett állítva a \"drakwizard\" programmal\n"
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Az Ldap-kiszolgáló már be lett állítva a \"drakwizard\" programmal\n"
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, perl-format
 msgid "%s Failed"
 msgstr "\"%s\" végrehajtása nem sikerült"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 msgid "Error!"
 msgstr "Hiba."
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr "Nem sikerült kapcsolódni ide: %s"
@@ -1265,7 +1324,8 @@ msgid "Polling interval:"
 msgstr "Lekérdezési intervallum:"
 
 #: ../news_wizard/Inn.pm:95
-msgid "The wizard successfully configured your Internet News service of your server."
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
 msgstr "A varázsló beállította a kiszolgáló internetes hírszolgáltatását."
 
 #: ../nfs_wizard/NFS.pm:34
@@ -1507,7 +1567,8 @@ msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 msgid "Configuring your system to be a NIS server with Autofs map..."
-msgstr "A rendszer beállítása Autofs-összerendeléssel rendelkező NIS-kiszolgálónak..."
+msgstr ""
+"A rendszer beállítása Autofs-összerendeléssel rendelkező NIS-kiszolgálónak..."
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 msgid "NIS with Autofs map"
@@ -1579,7 +1640,8 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
-msgstr "A maszknak érvényes tartománynévnek kell lennie - például \"mydomain.com\"."
+msgstr ""
+"A maszknak érvényes tartománynévnek kell lennie - például \"mydomain.com\"."
 
 # a kimenő emailekhez használandó domainnevet kell megadni az utána levő mezőben
 #: ../postfix_wizard/Postfix.pm:93
@@ -1748,14 +1810,16 @@ msgid "Proxy port:"
 msgstr "Proxy-port:"
 
 #: ../proxy_wizard/Squid.pm:83
-msgid "Press Next if you want to keep this value, or Back to correct your choice."
+msgid ""
+"Press Next if you want to keep this value, or Back to correct your choice."
 msgstr ""
 "Az érték megtartásához nyomja le a \"Következő\" gombot; javításhoz az "
 "\"Előző\" gombot."
 
 #: ../proxy_wizard/Squid.pm:83
 msgid "You have entered a port that may be useful for this service:"
-msgstr "Egy olyan portot adott meg, amely hasznos lehet ennek a szolgáltatásnak:"
+msgstr ""
+"Egy olyan portot adott meg, amely hasznos lehet ennek a szolgáltatásnak:"
 
 #: ../proxy_wizard/Squid.pm:90
 msgid "Press back to change the value."
@@ -1766,7 +1830,8 @@ msgid "You must choose a port greater than 1024 and lower than 65535"
 msgstr "A portszámnak 1024-nél nagyobbnak kell lenni és 65535-nél kisebbnek"
 
 #: ../proxy_wizard/Squid.pm:94
-msgid "Disk Cache is the amount of disk space that can be used for caching on disk."
+msgid ""
+"Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr ""
 "A lemezes gyorstár azt a lemezhely-mennyiséget jelöli, amely a lemezen való "
 "gyorstárazáshoz felhasználható."
@@ -1873,7 +1938,8 @@ msgid "Configuring the Proxy"
 msgstr "A proxy beállítása"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-msgid "The wizard collected the following parameters needed to configure your proxy:"
+msgid ""
+"The wizard collected the following parameters needed to configure your proxy:"
 msgstr ""
 "A varázsló a következő, a proxy beállításához szükséges paramétereket "
 "gyűjtötte össze:"
@@ -1963,7 +2029,7 @@ msgstr "Rendszerindítási képmás felvétele"
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "A PXE-leírás a rendszerindítási képmás szerepét írja le; például "
@@ -1974,12 +2040,13 @@ msgid ""
 "PXE name: the name displayed in PXE menu (please provide an ASCII word or a "
 "number, with no spaces)"
 msgstr ""
-"PXE-név: a PXE-menüben megjelenő név (egy ASCII szót vagy egy számot adjon meg, "
-"szóköz nélkül)"
+"PXE-név: a PXE-menüben megjelenő név (egy ASCII szót vagy egy számot adjon "
+"meg, szóköz nélkül)"
 
 #: ../pxe_wizard/Pxe.pm:132
 msgid "Path to image: provide the full path to the network boot image"
-msgstr "A képmás helye: adja meg a hálózati rendszerindítási képmás teljes útvonalát"
+msgstr ""
+"A képmás helye: adja meg a hálózati rendszerindítási képmás teljes útvonalát"
 
 #: ../pxe_wizard/Pxe.pm:132
 msgid ""
@@ -2023,8 +2090,10 @@ msgstr ""
 "kiválaszthatja, melyik PXE-képmással akarja indítani a rendszert."
 
 #: ../pxe_wizard/Pxe.pm:153
-msgid "Please choose the PXE boot image you want to remove from the PXE server."
-msgstr "Válassza ki a PXE-kiszolgálóról eltávolítandó rendszerindítási PXE-képmást."
+msgid ""
+"Please choose the PXE boot image you want to remove from the PXE server."
+msgstr ""
+"Válassza ki a PXE-kiszolgálóról eltávolítandó rendszerindítási PXE-képmást."
 
 #: ../pxe_wizard/Pxe.pm:153
 msgid "Remove a boot image"
@@ -2054,7 +2123,8 @@ msgstr ""
 "paraméterekkel való testreszabásához."
 
 #: ../pxe_wizard/Pxe.pm:161
-msgid "Please choose, from the list below, the PXE boot image you want to modify"
+msgid ""
+"Please choose, from the list below, the PXE boot image you want to modify"
 msgstr "Válassza ki a listából a módosítandó rendszerindítási PXE-képmást"
 
 #: ../pxe_wizard/Pxe.pm:163 ../pxe_wizard/Pxe.pm:172 ../pxe_wizard/Pxe.pm:250
@@ -2066,7 +2136,8 @@ msgid "Add option to the PXE boot image"
 msgstr "Opció felvétele a PXE-képmáshoz"
 
 #: ../pxe_wizard/Pxe.pm:170
-msgid "Install directory: the full path to Mandrakelinux install server directory"
+msgid ""
+"Install directory: the full path to Mandrakelinux install server directory"
 msgstr ""
 "Telepítési könyvtár: a Mandrakelinux-telepítési kiszolgáló könyvtárának "
 "teljes útvonala"
@@ -2104,10 +2175,11 @@ msgstr "ACPI opció: Advanced Configuration and Power Interface"
 msgid ""
 "Network client interface: the network interface used for the installation "
 "process."
-msgstr "Hálózati kliensfelület: a telepítési folyamathoz használt hálózati felület."
+msgstr ""
+"Hálózati kliensfelület: a telepítési folyamathoz használt hálózati felület."
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr "RAM-méret: az indítólemez RAM-méret-paramétere."
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2168,7 +2240,8 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:200
 msgid "We need an all.rdz or a network.img image. Please add one."
-msgstr "Szükség van egy all.rdz vagy egy network.img képmásra. Vegyen fel egyet."
+msgstr ""
+"Szükség van egy all.rdz vagy egy network.img képmásra. Vegyen fel egyet."
 
 #: ../pxe_wizard/Pxe.pm:208
 msgid ""
@@ -2189,10 +2262,12 @@ msgstr "Válasszon képmást egy ettől eltérő könyvtárból: %s."
 msgid ""
 "Please provide a correct PXE name: one ASCII word or one number with no "
 "spaces."
-msgstr "Adjon meg egy érvényes PXE-nevet: egy ASCII szó vagy egy szám, szóköz nélkül."
+msgstr ""
+"Adjon meg egy érvényes PXE-nevet: egy ASCII szó vagy egy szám, szóköz nélkül."
 
 #: ../pxe_wizard/Pxe.pm:224
-msgid "To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
+msgid ""
+"To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
 msgstr ""
 "Egy rendszerindítási PXE-képmás felvételéhez, eltávolításához illetve "
 "módosításához előbb végre kell hajtani a \"PXE-kiszolgáló beállítása\" "
@@ -2230,7 +2305,8 @@ msgstr "PXE-segítségfájl:"
 
 #: ../pxe_wizard/Pxe.pm:248
 msgid "The wizard will now modify boot options with those parameters:"
-msgstr "A varázsló módosítja a rendszerindítási opciókat ezekkel a paraméterekkel:"
+msgstr ""
+"A varázsló módosítja a rendszerindítási opciókat ezekkel a paraméterekkel:"
 
 #: ../pxe_wizard/Pxe.pm:265
 msgid "The wizard will now remove this PXE boot image"
@@ -2299,14 +2375,16 @@ msgid "Samba configuration wizard"
 msgstr "Samba-beállításvarázsló"
 
 #: ../samba_wizard/Samba.pm:72
-msgid "This wizard will help you configuring the Samba services of your server."
+msgid ""
+"This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Ez a varázsló segítséget nyújt a kiszolgáló Samba-szolgáltatásainak "
 "beállításához."
 
 #: ../samba_wizard/Samba.pm:77
 msgid "Samba needs to know the Windows Workgroup it will serve."
-msgstr "A Sambának tudnia kell, melyik windowsos munkacsoportot fogja kiszolgálni."
+msgstr ""
+"A Sambának tudnia kell, melyik windowsos munkacsoportot fogja kiszolgálni."
 
 #: ../samba_wizard/Samba.pm:77
 msgid "Workgroup"
@@ -2477,7 +2555,8 @@ msgstr "Írási lista:"
 
 #: ../samba_wizard/Samba.pm:194
 msgid "Select which printers you want to be accessible from known users"
-msgstr "Válassza ki, mely nyomtatók legyenek elérhetők az ismert felhasználók által"
+msgstr ""
+"Válassza ki, mely nyomtatók legyenek elérhetők az ismert felhasználók által"
 
 #: ../samba_wizard/Samba.pm:201
 msgid "Enable all printers"
@@ -2655,7 +2734,8 @@ msgstr "Webkiszolgáló-beállítási varázsló"
 
 #: ../web_wizard/Apache.pm:77
 msgid "Don't check any box if you don't want to activate your Web server."
-msgstr "Ha nem kívánja aktiválni a webkiszolgálót, ne jelölje ki egyik opciót sem."
+msgstr ""
+"Ha nem kívánja aktiválni a webkiszolgálót, ne jelölje ki egyik opciót sem."
 
 #: ../web_wizard/Apache.pm:77
 msgid "Select the kind of Web service you want to activate:"
@@ -2764,6 +2844,57 @@ msgstr "Apache-kiszolgáló"
 msgid "Configuring your system as Apache server ..."
 msgstr "A rendszer beállítása Apache-kiszolgálónak..."
 
+#~ msgid "Configure Ldap server"
+#~ msgstr "Ldap-kiszolgáló beállítása"
+
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "OpenLDAP-kiszolgáló beállítása "
+
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "OpenLDAP-kiszolgáló beállítása"
+
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Felhasználó felvétele az OpenLDAP-kiszolgálóba"
+
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "OpenLDAP-beállításvarázsló"
+
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "OpenLDAP-kiszolgáló beállítása."
+
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Előbb be kell állítani egy OpenLDAP-kiszolgálót."
+
+#~ msgid "Save an existing configuration"
+#~ msgstr "Egy meglevő beállítás elmentése"
+
+#~ msgid ""
+#~ "LDAP Suffix:\n"
+#~ " ex: dc=example,dc=com\n"
+#~ msgstr ""
+#~ "LDAP-utótag:\n"
+#~ " példa: dc=example,dc=com\n"
+
+#~ msgid ""
+#~ "LDAP Administrator:\n"
+#~ " ex: cn=admin,dc=example,dc=com\n"
+#~ msgstr ""
+#~ "LDAP-adminisztrátor:\n"
+#~ " példa: cn=admin,dc=example,dc=com\n"
+
+#~ msgid "You must enter a suffix for LDAP."
+#~ msgstr "Meg kell adni utótagot az LDAP-hoz."
+
+#~ msgid "Organisation LDAP:"
+#~ msgstr "LDAP-szervezet:"
+
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "A varázsló felvett egy felhasználót az LDAP-ba"
+
+#~ msgid "You have already configured your OpenLDAP Server with drakwizard\n"
+#~ msgstr ""
+#~ "Az OpenLDAP-kiszolgáló már be lett állítva a \"drakwizard\" programmal\n"
+
 #~ msgid ""
 #~ "PXE name: the name displayed in PXE menu (please provide an ASCII word or "
 #~ "a number, without spaces)"
@@ -3646,4 +3777,3 @@ msgstr "A rendszer beállítása Apache-kiszolgálónak..."
 
 #~ msgid "No Samba service has been requested"
 #~ msgstr "Samba-szolgáltatásra nem volt kérés"
-
diff --git a/po/id.po b/po/id.po
index b373e38d..b9da773f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2003-03-13 17:14+0900\n"
 "Last-Translator: Budi Rachmanto <rac@linux-mandrake.com>\n"
 "Language-Team: Nusantara - Bahasa Indonesia <id@li.org>\n"
@@ -42,7 +42,7 @@ msgstr "Error Wizard."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -132,12 +132,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
 msgstr "Error Wizard."
@@ -539,7 +540,7 @@ msgstr ""
 
 #: ../dns_wizard/Bind.pm:246
 #, fuzzy
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Sang dukun sukses menambah klien."
 
 #: ../dns_wizard/Bind.pm:256
@@ -921,7 +922,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Katasandi:"
 
@@ -965,197 +966,238 @@ msgstr "Konfigurasi Server FTP"
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurasi Server FTP"
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Konfigurasi Server DHCP"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Konfigurator Ldap"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Konfigurasi Server DHCP"
+msgid "Show Ldap configuration"
+msgstr "Dukun Konfigurasi"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
+#: ../ldap_wizard/Ldap.pm:86
+msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "Dukun Konfigurasi"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Server Database"
+msgid "Ldap configuration wizard"
+msgstr "Dukun Konfigurasi"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "Server Database"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "Konfigurator DNS"
+msgid "Delete configuration"
+msgstr "Konfigurasi server waktu telah disimpan"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Penambahan pengguna"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 #, fuzzy
 msgid "First Name:"
 msgstr "Nama Host:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Nama pengguna:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
+#: ../ldap_wizard/Ldap.pm:144
 #, fuzzy
-msgid "User Name:"
-msgstr "Nama pengguna:"
+msgid "User Login:"
+msgstr "Penambahan pengguna"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Katasandi:"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Katasandi:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Katasandi tidak sama"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Konfigurasi Samba"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Nama domain terhitung"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Direktori pengguna:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Direktori pengguna:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Katasandi:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Katasandi:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Direktori pengguna:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Nama Host:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+#, fuzzy
+msgid "User Name:"
+msgstr "Nama pengguna:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Konfigurasi Server DHCP"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Penambahan pengguna"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "Server proksi Anda sukses dikonfigurasikan."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:211
-#, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Sang dukun sukses menambah klien."
+#: ../ldap_wizard/Ldap.pm:256
+msgid "Error when adding user in Ldap datase"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Server Samba sukses dikonfigurasikan."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "aktif"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Error Wizard."
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1941,7 +1983,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 
@@ -2065,7 +2107,7 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2699,6 +2741,38 @@ msgstr "Server web intranet:"
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurasi Server DNS"
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "Konfigurasi Server DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Konfigurasi Server DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Konfigurasi Server DHCP"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Dukun Konfigurasi"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Server Database"
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Server Database"
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "Konfigurator DNS"
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Sang dukun sukses menambah klien."
+
 #~ msgid "The wizard successfully configured your NFS server"
 #~ msgstr "Server NFS sukses dikonfigurasikan"
 
diff --git a/po/is.po b/po/is.po
index 501d1aa3..724fe146 100644
--- a/po/is.po
+++ b/po/is.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-is\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2003-09-13 21:31GMT\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -44,7 +44,7 @@ msgstr "Villa."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -123,12 +123,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
 msgstr "Villa."
@@ -507,7 +508,7 @@ msgstr ""
 
 #: ../dns_wizard/Bind.pm:246
 #, fuzzy
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Vefmiðlari"
 
 #: ../dns_wizard/Bind.pm:256
@@ -873,7 +874,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Lykilorð:"
 
@@ -917,196 +918,236 @@ msgstr "Vefmiðlari"
 msgid "Configuring Kolab server on your system..."
 msgstr "Vefmiðlari"
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Stilla"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Stilla"
+msgid "Show Ldap configuration"
+msgstr "Stillingarálfur"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
+#: ../ldap_wizard/Ldap.pm:86
+msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "Stillingarálfur"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Gagnagrunnsmiðlari"
+msgid "Ldap configuration wizard"
+msgstr "Stillingarálfur"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "Gagnagrunnsmiðlari"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
+msgid "Delete configuration"
 msgstr "Stillingarálfur"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Notandanafn:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 #, fuzzy
 msgid "First Name:"
 msgstr "Vélarheiti:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Notandanafn:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
+#: ../ldap_wizard/Ldap.pm:144
 #, fuzzy
-msgid "User Name:"
+msgid "User Login:"
 msgstr "Notandanafn:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Lykilorð:"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Lykilorð:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Mismunandi lykilorð"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Stilla"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Domain name: "
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Mappa:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Mappa:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Lykilorð:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Lykilorð:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Mappa:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Vélarheiti:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+#, fuzzy
+msgid "User Name:"
+msgstr "Notandanafn:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Stilla"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Notandanafn:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:211
-#, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Vefmiðlari"
+#: ../ldap_wizard/Ldap.pm:256
+msgid "Error when adding user in Ldap datase"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Vefmiðlari"
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "virkt"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Villa."
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1821,7 +1862,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 
@@ -1944,7 +1985,7 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2531,6 +2572,38 @@ msgstr "Vefmiðlari"
 msgid "Configuring your system as Apache server ..."
 msgstr "Vefmiðlari"
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "Stilla"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Stilla"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Stilla"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Stillingarálfur"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Gagnagrunnsmiðlari"
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Gagnagrunnsmiðlari"
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "Stillingarálfur"
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Vefmiðlari"
+
 #~ msgid "Cancel"
 #~ msgstr "Hætta við"
 
diff --git a/po/it.po b/po/it.po
index 90f0bc56..5a621d31 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-03-09 01:38+0100\n"
 "Last-Translator: Stefano K. Lee <stefanok_lee@yahoo.it>\n"
 "Language-Team: Italian <timl@freelists.org>\n"
@@ -42,7 +42,7 @@ msgstr "Errore."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -135,12 +135,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Errore"
 
@@ -556,7 +557,7 @@ msgid "Domainname:"
 msgstr "Nome di dominio:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "L'assistente ha aggiunto con successo il client."
 
 #: ../dns_wizard/Bind.pm:256
@@ -938,7 +939,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Password:"
 
@@ -984,198 +985,241 @@ msgstr "Configurazione del server FTP"
 msgid "Configuring Kolab server on your system..."
 msgstr "Configurazione del server FTP"
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Configurazione del server DHCP"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Configurazione Ldap"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Configurazione del server DHCP"
+msgid "Show Ldap configuration"
+msgstr "Assistente di configurazione LDAP"
 
-#: ../ldap_wizard/Ldap.pm:81
+#: ../ldap_wizard/Ldap.pm:86
 #, fuzzy
-msgid "Add user in OpenLDAP server"
+msgid "Add user in Ldap server"
 msgstr "Aggiungi - inserisci una voce nel server LDAP"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "Assistente di configurazione LDAP"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Imposta un server PXE"
+msgid "Ldap configuration wizard"
+msgstr "Assistente di configurazione LDAP"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "Imposta un server PXE"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "Rimuovi un host da una configurazione DNS esistente"
+msgid "Delete configuration"
+msgstr "Configurazione del server d'installazione."
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Aggiungi un utente"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Nome:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Nome utente:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Nome utente:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Contenitore:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Password:"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Password:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Le password non corrispondono"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Configurazione del server DHCP"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Nome di dominio:"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Directory TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Directory TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Password:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Password:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Directory TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Nome:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Nome utente:"
+
+#: ../ldap_wizard/Ldap.pm:219
 #, fuzzy
 msgid "Create in:"
 msgstr "Lista di lettura:"
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Configurazione del server DHCP"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Contenitore:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr ""
 "L'assistente ha completato con successo la configurazione del server LDAP."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 #, fuzzy
 msgid "Successfully added User"
 msgstr "Aggiungi dati "
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:256
 #, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "L'assistente ha aggiunto con successo il client."
+msgid "Error when adding user in Ldap datase"
+msgstr "Aggiungi - inserisci una voce nel server LDAP"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
 msgstr ""
+"L'assistente ha completato con successo la configurazione del server NFS"
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Fallito"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Errore"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1993,7 +2037,7 @@ msgstr "Aggiungi un'immagine di boot"
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 #, fuzzy
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "La descrizione PXE è utilizzata per illustrare a quale sistema operativo "
@@ -2145,7 +2189,7 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr "Ramsize: modifica le dimensioni della Ram nel disco di boot."
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2190,6 +2234,10 @@ msgid ""
 "a DHCP server, launch the DHCP wizard and check the box 'Enable PXE'. If you "
 "don't do that, PXE query will not be answered by this server."
 msgstr ""
+"Bisogna usare un file dhcpd.conf speciale con un parametro per PXE. Per "
+"configurare un simile server DHCP, lancia l'assistente DHCP, e spunta la "
+"casella 'Abilita PXE'. Se non lo fai, il server non risponderà alle "
+"richieste di PXE."
 
 #: ../pxe_wizard/Pxe.pm:196
 msgid ""
@@ -2791,6 +2839,42 @@ msgstr "Server web Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurazione del server Apache..."
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "Configurazione del server DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Configurazione del server DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Configurazione del server DHCP"
+
+#, fuzzy
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Aggiungi - inserisci una voce nel server LDAP"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Assistente di configurazione LDAP"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Imposta un server PXE"
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Imposta un server PXE"
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "Rimuovi un host da una configurazione DNS esistente"
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "L'assistente ha aggiunto con successo il client."
+
 #~ msgid ""
 #~ "PXE name: the name displayed in PXE menu (please provide an ASCII word or "
 #~ "a number, without spaces)"
diff --git a/po/ja.po b/po/ja.po
index ea0c7359..9636b2fc 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-02-24 00:31-0500\n"
 "Last-Translator: UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -41,7 +41,7 @@ msgstr "エラー"
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -129,12 +129,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "エラー"
 
@@ -518,7 +519,7 @@ msgid "Domainname:"
 msgstr "ドメイン名:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "DNSのホストを追加しました。"
 
 #: ../dns_wizard/Bind.pm:256
@@ -888,7 +889,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "パスワード:"
 
@@ -930,196 +931,238 @@ msgstr "システムのKolabサーバを設定..."
 msgid "Configuring Kolab server on your system..."
 msgstr "システムのKolabサーバを設定..."
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "DHCPサーバを設定"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Ldapウィザード"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "DHCPサーバを設定"
+msgid "Show Ldap configuration"
+msgstr "LDAP設定ウィザード"
 
-#: ../ldap_wizard/Ldap.pm:81
+#: ../ldap_wizard/Ldap.pm:86
 #, fuzzy
-msgid "Add user in OpenLDAP server"
+msgid "Add user in Ldap server"
 msgstr "追加 - LDAPサーバに項目を追加"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "LDAP設定ウィザード"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "PXEサーバを設定"
+msgid "Ldap configuration wizard"
+msgstr "LDAP設定ウィザード"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "PXEサーバを設定"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "既存のDNS設定のホストを削除してください"
+msgid "Delete configuration"
+msgstr "サーバインストールの設定"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "ユーザ名:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "下の名前:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "ユーザ名:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "ユーザ名:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "コンテナ:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "パスワード"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "パスワード:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "パスワードが一致しません"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Sambaを設定"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "ドメイン名:"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "TFTPディレクトリ:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "TFTPディレクトリ:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "パスワード:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "パスワード:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "TFTPディレクトリ:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "下の名前:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "ユーザ名:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "DHCPサーバを設定"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "コンテナ:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "LDAPを設定しました。"
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 #, fuzzy
 msgid "Successfully added User"
 msgstr "データを追加しました"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:256
 #, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "LDAPに項目を追加しました。"
+msgid "Error when adding user in Ldap datase"
+msgstr "追加 - LDAPサーバに項目を追加"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Sambaサーバを設定しました。"
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "失敗"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "エラー"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1882,7 +1925,7 @@ msgstr "ブートイメージを追加"
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "PXEの説明はブートイメージのルールを説明するのに使います。例: Mandrakelinux "
@@ -2019,7 +2062,7 @@ msgstr ""
 "ネットワーククライアントインタフェース: 使用するクライアントインタフェース"
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr "Ramサイズ: ブートディスクのRamサイズを設定"
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2660,6 +2703,42 @@ msgstr "Apacheサーバ"
 msgid "Configuring your system as Apache server ..."
 msgstr "システムをApacheサーバとして設定.."
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "DHCPサーバを設定"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "DHCPサーバを設定"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "DHCPサーバを設定"
+
+#, fuzzy
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "追加 - LDAPサーバに項目を追加"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "LDAP設定ウィザード"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "PXEサーバを設定"
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "PXEサーバを設定"
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "既存のDNS設定のホストを削除してください"
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "LDAPに項目を追加しました。"
+
 #~ msgid ""
 #~ "PXE name: the name displayed in PXE menu (please provide an ASCII word or "
 #~ "a number, without spaces)"
diff --git a/po/ko.po b/po/ko.po
index 6e474a86..bf2cbc4c 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2002-09-09 08:06+0900\n"
 "Last-Translator: Jaegeum Cze <baedaron@hanafos.com>\n"
 "Language-Team: Korean <baedaron@hanafos.com>\n"
@@ -45,7 +45,7 @@ msgstr "오류."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -137,12 +137,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "오류"
 
@@ -541,7 +542,7 @@ msgstr ""
 
 #: ../dns_wizard/Bind.pm:246
 #, fuzzy
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "새 클라이언트가 추가되었습니다."
 
 #: ../dns_wizard/Bind.pm:256
@@ -923,7 +924,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "암호:"
 
@@ -967,196 +968,237 @@ msgstr "FTP 서버 설정 중"
 msgid "Configuring Kolab server on your system..."
 msgstr "FTP 서버 설정 중"
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "DHCP 서버 설정 중"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "삼바 마법사"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "DHCP 서버 설정 중"
+msgid "Show Ldap configuration"
+msgstr "설정 마법사"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
+#: ../ldap_wizard/Ldap.pm:86
+msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "설정 마법사"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "데이터베이스 서버"
+msgid "Ldap configuration wizard"
+msgstr "설정 마법사"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "데이터베이스 서버"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "DNS 설정 마법사"
+msgid "Delete configuration"
+msgstr "시간 서버 설정 저장 완료"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "사용자 추가"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 #, fuzzy
 msgid "First Name:"
 msgstr "호스트 이름:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "사용자명:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
+#: ../ldap_wizard/Ldap.pm:144
 #, fuzzy
-msgid "User Name:"
-msgstr "사용자명:"
+msgid "User Login:"
+msgstr "사용자 추가"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "암호:"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "암호:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "암호가 일치하지 않습니다."
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "삼바 설정 중"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "계산된 도메인 이름"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "디렉토리:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "디렉토리:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "암호:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "암호:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "디렉토리:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "호스트 이름:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+#, fuzzy
+msgid "User Name:"
+msgstr "사용자명:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "DHCP 서버 설정 중"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "사용자 추가"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "마법사가 성공적으로 프락시 서버를 설정하였습니다."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:211
-#, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "새 클라이언트가 추가되었습니다."
+#: ../ldap_wizard/Ldap.pm:256
+msgid "Error when adding user in Ldap datase"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "마법사가 성공적으로 삼바 서버를 설정하였습니다."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "허용"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 msgid "Error!"
 msgstr "오류!"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1938,7 +1980,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 
@@ -2062,7 +2104,7 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2682,6 +2724,38 @@ msgstr "인트라넷 웹 서버:"
 msgid "Configuring your system as Apache server ..."
 msgstr "DNS 서버 설정 중"
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "DHCP 서버 설정 중"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "DHCP 서버 설정 중"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "DHCP 서버 설정 중"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "설정 마법사"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "데이터베이스 서버"
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "데이터베이스 서버"
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "DNS 설정 마법사"
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "새 클라이언트가 추가되었습니다."
+
 #~ msgid "The wizard successfully configured your NFS server"
 #~ msgstr "마법사가 성공적으로 NFS 서버를 설정하였습니다."
 
diff --git a/po/ku.po b/po/ku.po
index cc07ab63..666f3b96 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-ku\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-05-22 20:15+0100\n"
 "Last-Translator: Kader DILSIZ, Amed çiya <kader@kaderland.net, "
 "amedcj@hotmail.com>\n"
@@ -40,7 +40,7 @@ msgstr "Xeletî."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -130,12 +130,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Xeletî"
 
@@ -552,7 +553,7 @@ msgid "Domainname:"
 msgstr "Navê qadê:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Sêrbazê, navê makîneyê bi awayekî biserketî li DNS'a we kir."
 
 #: ../dns_wizard/Bind.pm:256
@@ -946,7 +947,7 @@ msgstr "Passporta xwe ji bo hesabe managere yen servere Kolab bide"
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Şîfre:"
 
@@ -984,196 +985,238 @@ msgstr "Pêşkêşkara Kolabê di pergala we de tê vakirin..."
 msgid "Configuring Kolab server on your system..."
 msgstr "Pêşkêşkara PXE'yê di pergala we de tê vakirin..."
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Pêşkêşkara DHCP'ê ava dibe"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Sêrbaza Ldapyê"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Pêşkêşkara DHCP'ê ava dibe"
+msgid "Show Ldap configuration"
+msgstr "Sêrbaza avakirina LDAP'ê"
 
-#: ../ldap_wizard/Ldap.pm:81
+#: ../ldap_wizard/Ldap.pm:86
 #, fuzzy
-msgid "Add user in OpenLDAP server"
+msgid "Add user in Ldap server"
 msgstr "Lê 'ke - dane li pêşkêşkara LDAP'ê 'ke"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "Sêrbaza avakirina LDAP'ê"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Pêşkêşkara PXE'yê saz bike."
+msgid "Ldap configuration wizard"
+msgstr "Sêrbaza avakirina LDAP'ê"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "Pêşkêşkara PXE'yê saz bike."
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "Ji avakirina DNS'ê ya heyî, navê makîneyekê rake."
+msgid "Delete configuration"
+msgstr "Avakirina pêşkêşkara sazkirinê"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Navê Bikarhênerê/î:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Nav:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Navê Bikarhênerê/î:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Navê Bikarhênerê/î:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Kontaner:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Şîfre"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Dîsa şîfre:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Samba tê avakirin"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Navê qadê:"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Rêzika FTTP'ê:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Rêzika FTTP'ê:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Şîfre:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Dîsa şîfre:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Rêzika FTTP'ê:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Nav:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Navê Bikarhênerê/î:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Pêşkêşkara DHCP'ê ava dibe"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Kontaner:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "Sêrbazê Pêşkêşkara we ya LDAP'ê bi awayekî biserketî ava kir."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 #, fuzzy
 msgid "Successfully added User"
 msgstr "Lêkirina daneyan bi ser ket"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:256
 #, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Sêrbazê bi awayekî biserketî têketina Idapê lê kir."
+msgid "Error when adding user in Ldap datase"
+msgstr "Lê 'ke - dane li pêşkêşkara LDAP'ê 'ke"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Sêrbazê pêşkêşkara Samba bi awayekî biserkekî ava kir."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Bi ser neket"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Xeletî"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1964,7 +2007,7 @@ msgstr "Xiyala vebûnê lê 'ke"
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 #, fuzzy
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr "Xiyala 10'ê, xiyala Mandrake cooker..."
 
@@ -2106,7 +2149,7 @@ msgid ""
 msgstr "Ağ istemci arayüzü: Kurulum işlemi için kullanılacak ağ arayüzü."
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2758,6 +2801,42 @@ msgstr "Pêşkêşkara Apache Webê"
 msgid "Configuring your system as Apache server ..."
 msgstr "Pergala we wekî Pêşkêşkara Apache Webê tê avakirin..."
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "Pêşkêşkara DHCP'ê ava dibe"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Pêşkêşkara DHCP'ê ava dibe"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Pêşkêşkara DHCP'ê ava dibe"
+
+#, fuzzy
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Lê 'ke - dane li pêşkêşkara LDAP'ê 'ke"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Sêrbaza avakirina LDAP'ê"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Pêşkêşkara PXE'yê saz bike."
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Pêşkêşkara PXE'yê saz bike."
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "Ji avakirina DNS'ê ya heyî, navê makîneyekê rake."
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Sêrbazê bi awayekî biserketî têketina Idapê lê kir."
+
 #~ msgid ""
 #~ "PXE name: the name displayed in PXE menu (please provide an ASCII word or "
 #~ "a number, without spaces)"
diff --git a/po/lv.po b/po/lv.po
index 969f60f6..29f32bd6 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2002-09-18 22:09+0200\n"
 "Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
 "Language-Team: ll10nt <ll10nt@listes.murds.lv>\n"
@@ -42,7 +42,7 @@ msgstr "Meistara kļūda."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -136,12 +136,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
 msgstr "Meistara kļūda."
@@ -534,7 +535,7 @@ msgstr ""
 
 #: ../dns_wizard/Bind.pm:246
 #, fuzzy
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Meistars veiksmīgi pievienoja klientu."
 
 #: ../dns_wizard/Bind.pm:256
@@ -913,7 +914,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Parole:"
 
@@ -957,196 +958,236 @@ msgstr "Tiek konfigurēts FTP serveris"
 msgid "Configuring Kolab server on your system..."
 msgstr "Tiek konfigurēts FTP serveris"
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Tiek konfigurēts DHCP serveris"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Ldap meistars"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Tiek konfigurēts DHCP serveris"
+msgid "Show Ldap configuration"
+msgstr "Konfigurācijas meistars"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
+#: ../ldap_wizard/Ldap.pm:86
+msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "Konfigurācijas meistars"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Datubāzu serveris"
+msgid "Ldap configuration wizard"
+msgstr "Konfigurācijas meistars"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "Datubāzu serveris"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "DNS konfigurēšanas meistars"
+msgid "Delete configuration"
+msgstr "Laika servera konfigurācija saglabāta"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Lietotāja pievienošana"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Vārds:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Lietotāja vārds:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
+#: ../ldap_wizard/Ldap.pm:144
 #, fuzzy
-msgid "User Name:"
-msgstr "Lietotāja vārds:"
+msgid "User Login:"
+msgstr "Lietotāja pievienošana"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Parole:"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Parole:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Paroles nesakrīt"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Tiek konfigurēta Samba"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Domain name: "
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Direktorijs:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Direktorijs:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Parole:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Parole:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Direktorijs:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Vārds:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+#, fuzzy
+msgid "User Name:"
+msgstr "Lietotāja vārds:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Tiek konfigurēts DHCP serveris"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Lietotāja pievienošana"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "Meistars veiksmīgi nokonfigurēja proxy serveri."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:211
-#, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Meistars veiksmīgi pievienoja klientu."
+#: ../ldap_wizard/Ldap.pm:256
+msgid "Error when adding user in Ldap datase"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Meistars veiksmīgi nokonfigurēja Samba serveri"
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "atļauts"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Meistara kļūda."
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1913,7 +1954,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 
@@ -2037,7 +2078,7 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2658,6 +2699,38 @@ msgstr "Intraneta Web serveris"
 msgid "Configuring your system as Apache server ..."
 msgstr "Tiek konfigurēts DNS serveris"
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "Tiek konfigurēts DHCP serveris"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Tiek konfigurēts DHCP serveris"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Tiek konfigurēts DHCP serveris"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Konfigurācijas meistars"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Datubāzu serveris"
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Datubāzu serveris"
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "DNS konfigurēšanas meistars"
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Meistars veiksmīgi pievienoja klientu."
+
 #~ msgid "Last Name:"
 #~ msgstr "Uzvārds:"
 
diff --git a/po/mk.po b/po/mk.po
index 1c58f88b..83492f02 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2002-12-07 12:44+0100\n"
 "Last-Translator: Danko Ilik <danko@mindless.com>\n"
 "Language-Team: Macedonian\n"
@@ -41,7 +41,7 @@ msgstr "Грешка."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -138,12 +138,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Грешка"
 
@@ -551,7 +552,7 @@ msgstr ""
 
 #: ../dns_wizard/Bind.pm:246
 #, fuzzy
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Самовилата успешно го додаде клиентот."
 
 #: ../dns_wizard/Bind.pm:256
@@ -937,7 +938,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Лозинка:"
 
@@ -982,197 +983,238 @@ msgstr "Конфигурирање на FTP серверот"
 msgid "Configuring Kolab server on your system..."
 msgstr "Конфигурирање на FTP серверот"
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Конфигурирање на DHCP серверот"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Ldap самовила"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Конфигурирање на DHCP серверот"
+msgid "Show Ldap configuration"
+msgstr "Конфигурациска самовила"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
+#: ../ldap_wizard/Ldap.pm:86
+msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "Конфигурациска самовила"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Database сервер"
+msgid "Ldap configuration wizard"
+msgstr "Конфигурациска самовила"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "Database сервер"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "DNS самовила (конфигурација)"
+msgid "Delete configuration"
+msgstr "Поставките на временски сервер се зачувани"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Додавање корисник"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 #, fuzzy
 msgid "First Name:"
 msgstr "Име на хост:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Корисничко име:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
+#: ../ldap_wizard/Ldap.pm:144
 #, fuzzy
-msgid "User Name:"
-msgstr "Корисничко име:"
+msgid "User Login:"
+msgstr "Додавање корисник"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Лозинка:"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Лозинка:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Лозинките не се совпаѓаат"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Конфигурирање на Samba"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Пресметано име на домен"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Споделен директориум:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Споделен директориум:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Лозинка:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Лозинка:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Споделен директориум:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Име на хост:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+#, fuzzy
+msgid "User Name:"
+msgstr "Корисничко име:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Конфигурирање на DHCP серверот"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Додавање корисник"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "Самовилата успешно го конфигурираше Вашиот proxy сервер."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:211
-#, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Самовилата успешно го додаде клиентот."
+#: ../ldap_wizard/Ldap.pm:256
+msgid "Error when adding user in Ldap datase"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Самовилата успешно го конфигурираше Вашиот Samba сервер."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "вклучено"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Самовилска грешка."
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1980,7 +2022,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 
@@ -2104,7 +2146,7 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2763,6 +2805,38 @@ msgstr "Внатрешен веб сервер:"
 msgid "Configuring your system as Apache server ..."
 msgstr "Конфигурирање на DNS серверот"
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "Конфигурирање на DHCP серверот"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Конфигурирање на DHCP серверот"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Конфигурирање на DHCP серверот"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Конфигурациска самовила"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Database сервер"
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Database сервер"
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "DNS самовила (конфигурација)"
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Самовилата успешно го додаде клиентот."
+
 #~ msgid "The wizard successfully configured your NFS server"
 #~ msgstr "Самовилата успешно го конфигурираше Вашиот NFS сервер"
 
diff --git a/po/ms.po b/po/ms.po
index a144fb2c..d8a266a7 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-02-24 20:45+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -41,7 +41,7 @@ msgstr "Ralat."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -132,12 +132,13 @@ msgstr "Amaran dalam."
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Ralat"
 
@@ -543,7 +544,7 @@ msgstr ""
 
 #: ../dns_wizard/Bind.pm:246
 #, fuzzy
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "DHCP."
 
 #: ../dns_wizard/Bind.pm:256
@@ -934,7 +935,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Katalaluan:"
 
@@ -978,197 +979,239 @@ msgstr "FTP"
 msgid "Configuring Kolab server on your system..."
 msgstr "FTP"
 
-#: ../ldap_wizard/Ldap.pm:26
+#: ../ldap_wizard/Ldap.pm:27
 #, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Terima Notis Pelayan"
+msgid "Ldap wizard"
+msgstr "Masa"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Terima Notis Pelayan"
+msgid "Show Ldap configuration"
+msgstr "Membaca fail konfigurasi sistem %s..."
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
+#: ../ldap_wizard/Ldap.pm:86
+msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "Membaca fail konfigurasi sistem %s..."
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Terima Notis Pelayan"
+msgid "Ldap configuration wizard"
+msgstr "Membaca fail konfigurasi sistem %s..."
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "Terima Notis Pelayan"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "--help  Keluarkan bantuan ini."
+msgid "Delete configuration"
+msgstr "Terima Notis Pelayan"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Nama Pengguna:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 #, fuzzy
 msgid "First Name:"
 msgstr "_Nama Warna:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Nama Pengguna:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Nama Pengguna:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "bekas-html"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Katalaluan:"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Katalaluan:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Proksi SOCKS: %s"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Nama warna latarbelakang"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "jendela-direktori"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "jendela-direktori"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Katalaluan:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Katalaluan:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "jendela-direktori"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "_Nama Warna:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Nama Pengguna:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Terima Notis Pelayan"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "bekas-html"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "Internet FTP"
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 #, fuzzy
 msgid "Successfully added User"
 msgstr "IDENT: data tidak betul."
 
-#: ../ldap_wizard/Ldap.pm:211
-#, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "DHCP."
+#: ../ldap_wizard/Ldap.pm:256
+msgid "Error when adding user in Ldap datase"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Internet FTP"
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Gagal"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Ralat"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1960,7 +2003,7 @@ msgstr "Format imej tidak diketahui"
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 
@@ -2088,7 +2131,7 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2755,6 +2798,38 @@ msgstr "(%ld)PELAYAN >>> %s"
 msgid "Configuring your system as Apache server ..."
 msgstr "FTP"
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "Terima Notis Pelayan"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Terima Notis Pelayan"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Terima Notis Pelayan"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Membaca fail konfigurasi sistem %s..."
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Terima Notis Pelayan"
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Terima Notis Pelayan"
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "--help  Keluarkan bantuan ini."
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "DHCP."
+
 #~ msgid "FTP Server"
 #~ msgstr "Pelayan FTP"
 
diff --git a/po/mt.po b/po/mt.po
index a38068f5..701baeba 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-mt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2003-09-10 06:34+0200\n"
 "Last-Translator: Ramon Casha <rcasha@waldonet.net.mt>\n"
 "Language-Team: Maltese <mt@li.org>\n"
@@ -45,7 +45,7 @@ msgstr "Problema."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -139,12 +139,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
 msgstr "Problema."
@@ -553,7 +554,7 @@ msgstr ""
 
 #: ../dns_wizard/Bind.pm:246
 #, fuzzy
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Is-saħħar żied il-klijent."
 
 #: ../dns_wizard/Bind.pm:256
@@ -937,7 +938,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Password:"
 
@@ -983,197 +984,238 @@ msgstr "Qed jiġi kkonfigurat is-server FTP"
 msgid "Configuring Kolab server on your system..."
 msgstr "Qed jiġi kkonfigurat is-server FTP"
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Qed jiġi kkonfigurat is-server DHCP"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Saħħar tas-Ldap"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Qed jiġi kkonfigurat is-server DHCP"
+msgid "Show Ldap configuration"
+msgstr "Saħħar ta' konfigurazzjoni"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
+#: ../ldap_wizard/Ldap.pm:86
+msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "Saħħar ta' konfigurazzjoni"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Server tad-database"
+msgid "Ldap configuration wizard"
+msgstr "Saħħar ta' konfigurazzjoni"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "Server tad-database"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "Saħħar ta' konfigurazzjoni DNS"
+msgid "Delete configuration"
+msgstr "Konfigurazzjoni tas-server tal-ħin miktuba"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Żieda ta' user"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 #, fuzzy
 msgid "First Name:"
 msgstr "Isem tal-kompjuter:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Isem tal-user:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
+#: ../ldap_wizard/Ldap.pm:144
 #, fuzzy
-msgid "User Name:"
-msgstr "Isem tal-user:"
+msgid "User Login:"
+msgstr "Żieda ta' user"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Password:"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Password:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Il-passwords ma jaqblux"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Qed jiġi kkonfigurat Samba"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Masquerade tal-isem tad-dominju:"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Direttorju tal-users:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Direttorju tal-users:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Password:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Password:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Direttorju tal-users:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Isem tal-kompjuter:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+#, fuzzy
+msgid "User Name:"
+msgstr "Isem tal-user:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Qed jiġi kkonfigurat is-server DHCP"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Żieda ta' user"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "Is-saħħar ikkonfiguralek is-server proxy."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:211
-#, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Is-saħħar żied il-klijent."
+#: ../ldap_wizard/Ldap.pm:256
+msgid "Error when adding user in Ldap datase"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Is-saħħar ikkonfiguralek is-server Samba."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "attivat"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Problema."
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1975,7 +2017,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 
@@ -2101,7 +2143,7 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2746,6 +2788,38 @@ msgstr "Web server għall-intranet:"
 msgid "Configuring your system as Apache server ..."
 msgstr "Qed jiġi kkonfigurat is-server DNS"
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "Qed jiġi kkonfigurat is-server DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Qed jiġi kkonfigurat is-server DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Qed jiġi kkonfigurat is-server DHCP"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Saħħar ta' konfigurazzjoni"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Server tad-database"
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Server tad-database"
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "Saħħar ta' konfigurazzjoni DNS"
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Is-saħħar żied il-klijent."
+
 #~ msgid "The wizard successfully configured your NFS server"
 #~ msgstr "Is-saħħar ikkonfiguralek is-server NFS."
 
diff --git a/po/nb.po b/po/nb.po
index abe957d9..1f3dfe7b 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-08-24 07:42+0200\n"
 "Last-Translator: Per Øyvind Karlsen <peroyvind@sintrax.net>\n"
 "Language-Team: Norwegian Bokmål <nb@li.org>\n"
@@ -49,7 +49,7 @@ msgstr "Feil."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -139,12 +139,13 @@ msgstr "Du er i dhcp, tjeneren vil muligens ikke virke med din konfigurasjon."
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Feil"
 
@@ -561,7 +562,7 @@ msgid "Domainname:"
 msgstr "Domenenavn:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Veiviseren la vellykket til vert i din DNS."
 
 #: ../dns_wizard/Bind.pm:256
@@ -942,7 +943,7 @@ msgstr "Skriv inn passordet for manager-konto til Kolab-tjener."
 msgid "Password mismatch, or null password, please correct."
 msgstr "Passord stemmer ikke overens, eller er tomt passord, vennligst rett."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Passord:"
 
@@ -982,180 +983,227 @@ msgstr "Installerer Kolab-tjener på ditt system..."
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurerer Kolab-tjener på ditt system..."
 
-#: ../ldap_wizard/Ldap.pm:26
-msgid "Configure OpenLDAP Server "
-msgstr "Konfigurerer OpenLDAP-tjener "
-
-#: ../ldap_wizard/Ldap.pm:80
-msgid "Configure OpenLDAP server"
-msgstr "Konfigurerer OpenLDAP-tjener"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Ldap-veiviser"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
-msgstr "Legg til bruker i OpenLDAP-tjener"
+#: ../ldap_wizard/Ldap.pm:85
+#, fuzzy
+msgid "Show Ldap configuration"
+msgstr "Ldap-konfigurasjonsveiviser"
 
 #: ../ldap_wizard/Ldap.pm:86
-msgid "OpenLDAP configuration wizard"
-msgstr "OpenLDAP-konfigurasjonsveiviser"
+msgid "Add user in Ldap server"
+msgstr "Legg til bruker i Ldap-tjener"
 
-#: ../ldap_wizard/Ldap.pm:86
-msgid "Setup an OpenLDAP server."
-msgstr "Sett opp en OpenLDAP-tjener."
+#: ../ldap_wizard/Ldap.pm:87
+#, fuzzy
+msgid "Delete Ldap configuration"
+msgstr "Ldap-konfigurasjonsveiviser"
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
+msgid "Ldap configuration wizard"
+msgstr "Ldap-konfigurasjonsveiviser"
 
-#: ../ldap_wizard/Ldap.pm:93
-msgid "You must setup an OpenLDAP server first."
-msgstr "Du må sette opp en OpenLDAP-tjener først."
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
+msgid "You must setup an Ldap server first."
+msgstr "Du må sette opp en Ldap-tjener først."
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Ditt valg:"
 
-#: ../ldap_wizard/Ldap.pm:110
-msgid "Save an existing configuration"
-msgstr "Lagrer en eksisterende konfigurasjon"
+#: ../ldap_wizard/Ldap.pm:132
+#, fuzzy
+msgid "Delete configuration"
+msgstr "Installer tjenerkonfigurasjon"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr "LDAP Legg til bruker"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 msgid "User Created in: "
 msgstr "Bruker Opprettet i: "
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Fornavn:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Brukernavn:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Brukerbeholder:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr "Du må skrive inn et gyldig Fornavn."
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr "Du må skrive inn et gyldig Navn."
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr "Du må skrive inn et gyldig Brukernavn."
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 msgid "LDAP User Password"
 msgstr "LDAP-BrukerPassord"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr "passord må stemme overens"
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 msgid "Password (again):"
 msgstr "Gjenta passord:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr "Du må skrive inn et passord for LDAP."
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Passordene stemmer ikke overens"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Adrministrator"
+msgstr "Administrattor LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
 msgid "Configuring LDAP Server"
 msgstr "Konfigurerer LDAP-tjener"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
-msgstr ""
-"LDAP-suffiks:\n"
-" feks: dc=eksempel,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Domenenavn:"
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
+msgstr "Administrattor LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "TFTP-katalog:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
-"LDAP-administrator:\n"
-" ex: cn=admin,dc=eksempel,dc=com\n"
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "TFTP-katalog:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr "Administrattor LDAP:"
+
+#: ../ldap_wizard/Ldap.pm:188
 msgid "LDAP Password:"
 msgstr "LDAP-passord:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 msgid "LDAP Password (again):"
 msgstr "Gjenta LDAP-passord:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
-msgstr "Du må taste inn et suffiks for LDAP."
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:192
+#, fuzzy
+msgid "Administrator"
+msgstr "Administrattor LDAP"
+
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Du må skrive inn et gyldig Fornavn."
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr "Bekreftelse om brukeren skal opprettes"
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 msgid "First name:"
 msgstr "Fornavn:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Brukernavn:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr "Opprett i:"
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Bekreftelsesinformasjon for å opprette LDAP-tjener"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr "Organisasjon LDAP:"
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr "Administrattor LDAP:"
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 msgid "Users Container:"
 msgstr "Brukerbeholder:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "Veiviseren har gjennomført konfigureringen av LDAP-tjeneren."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr "Bruker ble vellykket lagt til "
 
-#: ../ldap_wizard/Ldap.pm:211
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Veiviseren la en vellykket til en bruker i LDAP"
+#: ../ldap_wizard/Ldap.pm:256
+#, fuzzy
+msgid "Error when adding user in Ldap datase"
+msgstr "Legg til bruker i Ldap-tjener"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr "Tjener er allerede konfigurert"
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr "Du har allerede konfigurert din OpenLDAP-tjener med drakwizard\n"
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Du har allerede konfigurert din Ldap-tjener med drakwizard\n"
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, perl-format
 msgid "%s Failed"
 msgstr "%s Feilet"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 msgid "Error!"
 msgstr "Feil!"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr "Klarte ikke å koble til %s"
@@ -1956,7 +2004,7 @@ msgstr "Legg til oppstartsimagefil"
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "PXE-beskrivelse blir brukt for å forklare rollen til oppstartsimagefilen, "
@@ -2104,7 +2152,7 @@ msgstr ""
 "installasjonsprosessen."
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr "Ramsize: juster ramsize-parameter på oppstartsdisk."
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2748,6 +2796,56 @@ msgstr "Apache-tjener"
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurerer ditt system som en Apache-tjener ..."
 
+#~ msgid "Configure Ldap server"
+#~ msgstr "Konfigurerer Ldap-tjener"
+
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Konfigurerer OpenLDAP-tjener "
+
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Konfigurerer OpenLDAP-tjener"
+
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Legg til bruker i OpenLDAP-tjener"
+
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "OpenLDAP-konfigurasjonsveiviser"
+
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Sett opp en OpenLDAP-tjener."
+
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Du må sette opp en OpenLDAP-tjener først."
+
+#~ msgid "Save an existing configuration"
+#~ msgstr "Lagrer en eksisterende konfigurasjon"
+
+#~ msgid ""
+#~ "LDAP Suffix:\n"
+#~ " ex: dc=example,dc=com\n"
+#~ msgstr ""
+#~ "LDAP-suffiks:\n"
+#~ " feks: dc=eksempel,dc=com\n"
+
+#~ msgid ""
+#~ "LDAP Administrator:\n"
+#~ " ex: cn=admin,dc=example,dc=com\n"
+#~ msgstr ""
+#~ "LDAP-administrator:\n"
+#~ " ex: cn=admin,dc=eksempel,dc=com\n"
+
+#~ msgid "You must enter a suffix for LDAP."
+#~ msgstr "Du må taste inn et suffiks for LDAP."
+
+#~ msgid "Organisation LDAP:"
+#~ msgstr "Organisasjon LDAP:"
+
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Veiviseren la en vellykket til en bruker i LDAP"
+
+#~ msgid "You have already configured your OpenLDAP Server with drakwizard\n"
+#~ msgstr "Du har allerede konfigurert din OpenLDAP-tjener med drakwizard\n"
+
 #~ msgid "LDAP User Add"
 #~ msgstr "LDAP Legg til bruker"
 
diff --git a/po/nl.po b/po/nl.po
index 658e4113..1d40bec4 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-03-07 23:55+0100\n"
 "Last-Translator: Reinout van Schouwen <reinout@cs.vu.nl>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -43,7 +43,7 @@ msgstr "Fout opgetreden."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -137,12 +137,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Fout opgetreden"
 
@@ -559,7 +560,7 @@ msgid "Domainname:"
 msgstr "Domeinnaam:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "De wizard heeft de client succesvol aan uw DNS toegevoegd."
 
 #: ../dns_wizard/Bind.pm:256
@@ -948,7 +949,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Wachtwoord:"
 
@@ -992,196 +993,238 @@ msgstr "De PXE server op ow computer wordt geconfigureerd..."
 msgid "Configuring Kolab server on your system..."
 msgstr "De PXE server op ow computer wordt geconfigureerd..."
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "De DHCP server wordt geconfigureerd"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Ldap wizard"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "De DHCP server wordt geconfigureerd"
+msgid "Show Ldap configuration"
+msgstr "LDAP Configuratiewizard"
 
-#: ../ldap_wizard/Ldap.pm:81
+#: ../ldap_wizard/Ldap.pm:86
 #, fuzzy
-msgid "Add user in OpenLDAP server"
+msgid "Add user in Ldap server"
 msgstr "Voeg een item toe aan de LDAP server"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "LDAP Configuratiewizard"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "LDAP server configureren"
+msgid "Ldap configuration wizard"
+msgstr "LDAP Configuratiewizard"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "LDAP server configureren"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "Een computer uit de bestaande DNS configuratie verwijderen."
+msgid "Delete configuration"
+msgstr "Configuratie van de installatie server"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Gebruikerstoevoeging"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Voornaam:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Gebruikersnaam:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Gebruikersnaam:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Container:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Wachtwoord"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Wachtwoord (nogmaals):"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "De wachtwoorden komen niet overeen"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "De DHCP server wordt geconfigureerd"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Domeinnaam:"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "TFTP map:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "TFTP map:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Wachtwoord:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Wachtwoord (nogmaals):"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "TFTP map:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Voornaam:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Gebruikersnaam:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "De DHCP server wordt geconfigureerd"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Container:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "De wizard heeft de LDAP succesvol ingesteld."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 #, fuzzy
 msgid "Successfully added User"
 msgstr "Gegevens succesvol toegevoegd"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:256
 #, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "De wizard heeft de gegevens succesvol toegevoegd."
+msgid "Error when adding user in Ldap datase"
+msgstr "Voeg een item toe aan de LDAP server"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "De wizard heeft uw Samba server succesvol geconfigureerd."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Mislukt"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Fout opgetreden"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1984,7 +2027,7 @@ msgstr "Opstart-beeldbestand toevoegen"
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 #, fuzzy
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "PXE-beschrijving wordt gebruikt om de regel van het opstartbeeldbestand uit "
@@ -2131,7 +2174,7 @@ msgstr ""
 "installatieproces."
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 "RAM-grootte: pas de omvang van de ramsize-parameter op de opstartschijf aan."
 
@@ -2779,6 +2822,42 @@ msgstr "Apache webserver:"
 msgid "Configuring your system as Apache server ..."
 msgstr "De computer wordt als Apache webserver geconfigureerd ..."
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "De DHCP server wordt geconfigureerd"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "De DHCP server wordt geconfigureerd"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "De DHCP server wordt geconfigureerd"
+
+#, fuzzy
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Voeg een item toe aan de LDAP server"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "LDAP Configuratiewizard"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "LDAP server configureren"
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "LDAP server configureren"
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "Een computer uit de bestaande DNS configuratie verwijderen."
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "De wizard heeft de gegevens succesvol toegevoegd."
+
 #~ msgid ""
 #~ "PXE name: the name displayed in PXE menu (please provide an ASCII word or "
 #~ "a number, without spaces)"
diff --git a/po/pl.po b/po/pl.po
index 4c094f0a..9ba24585 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-pl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-23 00:59+0800\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-08-24 22:25+0200\n"
 "Last-Translator: Arkadiusz Lipiec <arkadiusz.lipiec@gazeta.pl>\n"
 "Language-Team: polski <pl@li.org>\n"
@@ -44,7 +44,7 @@ msgstr "Błąd."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -131,12 +131,13 @@ msgstr "Jesteś w dhcp, serwer może nie pracować z tą konfiguracją."
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Błąd"
 
@@ -551,7 +552,7 @@ msgid "Domainname:"
 msgstr "Nazwa domeny:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Druid pomyślnie dodał komputer do DNS."
 
 #: ../dns_wizard/Bind.pm:256
@@ -931,7 +932,7 @@ msgstr "Wprowadź hasło dla konta zarządczego serwera Kolab."
 msgid "Password mismatch, or null password, please correct."
 msgstr "Hasło się nie zgadza lub jest puste. Popraw je."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Hasło:"
 
@@ -971,179 +972,227 @@ msgstr "Instalowanie serwera Kolab w systemie..."
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurowanie serwera Kolab w systemie..."
 
-#: ../ldap_wizard/Ldap.pm:26
-msgid "Configure OpenLDAP Server "
-msgstr "Konfigurowanie serwera OpenLDAP"
-
-#: ../ldap_wizard/Ldap.pm:80
-msgid "Configure OpenLDAP server"
-msgstr "Konfigurowanie serwera OpenLDAP "
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Druid Samby"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
-msgstr "Dodaj użytkownika do serwera OpenLDAP "
+#: ../ldap_wizard/Ldap.pm:85
+#, fuzzy
+msgid "Show Ldap configuration"
+msgstr "Druid konfiguracji Ldap "
 
 #: ../ldap_wizard/Ldap.pm:86
-msgid "OpenLDAP configuration wizard"
-msgstr "Druid konfiguracji OpenLDAP "
+msgid "Add user in Ldap server"
+msgstr "Dodaj użytkownika do serwera Ldap "
 
-#: ../ldap_wizard/Ldap.pm:86
-msgid "Setup an OpenLDAP server."
-msgstr "Instalacja serwera OpenLDAP "
+#: ../ldap_wizard/Ldap.pm:87
+#, fuzzy
+msgid "Delete Ldap configuration"
+msgstr "Druid konfiguracji Ldap "
 
-#: ../ldap_wizard/Ldap.pm:93
-msgid "You must setup an OpenLDAP server first."
-msgstr "Musisz najpierw zainstalować serwer OpenLDAP."
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
+msgid "Ldap configuration wizard"
+msgstr "Druid konfiguracji Ldap "
+
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
+msgid "You must setup an Ldap server first."
+msgstr "Musisz najpierw zainstalować serwer Ldap."
+
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Twój wybór:"
 
-#: ../ldap_wizard/Ldap.pm:110
-msgid "Save an existing configuration"
-msgstr "Zapisz istniejącą konfigurację"
+#: ../ldap_wizard/Ldap.pm:132
+#, fuzzy
+msgid "Delete configuration"
+msgstr "Konfiguracja serwera instalacyjnego"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr "Dodawanie użytkownika LDAP"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 msgid "User Created in: "
 msgstr "Utworzono użytkownika w:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Imię:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Nazwa użytkownika:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Pojemnik użytkowników:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr "Wprowadź prawidłowe imię."
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr "Wprowadź prawidłową Nazwę."
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr "Wprowadź prawidłową nazwę użytkownika."
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 msgid "LDAP User Password"
 msgstr "Hasło użytkownika LDAP"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr "hasła muszą być takie same"
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 msgid "Password (again):"
 msgstr "Hasło (ponownie):"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr "Wprowadź hasło do LDAP."
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Hasła nie zgadzają się"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Adrministrator"
+msgstr "Administrator LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
 msgid "Configuring LDAP Server"
 msgstr "Konfigurowanie serwera LDAP"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
-msgstr ""
-"Sufiks LDAP:\n"
-" ex: dc=przyklad,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Nazwa domeny:"
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
+msgstr "Administrator LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Katalog TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
-"Administrator LDAP:\n"
-" ex: cn=admin,dc=przyklad,dc=com\n"
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Katalog TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr "Administrator LDAP:"
+
+#: ../ldap_wizard/Ldap.pm:188
 msgid "LDAP Password:"
 msgstr "Hasło LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 msgid "LDAP Password (again):"
 msgstr "Hasło LDAP (ponownie):"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
-msgstr "Musisz wprowadzić sufiks dla LDAP."
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:192
+#, fuzzy
+msgid "Administrator"
+msgstr "Administrator LDAP"
+
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Wprowadź prawidłowe imię."
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr "Potwierdź utworzenie użytkownika"
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 msgid "First name:"
 msgstr "Imię:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Nazwa użytkownika:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr "Utwórz w:"
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Potwierdzenie utworzenia serwera LDAP"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr "Organizacja LDAP:"
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr "Administrator LDAP:"
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 msgid "Users Container:"
 msgstr "Pojemnik użytkowników:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "Druid pomyślnie skonfigurował serwer LDAP."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr "Pomyślnie dodano użytkownika"
 
-#: ../ldap_wizard/Ldap.pm:211
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Druid dodał użytkownika LDAP"
+#: ../ldap_wizard/Ldap.pm:256
+#, fuzzy
+msgid "Error when adding user in Ldap datase"
+msgstr "Dodaj użytkownika do serwera Ldap "
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr "Serwer jest już skonfigurowany"
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr "Serwer OpenLDAP został już skonfigurowany z pomocą drakwizard'a\n"
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Serwer Ldap został już skonfigurowany z pomocą drakwizard'a\n"
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
+#, perl-format
 msgid "%s Failed"
 msgstr "%s zakończone niepowodzeniem"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 msgid "Error!"
 msgstr "Błąd!"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr "Nie można połączyć się z %s"
@@ -1943,19 +1992,18 @@ msgstr "Dodaj obraz rozruchowy"
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "Opis PXE jest używany do wyjaśnienia zasad obrazu rozruchowego, np: obraz "
 "Mandrakelinux 10, obraz cooker'a Mandrakelinux..."
 
-#: ../pxe_wizard/Pxe.pm:132
+#: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
+#, fuzzy
 msgid ""
-"PXE name: the name displayed in PXE menu (please provide a word or a number, "
-"without space)"
-msgstr ""
-"Nazwa PXE: nazwa wyświetlana w menu PXE (wprowadź jedno słowo/liczbę, bez "
-"spacji)"
+"PXE name: the name displayed in PXE menu (please provide an ASCII word or a "
+"number, with no spaces)"
+msgstr "Nazwa PXE: nazwa w menu PXE (jedno słowo/liczba, bez spacji)"
 
 #: ../pxe_wizard/Pxe.pm:132
 msgid "Path to image: provide the full path to the network boot image"
@@ -1988,20 +2036,15 @@ msgstr ""
 "wszystkimi wymaganymi sterownikami (w naszym przypadku all.rdz)."
 
 #: ../pxe_wizard/Pxe.pm:142
-msgid ""
-"PXE name: the name displayed in PXE menu (please provide a word or a number, "
-"with no space)"
-msgstr "Nazwa PXE: nazwa w menu PXE (jedno słowo/liczba, bez spacji)"
-
-#: ../pxe_wizard/Pxe.pm:142
 msgid "Path to all.rdz: provide the full path to all.rdz image"
 msgstr "Ścieżka do all.rdz: pełna ścieżka do obrazu all.rdz"
 
 #: ../pxe_wizard/Pxe.pm:142
+#, fuzzy
 msgid ""
-"To boot through network, network computers need boot image. Moreover we need "
-"to name this image, so each boot image is related to a name in PXE menu. So "
-"user can choose whfich image he wants to boot through PXE."
+"To boot through network, network computers need a boot image. Moreover we "
+"need to name this image, so each boot image is related to a name in PXE "
+"menu. So user can choose which image he wants to boot through PXE."
 msgstr ""
 "Do uruchomienia komputera przez sieć niezbędny jest obraz rozruchowy. "
 "Ponadto niezbędna jest nazwa tego obrazu ponieważ każdy z obrazów "
@@ -2053,7 +2096,9 @@ msgid "Add option to the PXE boot image"
 msgstr "Dodaj opcję do obrazu rozruchowego PXE:"
 
 #: ../pxe_wizard/Pxe.pm:170
-msgid "Install directory: the full path to MDK install server directory"
+#, fuzzy
+msgid ""
+"Install directory: the full path to Mandrakelinux install server directory"
 msgstr ""
 "Katalog instalacyjny: pełna ścieżka do katalogu serwera instalacyjnego MDK"
 
@@ -2062,9 +2107,10 @@ msgid "Installation method: choose NFS or HTTP."
 msgstr "Metoda instalacji: wybierz NFS lub HTTP."
 
 #: ../pxe_wizard/Pxe.pm:170
+#, fuzzy
 msgid ""
 "Server IP: IP address of the server, which contains installation directory. "
-"You can create one with MDK install server wizard."
+"You can create one with Mandrakelinux install server wizard."
 msgstr ""
 "Adres IP serwera: Adres IP serwera zawierającego katalog instalacyjny. Można "
 "utworzyć jeden przy użyciu druida konfiguracji serwera instalacyjnego MDK."
@@ -2095,7 +2141,7 @@ msgstr ""
 "instalacji."
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr "Rozmiar RAM: dopasuj rozmiar RAM na dysku rozruchowym."
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2145,9 +2191,10 @@ msgstr ""
 "tego nie uczynisz, zapytanie PXE nie będzie obsługiwane przez ten serwer."
 
 #: ../pxe_wizard/Pxe.pm:196
+#, fuzzy
 msgid ""
 "Please provide a bootable image. To boot through a network, network "
-"computers need boot image."
+"computers need a boot image."
 msgstr ""
 "Podaj obraz rozruchowy. Do uruchomienia komputera przez sieci niezbędny jest "
 "obraz rozruchowy."
@@ -2171,8 +2218,10 @@ msgid "Please choose an image from a different directory than %s."
 msgstr "Wybierz obraz z innego katalogu niż %s."
 
 #: ../pxe_wizard/Pxe.pm:220
+#, fuzzy
 msgid ""
-"Please provide a correct PXE name: one word or one number with no space."
+"Please provide a correct PXE name: one ASCII word or one number with no "
+"spaces."
 msgstr "Podaj poprawną nazwę PXE: jedno słowo lub liczba bez spacji."
 
 #: ../pxe_wizard/Pxe.pm:224
@@ -2728,3 +2777,90 @@ msgstr "Serwer Apache"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurowanie systemu jako serwera Apache ..."
+
+#~ msgid "Configure Ldap server"
+#~ msgstr "Konfigurowanie serwera Ldap "
+
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Konfigurowanie serwera OpenLDAP"
+
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Konfigurowanie serwera OpenLDAP "
+
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Dodaj użytkownika do serwera OpenLDAP "
+
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Druid konfiguracji OpenLDAP "
+
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Instalacja serwera OpenLDAP "
+
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Musisz najpierw zainstalować serwer OpenLDAP."
+
+#~ msgid "Save an existing configuration"
+#~ msgstr "Zapisz istniejącą konfigurację"
+
+#~ msgid ""
+#~ "LDAP Suffix:\n"
+#~ " ex: dc=example,dc=com\n"
+#~ msgstr ""
+#~ "Sufiks LDAP:\n"
+#~ " ex: dc=przyklad,dc=com\n"
+
+#~ msgid ""
+#~ "LDAP Administrator:\n"
+#~ " ex: cn=admin,dc=example,dc=com\n"
+#~ msgstr ""
+#~ "Administrator LDAP:\n"
+#~ " ex: cn=admin,dc=przyklad,dc=com\n"
+
+#~ msgid "You must enter a suffix for LDAP."
+#~ msgstr "Musisz wprowadzić sufiks dla LDAP."
+
+#~ msgid "Organisation LDAP:"
+#~ msgstr "Organizacja LDAP:"
+
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Druid dodał użytkownika LDAP"
+
+#~ msgid "You have already configured your OpenLDAP Server with drakwizard\n"
+#~ msgstr "Serwer OpenLDAP został już skonfigurowany z pomocą drakwizard'a\n"
+
+#~ msgid ""
+#~ "PXE name: the name displayed in PXE menu (please provide a word or a "
+#~ "number, without space)"
+#~ msgstr ""
+#~ "Nazwa PXE: nazwa wyświetlana w menu PXE (wprowadź jedno słowo/liczbę, bez "
+#~ "spacji)"
+
+#~ msgid ""
+#~ "PXE name: the name displayed in PXE menu (please provide a word or a "
+#~ "number, with no space)"
+#~ msgstr "Nazwa PXE: nazwa w menu PXE (jedno słowo/liczba, bez spacji)"
+
+#~ msgid ""
+#~ "To boot through network, network computers need boot image. Moreover we "
+#~ "need to name this image, so each boot image is related to a name in PXE "
+#~ "menu. So user can choose whfich image he wants to boot through PXE."
+#~ msgstr ""
+#~ "Do uruchomienia komputera przez sieć niezbędny jest obraz rozruchowy. "
+#~ "Ponadto niezbędna jest nazwa tego obrazu ponieważ każdy z obrazów "
+#~ "rozruchowych jest powiązany z nazwą w menu PXE. Użytkownik może wybrać "
+#~ "obraz, który będzie uruchamiany z PXE."
+
+#~ msgid "Install directory: the full path to MDK install server directory"
+#~ msgstr ""
+#~ "Katalog instalacyjny: pełna ścieżka do katalogu serwera instalacyjnego MDK"
+
+#~ msgid ""
+#~ "Please provide a bootable image. To boot through a network, network "
+#~ "computers need boot image."
+#~ msgstr ""
+#~ "Podaj obraz rozruchowy. Do uruchomienia komputera przez sieci niezbędny "
+#~ "jest obraz rozruchowy."
+
+#~ msgid ""
+#~ "Please provide a correct PXE name: one word or one number with no space."
+#~ msgstr "Podaj poprawną nazwę PXE: jedno słowo lub liczba bez spacji."
diff --git a/po/pt.po b/po/pt.po
index c3008a4f..e0e3ec20 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-08-31 21:28+0200\n"
 "Last-Translator: Jose Jorge <jjorge@free.fr>\n"
 "Language-Team: português <pt@li.org>\n"
@@ -48,7 +48,7 @@ msgstr "Erro."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -63,7 +63,8 @@ msgstr "Assistente de Cliente DNS"
 
 #: ../client_wizard/Bind_client.pm:47
 msgid "You must first run the DNS server wizard"
-msgstr "Necessita de correr, primeiro, o assistente de configuração do servidor DNS"
+msgstr ""
+"Necessita de correr, primeiro, o assistente de configuração do servidor DNS"
 
 #: ../client_wizard/Bind_client.pm:55
 msgid ""
@@ -75,7 +76,8 @@ msgstr ""
 
 #: ../client_wizard/Bind_client.pm:55
 msgid "Press next to begin, or Cancel to leave this wizard."
-msgstr "Carregue em Seguinte para começar, ou Anular para sair deste Assistente."
+msgstr ""
+"Carregue em Seguinte para começar, ou Anular para sair deste Assistente."
 
 #: ../client_wizard/Bind_client.pm:55
 msgid ""
@@ -87,7 +89,8 @@ msgstr ""
 
 #: ../client_wizard/Bind_client.pm:55
 msgid "This wizard will help you in adding a new client in your local DNS."
-msgstr "Este assistente vai ajudar-lo a adicionar um novo cliente no seu DNS local."
+msgstr ""
+"Este assistente vai ajudar-lo a adicionar um novo cliente no seu DNS local."
 
 #: ../client_wizard/Bind_client.pm:61
 msgid "(you don't need to type the domain after the name)"
@@ -101,7 +104,8 @@ msgstr "Identificação do cliente:"
 msgid ""
 "Note that the given IP address and client name should be unique in the "
 "network."
-msgstr "Note que o endereço IP e o nome do cliente dados devem ser únicos na rede."
+msgstr ""
+"Note que o endereço IP e o nome do cliente dados devem ser únicos na rede."
 
 #: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:127
 msgid ""
@@ -134,12 +138,13 @@ msgstr "Está em dhcp, o servidor pode não funcionar com a sua configuração."
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Erro"
 
@@ -184,7 +189,8 @@ msgid "The wizard successfully added the client."
 msgstr "O assistente consegui adicionar o cliente."
 
 #: ../common/Wizcommon.pm:86
-msgid "The command is still running. Do you want to kill it and quit the Wizard?"
+msgid ""
+"The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr "O comando ainda está a correr. Deseja matá-lo e sair do assistente?"
 
 #: ../common/Wizcommon.pm:104
@@ -205,7 +211,8 @@ msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:53
 msgid "This wizard will help you configuring the DHCP services of your server."
-msgstr "Este assistente vai ajudar-lo a configurar os serviços DHCP do seu servidor."
+msgstr ""
+"Este assistente vai ajudar-lo a configurar os serviços DHCP do seu servidor."
 
 #: ../dhcp_wizard/Dhcp.pm:58
 msgid "Interface the dhcp server must listen to"
@@ -465,7 +472,8 @@ msgid "Default domain name to search:"
 msgstr "Nome de domínio a procurar por defeito:"
 
 #: ../dns_wizard/Bind.pm:169
-msgid "This is not a valid IP address for your forwarder... press next to continue"
+msgid ""
+"This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Isto não é um endereço IP válido para o seu forwarder carregue em seguinte "
 "para continuar"
@@ -478,7 +486,8 @@ msgstr ""
 
 #: ../dns_wizard/Bind.pm:179
 msgid "This is not a valid IP address... press next to continue"
-msgstr "Isto não é um endereço IP válido... carregue em seguinte para continuar"
+msgstr ""
+"Isto não é um endereço IP válido... carregue em seguinte para continuar"
 
 #: ../dns_wizard/Bind.pm:189
 msgid ""
@@ -509,7 +518,8 @@ msgstr ""
 "Por favor corra Assistente DNS: Servidor DNS primário."
 
 #: ../dns_wizard/Bind.pm:204
-msgid "It seems that you are not a master DNS server, so I can't add/remove host."
+msgid ""
+"It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Parece que não é um servidor DNS primário, como tal não é possível adicionar/"
 "remover anfitriões."
@@ -539,7 +549,8 @@ msgid "Client with this identification will be removed from your DNS"
 msgstr "O cliente com esta identificação será removido do seu DNS"
 
 #: ../dns_wizard/Bind.pm:234
-msgid "The DNS server is about to be configured with the following configuration"
+msgid ""
+"The DNS server is about to be configured with the following configuration"
 msgstr ""
 "O servidor de DNS está prestes a ser configurado perante a seguinte "
 "configuração"
@@ -553,7 +564,7 @@ msgid "Domainname:"
 msgstr "Nome do domínio (domainname):"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "O assistente adicionou com sucesso o anfitrião ao seu DNS."
 
 #: ../dns_wizard/Bind.pm:256
@@ -663,7 +674,8 @@ msgstr "Assistente de Configuração de Servidor FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring an FTP server for your network."
-msgstr "Este assistente vai ajudá-lo a configurar um servidor FTP para a sua rede."
+msgstr ""
+"Este assistente vai ajudá-lo a configurar um servidor FTP para a sua rede."
 
 #: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
@@ -860,11 +872,13 @@ msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:81
 msgid "The destination directory is already in use. Please choose another one."
-msgstr "A directoria de destino encontra-se já em uso, por favor escolha outra."
+msgstr ""
+"A directoria de destino encontra-se já em uso, por favor escolha outra."
 
 #: ../installsrv_wizard/Installsrv.pm:85
 msgid "Your install server will be configured with these parameters"
-msgstr "O seu servidor Install será configurado perante os seguintes parâmetros"
+msgstr ""
+"O seu servidor Install será configurado perante os seguintes parâmetros"
 
 #: ../installsrv_wizard/Installsrv.pm:93
 msgid "Enable NFS install server:"
@@ -935,7 +949,7 @@ msgstr "Introduza a password para a conta do manager do servidor Kolab."
 msgid "Password mismatch, or null password, please correct."
 msgstr "as passwords diferem, ou a password é nula, por favor corrija."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Password:"
 
@@ -977,180 +991,227 @@ msgstr "A instalar o servidor Kolab no seu sistema..."
 msgid "Configuring Kolab server on your system..."
 msgstr "Configurando o servidor Kolab no seu sistema..."
 
-#: ../ldap_wizard/Ldap.pm:26
-msgid "Configure OpenLDAP Server "
-msgstr "Configuração do Servidor OpenLDAP"
-
-#: ../ldap_wizard/Ldap.pm:80
-msgid "Configure OpenLDAP server"
-msgstr "Configurar o Servidor OpenLDAP"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Assistente Ldap"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
-msgstr "Adicionar utilizador no servidor OpenLDAP"
+#: ../ldap_wizard/Ldap.pm:85
+#, fuzzy
+msgid "Show Ldap configuration"
+msgstr "Assistente de configuração do Ldap"
 
 #: ../ldap_wizard/Ldap.pm:86
-msgid "OpenLDAP configuration wizard"
-msgstr "Assistente de configuração do OpenLDAP"
+msgid "Add user in Ldap server"
+msgstr "Adicionar utilizador no servidor Ldap"
 
-#: ../ldap_wizard/Ldap.pm:86
-msgid "Setup an OpenLDAP server."
-msgstr "Configurar um servidor OpenLDAP."
+#: ../ldap_wizard/Ldap.pm:87
+#, fuzzy
+msgid "Delete Ldap configuration"
+msgstr "Assistente de configuração do Ldap"
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:93
-msgid "You must setup an OpenLDAP server first."
-msgstr "Primeiro tem de configurar um servidor OpenLDAP."
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
+msgid "Ldap configuration wizard"
+msgstr "Assistente de configuração do Ldap"
+
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
+msgid "You must setup an Ldap server first."
+msgstr "Primeiro tem de configurar um servidor Ldap."
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "A sua escolha:"
 
-#: ../ldap_wizard/Ldap.pm:110
-msgid "Save an existing configuration"
-msgstr "Salvaguardar uma configuração existente"
+#: ../ldap_wizard/Ldap.pm:132
+#, fuzzy
+msgid "Delete configuration"
+msgstr "Configuração do servidor de Install"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr "LDAP Adicionando Utilizador"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 msgid "User Created in: "
 msgstr "Utilizador Criado em: "
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Primeiro Nome:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Nome de Utilizador:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Recipiente de Utilizadores: "
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr "Tem de introduzir um Primeiro Nome válido"
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr "Tem de introduzir um Nome válido"
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr "Tem de introduzir um Nome de Utilizador válido"
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 msgid "LDAP User Password"
 msgstr "Password do utilizador LDAP"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr "as passwords têm de ser iguais"
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 msgid "Password (again):"
 msgstr "Password (de novo):"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr "É obrigatória o uso de password para o LDAP."
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "As passwords diferem"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Adrministrator"
+msgstr "Administrador do LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
 msgid "Configuring LDAP Server"
 msgstr "Configurando o Servidor LDAP"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
-msgstr ""
-"Sufixo LDAP:\n"
-" ex.: dc=exemplo,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Nome do domínio (domainname):"
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
+msgstr "Administrador do LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Directoria TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
-"Administrador LDAP:\n"
-" ex: cn=admin,dc=exemplo,dc=com\n"
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Directoria TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr "Administrador do LDAP:"
+
+#: ../ldap_wizard/Ldap.pm:188
 msgid "LDAP Password:"
 msgstr "Password do LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 msgid "LDAP Password (again):"
 msgstr "Password do LDAP (de novo):"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
-msgstr "É obrigatório utilizar um sufixo para o LDAP."
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:192
+#, fuzzy
+msgid "Administrator"
+msgstr "Administrador do LDAP"
+
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Tem de introduzir um Primeiro Nome válido"
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr "Confirmação do utilizador a criar"
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 msgid "First name:"
 msgstr "Primeiro Nome:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Nome de Utilizador:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr "Criar em:"
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Confirmação da Informação utilizada para criar o servidor LDAP"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr "Organização LDAP:"
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr "Administrador do LDAP:"
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 msgid "Users Container:"
 msgstr "Recipiente de Utilizadores: "
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "O assistente configurou com sucesso o LDAP."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr "Utilizador adicionado com sucesso"
 
-#: ../ldap_wizard/Ldap.pm:211
-msgid "The wizard successfully added a user in LDAP"
-msgstr "O assistente adicionou um utilizador no LDAP com sucesso"
+#: ../ldap_wizard/Ldap.pm:256
+#, fuzzy
+msgid "Error when adding user in Ldap datase"
+msgstr "Adicionar utilizador no servidor Ldap"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr "Servidor já configurado"
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr "Você já configurou o seu Servidor OpenLDAP com drakwizard\n"
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Você já configurou o seu Servidor Ldap com drakwizard\n"
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, perl-format
 msgid "%s Failed"
 msgstr "%s Falhou"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 msgid "Error!"
 msgstr "Erro!"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr "Impossível estabelecer ligação a %s"
@@ -1256,7 +1317,8 @@ msgid "Polling interval:"
 msgstr "Periodo de verificação:"
 
 #: ../news_wizard/Inn.pm:95
-msgid "The wizard successfully configured your Internet News service of your server."
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
 msgstr ""
 "O assistente conseguiu configurar o serviço de Forums Internet no seu "
 "servidor."
@@ -1279,7 +1341,8 @@ msgstr "Assistente de Configuração de Servidor NFS"
 
 #: ../nfs_wizard/NFS.pm:51
 msgid "This wizard will help you configuring the NFS server for your network."
-msgstr "Este assistente vai ajudar-lo a configurar o servidor NFS para a sua rede."
+msgstr ""
+"Este assistente vai ajudar-lo a configurar o servidor NFS para a sua rede."
 
 #: ../nfs_wizard/NFS.pm:56
 msgid ""
@@ -1573,7 +1636,8 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
-msgstr "A máscara deve ser um nome de domínio válido como p.ex.: \"meudominio.pt\"!"
+msgstr ""
+"A máscara deve ser um nome de domínio válido como p.ex.: \"meudominio.pt\"!"
 
 #: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
@@ -1740,7 +1804,8 @@ msgid "Proxy port:"
 msgstr "Porta do proxy:"
 
 #: ../proxy_wizard/Squid.pm:83
-msgid "Press Next if you want to keep this value, or Back to correct your choice."
+msgid ""
+"Press Next if you want to keep this value, or Back to correct your choice."
 msgstr ""
 "Carregue em Seguinte para guardar estes valores, ou Voltar para mudar a sua "
 "escolha."
@@ -1758,7 +1823,8 @@ msgid "You must choose a port greater than 1024 and lower than 65535"
 msgstr "Deve escolher uma porta superior a 1024 e inferior a 65535"
 
 #: ../proxy_wizard/Squid.pm:94
-msgid "Disk Cache is the amount of disk space that can be used for caching on disk."
+msgid ""
+"Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr ""
 "O cache disco é a quantia de espaço no disco que pode ser utilizada como "
 "antememoria."
@@ -1866,7 +1932,8 @@ msgid "Configuring the Proxy"
 msgstr "A configurar o Proxy"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-msgid "The wizard collected the following parameters needed to configure your proxy:"
+msgid ""
+"The wizard collected the following parameters needed to configure your proxy:"
 msgstr ""
 "O assistente recuperou os parametros seguintes necessários para configurar o "
 "seu proxy:"
@@ -1955,7 +2022,7 @@ msgstr "Adicionar uma imagem de boot"
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "A descrição PXE é utilizada para explicar o conteúdo da imagem de boot, p."
@@ -2003,7 +2070,8 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:142
 msgid "Path to all.rdz: provide the full path to all.rdz image"
-msgstr "Caminho para all.rdz: introduza o caminho completo para a imagem all.rdz"
+msgstr ""
+"Caminho para all.rdz: introduza o caminho completo para a imagem all.rdz"
 
 #: ../pxe_wizard/Pxe.pm:142
 msgid ""
@@ -2017,7 +2085,8 @@ msgstr ""
 "então escolher a imagem que deseja carregar através do PXE."
 
 #: ../pxe_wizard/Pxe.pm:153
-msgid "Please choose the PXE boot image you want to remove from the PXE server."
+msgid ""
+"Please choose the PXE boot image you want to remove from the PXE server."
 msgstr ""
 "Por favor escolha a imagem de boot PXE que deseja remover do seu servidor "
 "PXE."
@@ -2028,7 +2097,8 @@ msgstr "Remover uma imagem de boot"
 
 #: ../pxe_wizard/Pxe.pm:153
 msgid "The PXE boot image, and the related entry in PXE menu will be deleted."
-msgstr "A imagem de boot PXE, e a respectiva entrada no menu PXE serão apagadas."
+msgstr ""
+"A imagem de boot PXE, e a respectiva entrada no menu PXE serão apagadas."
 
 #: ../pxe_wizard/Pxe.pm:155
 msgid "Boot image to remove:"
@@ -2048,8 +2118,10 @@ msgstr ""
 "boot com parâmetros comuns."
 
 #: ../pxe_wizard/Pxe.pm:161
-msgid "Please choose, from the list below, the PXE boot image you want to modify"
-msgstr "Por favor escolha, da lista abaixo, a imagem de boot PXE que deseja modificar"
+msgid ""
+"Please choose, from the list below, the PXE boot image you want to modify"
+msgstr ""
+"Por favor escolha, da lista abaixo, a imagem de boot PXE que deseja modificar"
 
 #: ../pxe_wizard/Pxe.pm:163 ../pxe_wizard/Pxe.pm:172 ../pxe_wizard/Pxe.pm:250
 msgid "Boot image to modify:"
@@ -2060,7 +2132,8 @@ msgid "Add option to the PXE boot image"
 msgstr "Adicionar uma opção à imagem de boot PXE"
 
 #: ../pxe_wizard/Pxe.pm:170
-msgid "Install directory: the full path to Mandrakelinux install server directory"
+msgid ""
+"Install directory: the full path to Mandrakelinux install server directory"
 msgstr ""
 "Directoria de Instalação: o caminho completo para o directório do servidor "
 "Mandrakelinux Install"
@@ -2102,7 +2175,7 @@ msgstr ""
 "instalação."
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr "Ramsize: ajuste o parâmetro ramsize no disco de boot"
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2162,7 +2235,8 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:200
 msgid "We need an all.rdz or a network.img image. Please add one."
-msgstr "É necessária uma imagem all.rdz ou uma network.img. Por favor adicione uma."
+msgstr ""
+"É necessária uma imagem all.rdz ou uma network.img. Por favor adicione uma."
 
 #: ../pxe_wizard/Pxe.pm:208
 msgid ""
@@ -2188,7 +2262,8 @@ msgstr ""
 "espaços."
 
 #: ../pxe_wizard/Pxe.pm:224
-msgid "To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
+msgid ""
+"To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
 msgstr ""
 "Para adicionar/remover/modificar iamgens de boot PXE, necessita de correr "
 "'Configurar servidor PXE' previamente."
@@ -2295,8 +2370,10 @@ msgid "Samba configuration wizard"
 msgstr "Assistente de Configuração do Samba"
 
 #: ../samba_wizard/Samba.pm:72
-msgid "This wizard will help you configuring the Samba services of your server."
-msgstr "Este assistente vai ajudar-lo a configurar os serviços Samba do seu servidor."
+msgid ""
+"This wizard will help you configuring the Samba services of your server."
+msgstr ""
+"Este assistente vai ajudar-lo a configurar os serviços Samba do seu servidor."
 
 #: ../samba_wizard/Samba.pm:77
 msgid "Samba needs to know the Windows Workgroup it will serve."
@@ -2322,7 +2399,8 @@ msgstr "Bandeira do Servidor."
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
-msgstr "A bandeira é a maneira como o servidor vai ser visto na maquinas Windows."
+msgstr ""
+"A bandeira é a maneira como o servidor vai ser visto na maquinas Windows."
 
 #: ../samba_wizard/Samba.pm:99
 msgid "Banner:"
@@ -2462,7 +2540,8 @@ msgstr "Lista de escritura:"
 
 #: ../samba_wizard/Samba.pm:194
 msgid "Select which printers you want to be accessible from known users"
-msgstr "Escolha quais impressoras deseja por à disposição dos utilizadores conhecidos"
+msgstr ""
+"Escolha quais impressoras deseja por à disposição dos utilizadores conhecidos"
 
 #: ../samba_wizard/Samba.pm:201
 msgid "Enable all printers"
@@ -2526,11 +2605,13 @@ msgstr ""
 
 #: ../time_wizard/Ntp.pm:82
 msgid "Thus your server will be the local time server for your network."
-msgstr "Assim o seu servidor vai ser o servidor de tempo local para a sua rede."
+msgstr ""
+"Assim o seu servidor vai ser o servidor de tempo local para a sua rede."
 
 #: ../time_wizard/Ntp.pm:82
 msgid "press next to begin, or cancel to leave this wizard"
-msgstr "carregue em seguinte para começar, ou anular para sair deste assistente."
+msgstr ""
+"carregue em seguinte para começar, ou anular para sair deste assistente."
 
 #: ../time_wizard/Ntp.pm:87
 msgid ""
@@ -2628,7 +2709,8 @@ msgstr "Assistente Web"
 
 #: ../web_wizard/Apache.pm:71
 msgid "This wizard will help you configuring the Web server for your network."
-msgstr "Este assistente vai ajudar-lo a configurar o servidor Web para a sua rede."
+msgstr ""
+"Este assistente vai ajudar-lo a configurar o servidor Web para a sua rede."
 
 #: ../web_wizard/Apache.pm:71
 msgid "Web server configuration wizard"
@@ -2743,6 +2825,56 @@ msgstr "Servidor Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurando o seu sistema como um servidor Apache ..."
 
+#~ msgid "Configure Ldap server"
+#~ msgstr "Configurar o Servidor Ldap"
+
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Configuração do Servidor OpenLDAP"
+
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Configurar o Servidor OpenLDAP"
+
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Adicionar utilizador no servidor OpenLDAP"
+
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Assistente de configuração do OpenLDAP"
+
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Configurar um servidor OpenLDAP."
+
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Primeiro tem de configurar um servidor OpenLDAP."
+
+#~ msgid "Save an existing configuration"
+#~ msgstr "Salvaguardar uma configuração existente"
+
+#~ msgid ""
+#~ "LDAP Suffix:\n"
+#~ " ex: dc=example,dc=com\n"
+#~ msgstr ""
+#~ "Sufixo LDAP:\n"
+#~ " ex.: dc=exemplo,dc=com\n"
+
+#~ msgid ""
+#~ "LDAP Administrator:\n"
+#~ " ex: cn=admin,dc=example,dc=com\n"
+#~ msgstr ""
+#~ "Administrador LDAP:\n"
+#~ " ex: cn=admin,dc=exemplo,dc=com\n"
+
+#~ msgid "You must enter a suffix for LDAP."
+#~ msgstr "É obrigatório utilizar um sufixo para o LDAP."
+
+#~ msgid "Organisation LDAP:"
+#~ msgstr "Organização LDAP:"
+
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "O assistente adicionou um utilizador no LDAP com sucesso"
+
+#~ msgid "You have already configured your OpenLDAP Server with drakwizard\n"
+#~ msgstr "Você já configurou o seu Servidor OpenLDAP com drakwizard\n"
+
 #~ msgid "LDAP User Add"
 #~ msgstr "Adicionar Utilizador LDAP"
 
@@ -2790,4 +2922,3 @@ msgstr "Configurando o seu sistema como um servidor Apache ..."
 
 #~ msgid "Add Kerberos"
 #~ msgstr "Adicionar Kerberos"
-
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 433f16d0..5b5a9781 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-05-06 14:21-0300\n"
 "Last-Translator: Ricardo de Castilho <cast_brasil@ig.com.br>\n"
 "Language-Team: Brazilian Portuguese <linux_pt_BR@yahoogrupos.com.br>\n"
@@ -45,7 +45,7 @@ msgstr "Erro."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -134,12 +134,13 @@ msgstr "Você está em DHCP; o servidor pode não funcionar com sua configuraç�
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Erro."
 
@@ -559,7 +560,7 @@ msgid "Domainname:"
 msgstr "Nome de domínio:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "O assistente adicionou o host com sucesso em seu DNS."
 
 #: ../dns_wizard/Bind.pm:256
@@ -951,7 +952,7 @@ msgstr "Entre com a senha entrar no gerenciador de usuário Kolab."
 msgid "Password mismatch, or null password, please correct."
 msgstr "Senha errada ou nula, digite a senha correta."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Senha:"
 
@@ -991,196 +992,238 @@ msgstr "Instalando o Kolab em seu sistema..."
 msgid "Configuring Kolab server on your system..."
 msgstr "Configurando o servidor Kolab no seu sistema..."
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Configurando o servidor DHCP"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Assistente do samba"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Configurando o servidor DHCP"
+msgid "Show Ldap configuration"
+msgstr "Assistente de configuração do LDAP"
 
-#: ../ldap_wizard/Ldap.pm:81
+#: ../ldap_wizard/Ldap.pm:86
 #, fuzzy
-msgid "Add user in OpenLDAP server"
+msgid "Add user in Ldap server"
 msgstr "Add - adiciona entrada no servidor LDAP"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "Assistente de configuração do LDAP"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Definir o servidor PXE."
+msgid "Ldap configuration wizard"
+msgstr "Assistente de configuração do LDAP"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "Definir o servidor PXE."
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "Remove um host na configuração DNS existe."
+msgid "Delete configuration"
+msgstr "Configuração do servidor de instalação"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Nome de usuário:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Primeiro Nome:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Nome de usuário:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Nome de usuário:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Recipiente:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Senha:"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Senha novamente:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "As senhas não conferem"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Configurando o Samba"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Nome de domínio:"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Diretório TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Diretório TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Senha:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Senha novamente:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Diretório TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Primeiro Nome:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Nome de usuário:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Configurando o servidor DHCP"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Recipiente:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "O assistente configurou com sucesso seu servidor LDAP"
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 #, fuzzy
 msgid "Successfully added User"
 msgstr "Dados adicionados com sucesso"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:256
 #, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "O assistente adicionou com sucesso a entrada no ldap"
+msgid "Error when adding user in Ldap datase"
+msgstr "Add - adiciona entrada no servidor LDAP"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "O assistente configurou com sucesso seu servidor Samba"
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Falha"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Erro."
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1989,7 +2032,7 @@ msgstr "Adiciona imagem de boot"
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 #, fuzzy
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "A descrição PXE é usada para demonstrar o tipo de imagem de boot. Por "
@@ -2139,7 +2182,7 @@ msgstr ""
 "instalação."
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr "Ramsize: ajusta o parâmetro ramsize no disco de boot."
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2791,6 +2834,42 @@ msgstr "Servidor Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurando seu sistema como servidor Apache ..."
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "Configurando o servidor DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Configurando o servidor DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Configurando o servidor DHCP"
+
+#, fuzzy
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Add - adiciona entrada no servidor LDAP"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Assistente de configuração do LDAP"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Definir o servidor PXE."
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Definir o servidor PXE."
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "Remove um host na configuração DNS existe."
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "O assistente adicionou com sucesso a entrada no ldap"
+
 #~ msgid ""
 #~ "PXE name: the name displayed in PXE menu (please provide an ASCII word or "
 #~ "a number, without spaces)"
diff --git a/po/ro.po b/po/ro.po
index e7fb9b38..912ca64b 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2003-12-16 17:15+0200\n"
 "Last-Translator: Ovidiu Constantin <ovidiu.constantin@gmx.net>\n"
 "Language-Team: Romanian Translators for Free Software <rtfs-project@lists."
@@ -42,7 +42,7 @@ msgstr "Eroare."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -135,12 +135,13 @@ msgstr "Sunteţi în DHCP, serverul poate nu va rula în configuraţia dvs."
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Eroare"
 
@@ -544,7 +545,7 @@ msgstr ""
 
 #: ../dns_wizard/Bind.pm:246
 #, fuzzy
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Asistentul a adăugat clientul cu succes."
 
 #: ../dns_wizard/Bind.pm:256
@@ -923,7 +924,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Parolă:"
 
@@ -968,195 +969,236 @@ msgstr "Configurez serverul FTP"
 msgid "Configuring Kolab server on your system..."
 msgstr "Configurez serverul FTP"
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Configurez serverul DHCP"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Asistent Ldap"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Configurez serverul DHCP"
+msgid "Show Ldap configuration"
+msgstr "asistent de configurare"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
+#: ../ldap_wizard/Ldap.pm:86
+msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "asistent de configurare"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Server Samba"
+msgid "Ldap configuration wizard"
+msgstr "asistent de configurare"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "Server Samba"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "Dns (configurare)"
+msgid "Delete configuration"
+msgstr "Configurare server de timp salvată"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Nume server de ştiri:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Nume server de ştiri:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
+#: ../ldap_wizard/Ldap.pm:144
 #, fuzzy
-msgid "User Name:"
+msgid "User Login:"
 msgstr "Nume server de ştiri:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Parola"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Parolă:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Parolele nu sunt identice"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Configurez Samba"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Nume de domeniu 'mascaradat':"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Director utilizator:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Director utilizator:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Parolă:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 msgid "LDAP Password (again):"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Director utilizator:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Antet server:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+#, fuzzy
+msgid "User Name:"
+msgstr "Nume server de ştiri:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Configurez serverul DHCP"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Nume server de ştiri:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "Asistentul a configurat cu succes serviciul Proxy al serverului dvs."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:211
-#, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Asistentul a adăugat clientul cu succes."
+#: ../ldap_wizard/Ldap.pm:256
+msgid "Error when adding user in Ldap datase"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Asistentul a configurat cu succes serviciul Samba al serverului dvs."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Activat"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Eroare"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1963,7 +2005,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 
@@ -2089,7 +2131,7 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2744,6 +2786,38 @@ msgstr "Server web Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurez serverul DNS"
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "Configurez serverul DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Configurez serverul DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Configurez serverul DHCP"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "asistent de configurare"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Server Samba"
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Server Samba"
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "Dns (configurare)"
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Asistentul a adăugat clientul cu succes."
+
 #~ msgid "Apache web server"
 #~ msgstr "Server web Apache"
 
diff --git a/po/ru.po b/po/ru.po
index af53dbf4..04604fbc 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-08-18 21:05\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -42,7 +42,7 @@ msgstr "Ошибка."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -95,7 +95,8 @@ msgstr "Идентификация клиента:"
 msgid ""
 "Note that the given IP address and client name should be unique in the "
 "network."
-msgstr "Помните, что указанный IP-адрес и имя клиента должны быть уникальными в сети."
+msgstr ""
+"Помните, что указанный IP-адрес и имя клиента должны быть уникальными в сети."
 
 #: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:127
 msgid ""
@@ -128,12 +129,13 @@ msgstr "Вы используете dhcp, сервер может не рабо�
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Ошибка"
 
@@ -178,7 +180,8 @@ msgid "The wizard successfully added the client."
 msgstr "Мастер успешно добавил клиента."
 
 #: ../common/Wizcommon.pm:86
-msgid "The command is still running. Do you want to kill it and quit the Wizard?"
+msgid ""
+"The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr "Команда все еще работает. Хотите убить ее и завершить работу Мастера?"
 
 #: ../common/Wizcommon.pm:104
@@ -457,14 +460,16 @@ msgid "Default domain name to search:"
 msgstr "Доменное имя для поиска по умолчанию:"
 
 #: ../dns_wizard/Bind.pm:169
-msgid "This is not a valid IP address for your forwarder... press next to continue"
+msgid ""
+"This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Это недействительный IP-адрес вашего форвардера... Нажмите Далее для "
 "продолжения"
 
 #: ../dns_wizard/Bind.pm:174
 msgid "This is not a valid Master DNS IP address... press next to continue"
-msgstr "Это недействительный IP-адрес ведущего DNS... Нажмите Далее для продолжения"
+msgstr ""
+"Это недействительный IP-адрес ведущего DNS... Нажмите Далее для продолжения"
 
 #: ../dns_wizard/Bind.pm:179
 msgid "This is not a valid IP address... press next to continue"
@@ -499,7 +504,8 @@ msgstr ""
 "запустите мастер DNS: Ведущий сервер DNS."
 
 #: ../dns_wizard/Bind.pm:204
-msgid "It seems that you are not a master DNS server, so I can't add/remove host."
+msgid ""
+"It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Похоже, что вы не являетесь ведущим сервером DNS, поэтому невозможно удалить/"
 "добавить хост."
@@ -529,7 +535,8 @@ msgid "Client with this identification will be removed from your DNS"
 msgstr "Клиент с этой идентификацией будет удален из вашей DNS"
 
 #: ../dns_wizard/Bind.pm:234
-msgid "The DNS server is about to be configured with the following configuration"
+msgid ""
+"The DNS server is about to be configured with the following configuration"
 msgstr "Сервер DNS будет настроен со следуюшей конфигурацией"
 
 #: ../dns_wizard/Bind.pm:236
@@ -541,7 +548,7 @@ msgid "Domainname:"
 msgstr "Доменное имя:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Мастер успешно добавил хост в вашу DNS."
 
 #: ../dns_wizard/Bind.pm:256
@@ -558,11 +565,13 @@ msgstr "Перезапустите drakwizard и попробуйте измен
 
 #: ../dns_wizard/Bind.pm:707
 msgid "Configuring your system as Master DNS server ..."
-msgstr "Ваша система настраивается для работы в качестве ведущего сервера DNS..."
+msgstr ""
+"Ваша система настраивается для работы в качестве ведущего сервера DNS..."
 
 #: ../dns_wizard/Bind.pm:721
 msgid "Configuring your system as Slave DNS server ..."
-msgstr "Ваша система настраивается для работы в качестве подчиненного сервера DNS..."
+msgstr ""
+"Ваша система настраивается для работы в качестве подчиненного сервера DNS..."
 
 #: ../drakwizard.pl:41
 msgid "DHCP server"
@@ -850,7 +859,8 @@ msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:81
 msgid "The destination directory is already in use. Please choose another one."
-msgstr "Каталог назначения уже используется, пожалуйста, выберите другой каталог."
+msgstr ""
+"Каталог назначения уже используется, пожалуйста, выберите другой каталог."
 
 #: ../installsrv_wizard/Installsrv.pm:85
 msgid "Your install server will be configured with these parameters"
@@ -925,7 +935,7 @@ msgstr "Введите пароль для учетной записи мене�
 msgid "Password mismatch, or null password, please correct."
 msgstr "Пароль не совпадает или отсутствует. Пожалуйста, исправьте."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Пароль:"
 
@@ -965,180 +975,227 @@ msgstr "В вашу систему устанавливается сервер K
 msgid "Configuring Kolab server on your system..."
 msgstr "Настраивается сервер Kolab для вашей системы..."
 
-#: ../ldap_wizard/Ldap.pm:26
-msgid "Configure OpenLDAP Server "
-msgstr "Настройка сервера OpenLDAP"
-
-#: ../ldap_wizard/Ldap.pm:80
-msgid "Configure OpenLDAP server"
-msgstr "Настроить сервер OpenLDAP"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Мастер Ldap"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
-msgstr "Добавить пользователя в сервер OpenLDAP"
+#: ../ldap_wizard/Ldap.pm:85
+#, fuzzy
+msgid "Show Ldap configuration"
+msgstr "Мастер настройки Ldap"
 
 #: ../ldap_wizard/Ldap.pm:86
-msgid "OpenLDAP configuration wizard"
-msgstr "Мастер настройки OpenLDAP"
+msgid "Add user in Ldap server"
+msgstr "Добавить пользователя в сервер Ldap"
 
-#: ../ldap_wizard/Ldap.pm:86
-msgid "Setup an OpenLDAP server."
-msgstr "Настроить сервер OpenLDAP."
+#: ../ldap_wizard/Ldap.pm:87
+#, fuzzy
+msgid "Delete Ldap configuration"
+msgstr "Мастер настройки Ldap"
 
-#: ../ldap_wizard/Ldap.pm:93
-msgid "You must setup an OpenLDAP server first."
-msgstr "Вы должны сначала настроить сервер OpenLDAP."
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
+msgid "Ldap configuration wizard"
+msgstr "Мастер настройки Ldap"
+
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
+msgid "You must setup an Ldap server first."
+msgstr "Вы должны сначала настроить сервер Ldap."
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Ваш выбор:"
 
-#: ../ldap_wizard/Ldap.pm:110
-msgid "Save an existing configuration"
-msgstr "Сохранить существующую конфигурацию"
+#: ../ldap_wizard/Ldap.pm:132
+#, fuzzy
+msgid "Delete configuration"
+msgstr "Установить конфигурацию сервера"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr "Добавление пользователя LDAP"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 msgid "User Created in: "
 msgstr "Пользователь создан в: "
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Первое имя:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 msgid "Name:"
 msgstr "Имя:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Имя пользователя:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Контейнер пользователей:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr "Вы должны ввести действительное первое имя."
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr "Вы должны ввести действительное имя."
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr "Вы должны ввести действительное имя пользователя."
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 msgid "LDAP User Password"
 msgstr "Пароль пользователя LDAP"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr "Пароли должны совпадать"
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 msgid "Password (again):"
 msgstr "Пароль (еще раз):"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr "Вы должны ввести пароль для LDAP."
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Пароли не совпадают"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Adrministrator"
+msgstr "Администратор LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
 msgid "Configuring LDAP Server"
 msgstr "Настраивается сервер LDAP"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
-msgstr ""
-"Суффикс LDAP:\n"
-" например: dc=office,dc=ua\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Доменное имя:"
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
+msgstr "Администратор LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Каталог TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
-"Администратор LDAP:\n"
-" например: cn=admin,dc=example,dc=com\n"
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Каталог TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr "Администратор LDAP:"
+
+#: ../ldap_wizard/Ldap.pm:188
 msgid "LDAP Password:"
 msgstr "Пароль LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 msgid "LDAP Password (again):"
 msgstr "Пароль LDAP (еще раз):"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
-msgstr "Вы должны ввести суффикс для LDAP."
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:192
+#, fuzzy
+msgid "Administrator"
+msgstr "Администратор LDAP"
+
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Вы должны ввести действительное первое имя."
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr "Подтверждение создания пользователя"
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 msgid "First name:"
 msgstr "Первое имя:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Имя пользователя:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr "Создать в:"
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Информация для подтверждения создания сервера LDAP"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr "Организация LDAP:"
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr "Администратор LDAP:"
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 msgid "Users Container:"
 msgstr "Контейнер пользователей:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "Мастер успешно настроил LDAP."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr "Пользователь успешно добавлен"
 
-#: ../ldap_wizard/Ldap.pm:211
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Мастер успешно добавил пользователя в LDAP"
+#: ../ldap_wizard/Ldap.pm:256
+#, fuzzy
+msgid "Error when adding user in Ldap datase"
+msgstr "Добавить пользователя в сервер Ldap"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr "Сервер уже настроен"
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr "Вы уже настроили ваш OpenLDAP сервер с помощью drakwizard\n"
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Вы уже настроили ваш Ldap сервер с помощью drakwizard\n"
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, perl-format
 msgid "%s Failed"
 msgstr "Сбой %s"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 msgid "Error!"
 msgstr "Ошибка!"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr "Невозможно подключиться к %s"
@@ -1151,7 +1208,8 @@ msgstr "Мастер новостей"
 msgid ""
 "This wizard will help you configuring the Internet News services for your "
 "network."
-msgstr "Этот мастер поможет вам настроить службы новостей Интернета для вашей сети."
+msgstr ""
+"Этот мастер поможет вам настроить службы новостей Интернета для вашей сети."
 
 #: ../news_wizard/Inn.pm:44
 msgid "Welcome to the News Wizard"
@@ -1242,7 +1300,8 @@ msgid "Polling interval:"
 msgstr "Интервал опроса:"
 
 #: ../news_wizard/Inn.pm:95
-msgid "The wizard successfully configured your Internet News service of your server."
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
 msgstr "Мастер успешно настроил службу новостей Интернета вашего сервера."
 
 #: ../nfs_wizard/NFS.pm:34
@@ -1358,7 +1417,8 @@ msgstr "Клиент NIS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
-msgstr "Установка сервера NIS с картой autofs, файлами auto.home и auto.master."
+msgstr ""
+"Установка сервера NIS с картой autofs, файлами auto.home и auto.master."
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
@@ -1471,7 +1531,8 @@ msgstr "Мастер успешно настроил вашу машину в к
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
-msgstr "Мастер успешно настроил вашу машину в качестве сервера NIS с картой autofs."
+msgstr ""
+"Мастер успешно настроил вашу машину в качестве сервера NIS с картой autofs."
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 msgid "Configuring your system to be a NIS server with Autofs map..."
@@ -1612,7 +1673,8 @@ msgstr "Имя почтового сервера:"
 
 #: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
-msgstr "По умолчанию добавляется myhostname, что приемлемо для маленьких сайтов."
+msgstr ""
+"По умолчанию добавляется myhostname, что приемлемо для маленьких сайтов."
 
 #: ../postfix_wizard/Postfix.pm:119
 msgid ""
@@ -1719,7 +1781,8 @@ msgid "Proxy port:"
 msgstr "Порт прокси:"
 
 #: ../proxy_wizard/Squid.pm:83
-msgid "Press Next if you want to keep this value, or Back to correct your choice."
+msgid ""
+"Press Next if you want to keep this value, or Back to correct your choice."
 msgstr ""
 "Нажмите Далее, если вы хотите оставить это значение, или Назад, чтобы "
 "исправить ваш выбор."
@@ -1737,7 +1800,8 @@ msgid "You must choose a port greater than 1024 and lower than 65535"
 msgstr "Вы должны выбрать номер порта больше 1024 и меньше 65535"
 
 #: ../proxy_wizard/Squid.pm:94
-msgid "Disk Cache is the amount of disk space that can be used for caching on disk."
+msgid ""
+"Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr ""
 "Дисковый кэш представляет собой пространство на диске, которое может быть "
 "использовано для кэширования на диск."
@@ -1846,8 +1910,10 @@ msgid "Configuring the Proxy"
 msgstr "Настраивается прокси"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-msgid "The wizard collected the following parameters needed to configure your proxy:"
-msgstr "Мастер собрал следующие параметры, необходимые для настройки вашего прокси:"
+msgid ""
+"The wizard collected the following parameters needed to configure your proxy:"
+msgstr ""
+"Мастер собрал следующие параметры, необходимые для настройки вашего прокси:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 #: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
@@ -1932,9 +1998,11 @@ msgstr "Добавить загрузочный образ"
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
-msgstr "Описание PXE используется для пояснения правила для загрузочного образа, т.е.: Образ Mandrakelinux 10, Образ Mandrakelinux cooker..."
+msgstr ""
+"Описание PXE используется для пояснения правила для загрузочного образа, т."
+"е.: Образ Mandrakelinux 10, Образ Mandrakelinux cooker..."
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
@@ -1989,7 +2057,8 @@ msgstr ""
 "из образов загрузить через PXE."
 
 #: ../pxe_wizard/Pxe.pm:153
-msgid "Please choose the PXE boot image you want to remove from the PXE server."
+msgid ""
+"Please choose the PXE boot image you want to remove from the PXE server."
 msgstr ""
 "Пожалуйста, выберите загрузочный образ PXE, который вы хотите удалить с "
 "сервера PXE."
@@ -2020,8 +2089,10 @@ msgstr ""
 "настройки общих параметров загрузочного образа."
 
 #: ../pxe_wizard/Pxe.pm:161
-msgid "Please choose, from the list below, the PXE boot image you want to modify"
-msgstr "Пожалуйста, выберите загрузочный образ PXE для изменения из списка ниже."
+msgid ""
+"Please choose, from the list below, the PXE boot image you want to modify"
+msgstr ""
+"Пожалуйста, выберите загрузочный образ PXE для изменения из списка ниже."
 
 #: ../pxe_wizard/Pxe.pm:163 ../pxe_wizard/Pxe.pm:172 ../pxe_wizard/Pxe.pm:250
 msgid "Boot image to modify:"
@@ -2032,8 +2103,10 @@ msgid "Add option to the PXE boot image"
 msgstr "Добавить параметры к загрузочному образу PXE"
 
 #: ../pxe_wizard/Pxe.pm:170
-msgid "Install directory: the full path to Mandrakelinux install server directory"
-msgstr "Установочный каталог: полный путь к каталогу сервера установки Mandrakelinux"
+msgid ""
+"Install directory: the full path to Mandrakelinux install server directory"
+msgstr ""
+"Установочный каталог: полный путь к каталогу сервера установки Mandrakelinux"
 
 #: ../pxe_wizard/Pxe.pm:170
 msgid "Installation method: choose NFS or HTTP."
@@ -2072,12 +2145,14 @@ msgstr ""
 "установки."
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
-msgstr "Размер ОЗУ: настройте параметр размера ОЗУ (ramsize) загрузочного диска."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
+msgstr ""
+"Размер ОЗУ: настройте параметр размера ОЗУ (ramsize) загрузочного диска."
 
 #: ../pxe_wizard/Pxe.pm:180
 msgid "VGA option: if you encounter any problem with VGA, please adjust. "
-msgstr "Опция VGA: если у вас возникают проблемы с VGA, настройте, пожалуйста. "
+msgstr ""
+"Опция VGA: если у вас возникают проблемы с VGA, настройте, пожалуйста. "
 
 #: ../pxe_wizard/Pxe.pm:182 ../pxe_wizard/Pxe.pm:254
 msgid "Network client interface:"
@@ -2152,10 +2227,12 @@ msgstr "Пожалуйста, выберите образ из каталога,
 msgid ""
 "Please provide a correct PXE name: one ASCII word or one number with no "
 "spaces."
-msgstr "Пожалуйста, укажите корректное имя PXE: одно слово или число без пробелов."
+msgstr ""
+"Пожалуйста, укажите корректное имя PXE: одно слово или число без пробелов."
 
 #: ../pxe_wizard/Pxe.pm:224
-msgid "To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
+msgid ""
+"To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
 msgstr ""
 "Для добавления/удаления/изменения загрузочного образа PXE, вам необходимо "
 "запустить сначала 'Настроить сервер PXE'."
@@ -2261,12 +2338,14 @@ msgid "Samba configuration wizard"
 msgstr "Мастер настройки Samba"
 
 #: ../samba_wizard/Samba.pm:72
-msgid "This wizard will help you configuring the Samba services of your server."
+msgid ""
+"This wizard will help you configuring the Samba services of your server."
 msgstr "Этот мастер поможет вам настроить службы Samba вашего сервера."
 
 #: ../samba_wizard/Samba.pm:77
 msgid "Samba needs to know the Windows Workgroup it will serve."
-msgstr "Samba необходимо знать рабочую группу Windows, которую она будет обслуживать."
+msgstr ""
+"Samba необходимо знать рабочую группу Windows, которую она будет обслуживать."
 
 #: ../samba_wizard/Samba.pm:77
 msgid "Workgroup"
@@ -2288,7 +2367,8 @@ msgstr "Баннер сервера."
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
-msgstr "Баннер представляет собой описание сервера для рабочих станций Windows."
+msgstr ""
+"Баннер представляет собой описание сервера для рабочих станций Windows."
 
 #: ../samba_wizard/Samba.pm:99
 msgid "Banner:"
@@ -2589,7 +2669,8 @@ msgstr "Конфигурация сервера времени сохранен�
 
 #: ../time_wizard/Ntp.pm:165
 msgid "Your server can now act as a time server for your local network."
-msgstr "Теперь ваш сервер может работать в вашей локальной сети как сервер времени."
+msgstr ""
+"Теперь ваш сервер может работать в вашей локальной сети как сервер времени."
 
 #: ../web_wizard/Apache.pm:39
 msgid "Web wizard"
@@ -2715,3 +2796,52 @@ msgstr "Сервер Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Ваша система настраивается для работы в качестве сервера Apache..."
 
+#~ msgid "Configure Ldap server"
+#~ msgstr "Настроить сервер Ldap"
+
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Настройка сервера OpenLDAP"
+
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Настроить сервер OpenLDAP"
+
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Добавить пользователя в сервер OpenLDAP"
+
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Мастер настройки OpenLDAP"
+
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Настроить сервер OpenLDAP."
+
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Вы должны сначала настроить сервер OpenLDAP."
+
+#~ msgid "Save an existing configuration"
+#~ msgstr "Сохранить существующую конфигурацию"
+
+#~ msgid ""
+#~ "LDAP Suffix:\n"
+#~ " ex: dc=example,dc=com\n"
+#~ msgstr ""
+#~ "Суффикс LDAP:\n"
+#~ " например: dc=office,dc=ua\n"
+
+#~ msgid ""
+#~ "LDAP Administrator:\n"
+#~ " ex: cn=admin,dc=example,dc=com\n"
+#~ msgstr ""
+#~ "Администратор LDAP:\n"
+#~ " например: cn=admin,dc=example,dc=com\n"
+
+#~ msgid "You must enter a suffix for LDAP."
+#~ msgstr "Вы должны ввести суффикс для LDAP."
+
+#~ msgid "Organisation LDAP:"
+#~ msgstr "Организация LDAP:"
+
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Мастер успешно добавил пользователя в LDAP"
+
+#~ msgid "You have already configured your OpenLDAP Server with drakwizard\n"
+#~ msgstr "Вы уже настроили ваш OpenLDAP сервер с помощью drakwizard\n"
diff --git a/po/sk.po b/po/sk.po
index 94d10378..7757c648 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-02-23 02:34+0100\n"
 "Last-Translator: Tibor Pittich <Tibor.Pittich@mandrake.org>\n"
 "Language-Team: Slovak <i18n@mandrake.sk>\n"
@@ -37,7 +37,7 @@ msgstr "Chyba."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -124,12 +124,13 @@ msgstr "Máte nastavené dhcp, server nemusí fungovať s touto konfiguráciou."
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Chyba"
 
@@ -538,7 +539,7 @@ msgid "Domainname:"
 msgstr "Meno domény:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Sprievodca úspešne pridal hosta do vášho DNS."
 
 #: ../dns_wizard/Bind.pm:256
@@ -922,7 +923,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Heslo:"
 
@@ -968,196 +969,238 @@ msgstr "Konfigurácia PXE servera na vašom systéme..."
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurácia PXE servera na vašom systéme..."
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Konfigurácia DHCP servera"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Sprievodca konfiguráciou samby"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Konfigurácia DHCP servera"
+msgid "Show Ldap configuration"
+msgstr "Sprievodca konfigáciou LDAP"
 
-#: ../ldap_wizard/Ldap.pm:81
+#: ../ldap_wizard/Ldap.pm:86
 #, fuzzy
-msgid "Add user in OpenLDAP server"
+msgid "Add user in Ldap server"
 msgstr "Pridať - pridať záznam do LDAP servera"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "Sprievodca konfigáciou LDAP"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Nastaviť PXE server."
+msgid "Ldap configuration wizard"
+msgstr "Sprievodca konfigáciou LDAP"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "Nastaviť PXE server."
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "Odstrániť meno v existujúcej DNS konfigurácii."
+msgid "Delete configuration"
+msgstr "Konfigurácia inštalačného servera je uložená"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Používateľské meno:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Krstné meno:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Používateľské meno:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Používateľské meno:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Kontajnér:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Heslo"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Heslo:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Zadané heslá nie sú rovnaké"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Konfigurácia samby"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Meno domény:"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "TFTP adresár:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "TFTP adresár:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Heslo:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Heslo:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "TFTP adresár:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Krstné meno:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Používateľské meno:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Konfigurácia DHCP servera"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Kontajnér:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "Sprievodca úspešne nakonfiguroval LDAP."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 #, fuzzy
 msgid "Successfully added User"
 msgstr "Údaje boli úspešne pridané"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:256
 #, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Sprievodca úspešne pridal záznam do LDAP"
+msgid "Error when adding user in Ldap datase"
+msgstr "Pridať - pridať záznam do LDAP servera"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Sprievodca úspešne nakonfiguroval váš Samba server."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Zlyhalo"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Chyba"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1962,7 +2005,7 @@ msgstr "Pridať spúšťací obraz"
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 #, fuzzy
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "PXE popis je použitý pre charakteristiku spúšťacieho obrazu, napríklad "
@@ -2096,7 +2139,7 @@ msgstr ""
 "inštaláciu."
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr "Veľkosť RAM: nastaviť veľkosť ram pre spúšťací disk."
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2731,6 +2774,42 @@ msgstr "Apache server"
 msgid "Configuring your system as Apache server ..."
 msgstr "Nastavovanie vášho systému ako Apache server ..."
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "Konfigurácia DHCP servera"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Konfigurácia DHCP servera"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Konfigurácia DHCP servera"
+
+#, fuzzy
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Pridať - pridať záznam do LDAP servera"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Sprievodca konfigáciou LDAP"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Nastaviť PXE server."
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Nastaviť PXE server."
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "Odstrániť meno v existujúcej DNS konfigurácii."
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Sprievodca úspešne pridal záznam do LDAP"
+
 #~ msgid ""
 #~ "PXE name: the name displayed in PXE menu (please provide an ASCII word or "
 #~ "a number, without spaces)"
diff --git a/po/sl.po b/po/sl.po
index 7d8616fb..859c5322 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-02-05 12:23+0100\n"
 "Last-Translator: Daniel Žalar <danizmax@email.si>\n"
 "Language-Team: Slovenian <prevajanje@mandrakeprinas.org>\n"
@@ -43,7 +43,7 @@ msgstr "Napaka."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -133,12 +133,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Napaka"
 
@@ -534,7 +535,7 @@ msgstr ""
 
 #: ../dns_wizard/Bind.pm:246
 #, fuzzy
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Čarovnik je uspešno dodal odjemalec."
 
 #: ../dns_wizard/Bind.pm:256
@@ -916,7 +917,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Geslo:"
 
@@ -960,196 +961,237 @@ msgstr "Nastavljam PXE strežnik na vašem sistemu..."
 msgid "Configuring Kolab server on your system..."
 msgstr "Nastavljam PXE strežnik na vašem sistemu..."
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Nastavljam strežnik DHCP"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Ldap strežnik"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Nastavljam strežnik DHCP"
+msgid "Show Ldap configuration"
+msgstr "Čarovnik za nastavitev DHCP"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
+#: ../ldap_wizard/Ldap.pm:86
+msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "Čarovnik za nastavitev DHCP"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Nastavi PXE strežnik."
+msgid "Ldap configuration wizard"
+msgstr "Čarovnik za nastavitev DHCP"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "Nastavi PXE strežnik."
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "s to nastavitvijo."
+msgid "Delete configuration"
+msgstr "Nastavitev časovnega strežnika shranjena"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Uporabniško ime:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Ime:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Uporabniško ime:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
 msgstr "Uporabniško ime:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Geslo"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Geslo:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Gesli se ne ujemata."
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Nastavljam Samba"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Zamaskirano ime domene:"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Uporabniški imenik:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Uporabniški imenik:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Geslo:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Geslo:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Uporabniški imenik:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Ime:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Uporabniško ime:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Nastavljam strežnik DHCP"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Uporabniško ime:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "Čarovnik je uspešno nastavil strežnik NFS"
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 #, fuzzy
 msgid "Successfully added User"
 msgstr "Uspešno sem dodal podatke"
 
-#: ../ldap_wizard/Ldap.pm:211
-#, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Čarovnik je uspešno dodal odjemalec."
+#: ../ldap_wizard/Ldap.pm:256
+msgid "Error when adding user in Ldap datase"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Čarovnik je uspešno nastavil strežnik samba"
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Omogočeno"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Napaka"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1944,7 +1986,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 
@@ -2067,7 +2109,7 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2719,6 +2761,38 @@ msgstr "Spletni strežnik za notranje omrežje (intranet):"
 msgid "Configuring your system as Apache server ..."
 msgstr "Nastavljam strežnik DNS"
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "Nastavljam strežnik DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Nastavljam strežnik DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Nastavljam strežnik DHCP"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Čarovnik za nastavitev DHCP"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Nastavi PXE strežnik."
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Nastavi PXE strežnik."
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "s to nastavitvijo."
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Čarovnik je uspešno dodal odjemalec."
+
 #~ msgid "Install Server"
 #~ msgstr "Instalacijski strežnik"
 
diff --git a/po/sq.po b/po/sq.po
index 32db6447..e934da88 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drackwizard-sq\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2002-03-29 19:23+0100\n"
 "Last-Translator: Naim Daka <naim70@freesurf.ch>\n"
 "Language-Team: Albanian <LL@li.org>\n"
@@ -43,7 +43,7 @@ msgstr "Gabim."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -140,12 +140,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
 msgstr "Gabim."
@@ -558,7 +559,7 @@ msgstr ""
 
 #: ../dns_wizard/Bind.pm:246
 #, fuzzy
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Asistenti e ka shtuar një klient me sukses."
 
 #: ../dns_wizard/Bind.pm:256
@@ -945,7 +946,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Parulla:"
 
@@ -991,197 +992,238 @@ msgstr "Konfigurimi i Serverit FTP"
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurimi i Serverit FTP"
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Konfigurimi i Serverit DHCP"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Asistenti Ldap"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Konfigurimi i Serverit DHCP"
+msgid "Show Ldap configuration"
+msgstr "Asistenti Konfigurues"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
+#: ../ldap_wizard/Ldap.pm:86
+msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "Asistenti Konfigurues"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Server i Bazës së të Dhënave"
+msgid "Ldap configuration wizard"
+msgstr "Asistenti Konfigurues"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "Server i Bazës së të Dhënave"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "Asistenti DNS (konfigurimi)"
+msgid "Delete configuration"
+msgstr "Konfigurimi i Serverit të kohës është regjistruar"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Shtimi i përdoruesit"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 #, fuzzy
 msgid "First Name:"
 msgstr "Emri i Ftuesit:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Emri i përdoruesit:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
+#: ../ldap_wizard/Ldap.pm:144
 #, fuzzy
-msgid "User Name:"
-msgstr "Emri i përdoruesit:"
+msgid "User Login:"
+msgstr "Shtimi i përdoruesit"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Parulla:"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Parulla:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Parullat nuk përputhen"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Konfigurimi Samba"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Emri i pronës llogaritëse:"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Repertori i përdoruesit:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Repertori i përdoruesit:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Parulla:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Parulla:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Repertori i përdoruesit:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Emri i Ftuesit:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+#, fuzzy
+msgid "User Name:"
+msgstr "Emri i përdoruesit:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Konfigurimi i Serverit DHCP"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Shtimi i përdoruesit"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "Asistenti e ka konfiguruar me sukses serverin proxy."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:211
-#, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Asistenti e ka shtuar një klient me sukses."
+#: ../ldap_wizard/Ldap.pm:256
+msgid "Error when adding user in Ldap datase"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Asistenti e ka konfiguruar me sukses serverin tuaj Samba."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "aktiv"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Gabim."
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1990,7 +2032,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 
@@ -2116,7 +2158,7 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2777,6 +2819,38 @@ msgstr "Server Web Intranet:"
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurimi i Serverit DNS"
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "Konfigurimi i Serverit DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Konfigurimi i Serverit DHCP"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Konfigurimi i Serverit DHCP"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Asistenti Konfigurues"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Server i Bazës së të Dhënave"
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Server i Bazës së të Dhënave"
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "Asistenti DNS (konfigurimi)"
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Asistenti e ka shtuar një klient me sukses."
+
 #~ msgid "The wizard successfully configured your NFS server"
 #~ msgstr "Asistenti e ka konfiguruar me sukses serverin tuaj NFS"
 
diff --git a/po/sr.po b/po/sr.po
index 942c4a8b..308cff74 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2003-02-28 22:08+0100\n"
 "Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -43,7 +43,7 @@ msgstr "Грешка у чаробњаку."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -134,12 +134,13 @@ msgstr "Ви сте у dhcp, сервер може да не ради уз ов�
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
 msgstr "Грешка у чаробњаку."
@@ -544,7 +545,7 @@ msgstr ""
 
 #: ../dns_wizard/Bind.pm:246
 #, fuzzy
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Чаробњак је успешно додао клијента."
 
 #: ../dns_wizard/Bind.pm:256
@@ -922,7 +923,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Лозинка:"
 
@@ -967,197 +968,238 @@ msgstr "Подешавање FTP сервера"
 msgid "Configuring Kolab server on your system..."
 msgstr "Подешавање FTP сервера"
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Подешавање DHCP сервера"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Ldap чаробњак"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Подешавање DHCP сервера"
+msgid "Show Ldap configuration"
+msgstr "Чаробњак за подешавање"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
+#: ../ldap_wizard/Ldap.pm:86
+msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "Чаробњак за подешавање"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Сервер бази података"
+msgid "Ldap configuration wizard"
+msgstr "Чаробњак за подешавање"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "Сервер бази података"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "DNS чаробњак (подешавање)"
+msgid "Delete configuration"
+msgstr "Сачувао сам подешавања временског сервера"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Додавање корисника"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 #, fuzzy
 msgid "First Name:"
 msgstr "Име домаћина:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Корисничко име:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
+#: ../ldap_wizard/Ldap.pm:144
 #, fuzzy
-msgid "User Name:"
-msgstr "Корисничко име:"
+msgid "User Login:"
+msgstr "Додавање корисника"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Лозинка:"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Лозинка:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Неподударност лозинки"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Подешавање Samba-е"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Прпрачунато Име домена"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "КОриснички директоријум:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "КОриснички директоријум:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Лозинка:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Лозинка:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "КОриснички директоријум:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Име домаћина:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+#, fuzzy
+msgid "User Name:"
+msgstr "Корисничко име:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Подешавање DHCP сервера"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Додавање корисника"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "Чаробњак је успешно подесио ваш прокси сервер."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:211
-#, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Чаробњак је успешно додао клијента."
+#: ../ldap_wizard/Ldap.pm:256
+msgid "Error when adding user in Ldap datase"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Овај чаробњак је успешно подесио Samba сервер."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "укључен"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Грешка у чаробњаку."
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1956,7 +1998,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 
@@ -2080,7 +2122,7 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2729,6 +2771,38 @@ msgstr "Интранет Web сервер:"
 msgid "Configuring your system as Apache server ..."
 msgstr "Подешавање DNS сервера"
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "Подешавање DHCP сервера"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Подешавање DHCP сервера"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Подешавање DHCP сервера"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Чаробњак за подешавање"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Сервер бази података"
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Сервер бази података"
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "DNS чаробњак (подешавање)"
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Чаробњак је успешно додао клијента."
+
 #~ msgid "The wizard successfully configured your NFS server"
 #~ msgstr "Чаробњак је успешно подесио Ваш NFS сервер"
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 11643da4..ceb75a03 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2003-02-28 22:08+0100\n"
 "Last-Translator: Toma Jankovic_<tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -43,7 +43,7 @@ msgstr "Greška u čarobnjaku."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -136,12 +136,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
 msgstr "Greška u čarobnjaku."
@@ -547,7 +548,7 @@ msgstr ""
 
 #: ../dns_wizard/Bind.pm:246
 #, fuzzy
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Čarobnjak je uspešno dodao klijenta."
 
 #: ../dns_wizard/Bind.pm:256
@@ -926,7 +927,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Lozinka:"
 
@@ -971,197 +972,238 @@ msgstr "Podešavanje FTP servera"
 msgid "Configuring Kolab server on your system..."
 msgstr "Podešavanje FTP servera"
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Podešavanje DHCP servera"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Ldap čarobnjak"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Podešavanje DHCP servera"
+msgid "Show Ldap configuration"
+msgstr "Čarobnjak za podešavanje"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
+#: ../ldap_wizard/Ldap.pm:86
+msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "Čarobnjak za podešavanje"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Server bazi podataka"
+msgid "Ldap configuration wizard"
+msgstr "Čarobnjak za podešavanje"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "Server bazi podataka"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "DNS čarobnjak (podešavanje)"
+msgid "Delete configuration"
+msgstr "Sačuvao sam podešavanja vremenskog servera"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Dodavanje korisnika"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 #, fuzzy
 msgid "First Name:"
 msgstr "Ime domaćina:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Korisničko ime:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
+#: ../ldap_wizard/Ldap.pm:144
 #, fuzzy
-msgid "User Name:"
-msgstr "Korisničko ime:"
+msgid "User Login:"
+msgstr "Dodavanje korisnika"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Lozinka:"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Lozinka:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Nepodudarnost lozinki"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Podešavanje Samba-e"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Prpračunato Ime domena"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "KOrisnički direktorijum:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "KOrisnički direktorijum:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Lozinka:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Lozinka:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "KOrisnički direktorijum:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Ime domaćina:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+#, fuzzy
+msgid "User Name:"
+msgstr "Korisničko ime:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Podešavanje DHCP servera"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Dodavanje korisnika"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "Čarobnjak je uspešno podesio vaš proksi server."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:211
-#, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Čarobnjak je uspešno dodao klijenta."
+#: ../ldap_wizard/Ldap.pm:256
+msgid "Error when adding user in Ldap datase"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Ovaj čarobnjak je uspešno podesio Samba server."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "uključen"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Greška u čarobnjaku."
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1961,7 +2003,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 
@@ -2085,7 +2127,7 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2737,6 +2779,38 @@ msgstr "Intranet Web server:"
 msgid "Configuring your system as Apache server ..."
 msgstr "Podešavanje DNS servera"
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "Podešavanje DHCP servera"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Podešavanje DHCP servera"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Podešavanje DHCP servera"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Čarobnjak za podešavanje"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Server bazi podataka"
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Server bazi podataka"
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "DNS čarobnjak (podešavanje)"
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Čarobnjak je uspešno dodao klijenta."
+
 #~ msgid "The wizard successfully configured your NFS server"
 #~ msgstr "Čarobnjak je uspešno podesio Vaš NFS server"
 
diff --git a/po/sv.po b/po/sv.po
index 61e32596..503cd82a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-sv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-01-23 21:20+0100\n"
 "Last-Translator: Mattias Newzella <newzella@linux.nu>\n"
 "Language-Team: Svenska <sv@li.org>\n"
@@ -44,7 +44,7 @@ msgstr "Fel."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -132,12 +132,13 @@ msgstr "Du är i DHCP, servern kanske inte fungerar med din konfiguration."
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Fel"
 
@@ -529,7 +530,7 @@ msgstr ""
 
 #: ../dns_wizard/Bind.pm:246
 #, fuzzy
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Guiden lyckades med att lägga till klienten."
 
 #: ../dns_wizard/Bind.pm:256
@@ -905,7 +906,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Lösenord:"
 
@@ -952,195 +953,236 @@ msgstr "Konfigurerar FTP-servern"
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurerar FTP-servern"
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Konfigurerar DHCP-servern"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Guide för Ldap"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Konfigurerar DHCP-servern"
+msgid "Show Ldap configuration"
+msgstr "Konfigurationsguide"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
+#: ../ldap_wizard/Ldap.pm:86
+msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "Konfigurationsguide"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Databasserver"
+msgid "Ldap configuration wizard"
+msgstr "Konfigurationsguide"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "Databasserver"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "Konfigurationsguide för DNS"
+msgid "Delete configuration"
+msgstr "Konfigurationsguide för tidsserver"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Användarnamn:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Förnamn:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Användarnamn:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Användarnamn:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Behållare:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Lösenord"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Lösenord:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Du angav inte samma lösenord"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Konfigurerar Samba"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "NIS-domännamn:"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "TFTP-katalog:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "TFTP-katalog:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Lösenord:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Lösenord:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "TFTP-katalog:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Förnamn:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Användarnamn:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Konfigurerar DHCP-servern"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Behållare:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "Guiden lyckades med att konfigurera proxyservern."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:211
-#, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Guiden lyckades med att lägga till klienten."
+#: ../ldap_wizard/Ldap.pm:256
+msgid "Error when adding user in Ldap datase"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Guiden lyckades med att konfigurera Samba-servern."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "aktiverad"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Fel"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1937,7 +1979,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 
@@ -2062,7 +2104,7 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2700,6 +2742,38 @@ msgstr "Webbserver för Intranät:"
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurerar DNS-servern"
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "Konfigurerar DHCP-servern"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Konfigurerar DHCP-servern"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Konfigurerar DHCP-servern"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Konfigurationsguide"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Databasserver"
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Databasserver"
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "Konfigurationsguide för DNS"
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Guiden lyckades med att lägga till klienten."
+
 #~ msgid "Last Name:"
 #~ msgstr "Efternamn:"
 
diff --git a/po/ta.po b/po/ta.po
index 88e74173..f267ac5d 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2002-09-06 00:50+0800\n"
 "Last-Translator: prabu<prabu_anand2000@yahoo.com>\n"
 "Language-Team: Tamil <ta@li.org>\n"
@@ -43,7 +43,7 @@ msgstr "மாயாவியில் பிழை நேர்ந்துள�
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -136,12 +136,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
 msgstr "மாயாவியில் பிழை நேர்ந்துள்ளது"
@@ -546,7 +547,7 @@ msgstr ""
 
 #: ../dns_wizard/Bind.pm:246
 #, fuzzy
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "மாயாவி உங்கள் வேண்டியை வெற்றிகரமாகச் சேர்த்துவிட்டது"
 
 #: ../dns_wizard/Bind.pm:256
@@ -928,7 +929,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "கடவுச்ெசால்:"
 
@@ -974,198 +975,239 @@ msgstr "FTP சேவையகம் வடிவமைக்கப்படு�
 msgid "Configuring Kolab server on your system..."
 msgstr "FTP சேவையகம் வடிவமைக்கப்படுகிறது"
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "DHCP சேவையகம் வடிவமைக்கப்படுகிறது"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "சம்பா மாயாவி"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "DHCP சேவையகம் வடிவமைக்கப்படுகிறது"
+msgid "Show Ldap configuration"
+msgstr "வடிவமைப்பு மாயாவி"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
+#: ../ldap_wizard/Ldap.pm:86
+msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "வடிவமைப்பு மாயாவி"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "தரவுத்தளச் சேவையகம்"
+msgid "Ldap configuration wizard"
+msgstr "வடிவமைப்பு மாயாவி"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "தரவுத்தளச் சேவையகம்"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "DNS மாயாவி (வடிவமைப்பு)"
+msgid "Delete configuration"
+msgstr "நேரச் சேவையக வடிவமைப்பு மாயாவி"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "பயனர் சேர்க்ைக"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 #, fuzzy
 msgid "First Name:"
 msgstr "கணினிப்ெபயர்"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "பயனரின்ெபயர்:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
+#: ../ldap_wizard/Ldap.pm:144
 #, fuzzy
-msgid "User Name:"
-msgstr "பயனரின்ெபயர்:"
+msgid "User Login:"
+msgstr "பயனர் சேர்க்ைக"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "கடவுச்ெசால்:"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "கடவுச்ெசால்:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "கடவுச்ெசாற்கள் இரண்டும் பொருந்தவில்ைல"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "சம்பா வடிவமைக்கப்படுகிறது"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "கண்டுபிடிக்கப்பட்ட இணையக்களப் பெயர்"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "பயனர் அடைவு:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "பயனர் அடைவு:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "கடவுச்ெசால்:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "கடவுச்ெசால்:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "பயனர் அடைவு:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "கணினிப்ெபயர்"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+#, fuzzy
+msgid "User Name:"
+msgstr "பயனரின்ெபயர்:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "DHCP சேவையகம் வடிவமைக்கப்படுகிறது"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "பயனர் சேர்க்ைக"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr ""
 "இந்த மாயாவி பினாமிச் சேவையை உங்கள் வலையமைப்புக்கு ஏற்றவாறு வெற்றிகரமாக வடிவமைத்தது"
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:211
-#, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "மாயாவி உங்கள் வேண்டியை வெற்றிகரமாகச் சேர்த்துவிட்டது"
+#: ../ldap_wizard/Ldap.pm:256
+msgid "Error when adding user in Ldap datase"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "இந்த மாயாவி சம்பா சேவையை உங்கள் வலையமைப்புக்கு ஏற்றவாறு வடிவமைத்தது."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "செயல்படுத்தப்பட்டுள்ளது"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "மாயாவியில் பிழை நேர்ந்துள்ளது"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1954,7 +1996,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 
@@ -2078,7 +2120,7 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2716,6 +2758,38 @@ msgstr "உள்ளமை வலையத்தளச் சேவையகம�
 msgid "Configuring your system as Apache server ..."
 msgstr "DNS சேவையகம் வடிவமைக்கப்படுகிறது"
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "DHCP சேவையகம் வடிவமைக்கப்படுகிறது"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "DHCP சேவையகம் வடிவமைக்கப்படுகிறது"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "DHCP சேவையகம் வடிவமைக்கப்படுகிறது"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "வடிவமைப்பு மாயாவி"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "தரவுத்தளச் சேவையகம்"
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "தரவுத்தளச் சேவையகம்"
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "DNS மாயாவி (வடிவமைப்பு)"
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "மாயாவி உங்கள் வேண்டியை வெற்றிகரமாகச் சேர்த்துவிட்டது"
+
 #~ msgid "The wizard successfully configured your NFS server"
 #~ msgstr "இந்த மாயாவி NFS சேவையை உங்கள் வலையமைப்புக்கு ஏற்றவாறு வடிவமைத்தது."
 
diff --git a/po/tg.po b/po/tg.po
index b8340130..5afa1c39 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-tg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-04-27 17:35+0000\n"
 "Last-Translator: Dilshod Marupov <dma165@hotmail.com>\n"
 "Language-Team:  Tajik\n"
@@ -46,7 +46,7 @@ msgstr "Хатогӣ."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -137,12 +137,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Хатогӣ"
 
@@ -556,7 +557,7 @@ msgid "Domainname:"
 msgstr "Номи домен:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Устод бо мувофикият соҳибро ба DNS-и шумо илова кард."
 
 #: ../dns_wizard/Bind.pm:256
@@ -966,7 +967,7 @@ msgid "Password mismatch, or null password, please correct."
 msgstr ""
 "Гузарвожа мувофиқат намекунад ё мавҷуд нест, марҳамат карда ислоҳ кунед."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "гузарвожа"
 
@@ -1007,196 +1008,238 @@ msgstr "Ба танзим даровардани хидматрасони FTP"
 msgid "Configuring Kolab server on your system..."
 msgstr "Танзимкунии хидматрасони Kolab дар системаи шумо..."
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Ба танзим даровардани DHCP сервер"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Устоди Ldap"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Ба танзим даровардани DHCP сервер"
+msgid "Show Ldap configuration"
+msgstr "Устоди батанзимдарории LDAP"
 
-#: ../ldap_wizard/Ldap.pm:81
+#: ../ldap_wizard/Ldap.pm:86
 #, fuzzy
-msgid "Add user in OpenLDAP server"
+msgid "Add user in Ldap server"
 msgstr "Иловакунӣ - иловакунии элемент ба хидматрасони LDAP"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "Устоди батанзимдарории LDAP"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "PXE хидматрасонро барпо созед."
+msgid "Ldap configuration wizard"
+msgstr "Устоди батанзимдарории LDAP"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "PXE хидматрасонро барпо созед."
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "Аз танзимоти DNS-и мавҷуда соҳибро хориҷ кунед."
+msgid "Delete configuration"
+msgstr "Танзими хидматрасонро коргузорӣ кунед"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "корванд"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Ном:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Номи Корванд:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Номи Корванд:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Контейнер:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Гузарвожа"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Бори дигар гузарвожа:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Гузарвожаҳо мувофиқ нестанд"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Танзими Samba"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Номи домен:"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Феҳристи TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Феҳристи TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "гузарвожа"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Бори дигар гузарвожа:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Феҳристи TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Ном:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Номи Корванд:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Ба танзим даровардани DHCP сервер"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Контейнер:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "Устод бо муваффақият LDAP-ро танзим кард."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 #, fuzzy
 msgid "Successfully added User"
 msgstr "Додаҳо бо муваффақият илова карда шуданд"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:256
 #, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Устод бо муваффақият элементро ба ldap илова кард"
+msgid "Error when adding user in Ldap datase"
+msgstr "Иловакунӣ - иловакунии элемент ба хидматрасони LDAP"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Устод Samba хидматрасони Шуморо муваффақатан танзим дод."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Бо нокомӣ анҷомид"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Хатогӣ"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1996,7 +2039,7 @@ msgstr "Симои боркуниро илова кунед"
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 #, fuzzy
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "Тавсифоти PXE барои фаҳмондани қоидаҳои боркунии симо истифода мешавад, яъне "
@@ -2148,7 +2191,7 @@ msgstr ""
 "истифода мешавад."
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr "Ramsize: параметрҳои ramsize-ро дар диски боркунӣ таъмир кунед."
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2811,6 +2854,42 @@ msgstr ""
 "Системаи шумо ҳамчун хидматрасони Apache ба танзим дороварда шуда "
 "истодааст ..."
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "Ба танзим даровардани DHCP сервер"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Ба танзим даровардани DHCP сервер"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Ба танзим даровардани DHCP сервер"
+
+#, fuzzy
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Иловакунӣ - иловакунии элемент ба хидматрасони LDAP"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Устоди батанзимдарории LDAP"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "PXE хидматрасонро барпо созед."
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "PXE хидматрасонро барпо созед."
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "Аз танзимоти DNS-и мавҷуда соҳибро хориҷ кунед."
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Устод бо муваффақият элементро ба ldap илова кард"
+
 #~ msgid ""
 #~ "PXE name: the name displayed in PXE menu (please provide an ASCII word or "
 #~ "a number, without spaces)"
diff --git a/po/tl.po b/po/tl.po
index 38ea8159..5cca59cd 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-tl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-04-09 00:08+0800\n"
 "Last-Translator: Arys P. Deloso <arys@deloso.org>\n"
 "Language-Team: Filipino <salinpinoy@list.comitus.net>\n"
@@ -41,7 +41,7 @@ msgstr "Error."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -134,12 +134,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Error"
 
@@ -558,7 +559,7 @@ msgid "Domainname:"
 msgstr "Domainname:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Matagumpay na naidagdag ng wizard ang host sa DNS mo."
 
 #: ../dns_wizard/Bind.pm:256
@@ -955,7 +956,7 @@ msgstr "Magpasok ng password para sa account ng manager ng Kolab server."
 msgid "Password mismatch, or null password, please correct."
 msgstr "Password di-magkatugma, o null password, pakitama."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Password:"
 
@@ -997,196 +998,238 @@ msgstr "Ini-install ang Kolab server sa iyong sistema..."
 msgid "Configuring Kolab server on your system..."
 msgstr "Kino-configure ang Kolab server sa iyong sistema..."
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Kino-configure ang DHCP server"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Ldap wizard"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Kino-configure ang DHCP server"
+msgid "Show Ldap configuration"
+msgstr "LDAP configuration wizard"
 
-#: ../ldap_wizard/Ldap.pm:81
+#: ../ldap_wizard/Ldap.pm:86
 #, fuzzy
-msgid "Add user in OpenLDAP server"
+msgid "Add user in Ldap server"
 msgstr "Magdagdag - magdagdag ng entry sa LDAP server"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "LDAP configuration wizard"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Mag-set ng PXE server."
+msgid "Ldap configuration wizard"
+msgstr "LDAP configuration wizard"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "Mag-set ng PXE server."
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "Mag-alis ng host sa mayroon nang DNS configuration."
+msgid "Delete configuration"
+msgstr "Install server configuration"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Pangalan ng User:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Unang Pangalan:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Pangalan ng User:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Pangalan ng User:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Container:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Password"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Password ulit:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Hindi pareho ang mga password"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Kino-configure ang Samba"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Domainname:"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Directory ng TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Directory ng TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Password:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Password ulit:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Directory ng TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "Unang Pangalan:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Pangalan ng User:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Kino-configure ang DHCP server"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Container:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "Matagumpay na na-configure ng wizard ang LDAP."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 #, fuzzy
 msgid "Successfully added User"
 msgstr "Matagumpay na naidagdag ang data"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:256
 #, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Matagumpay na nakapagdagdag ang wizard ng entry sa LDAP"
+msgid "Error when adding user in Ldap datase"
+msgstr "Magdagdag - magdagdag ng entry sa LDAP server"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Matagumpay na na-configure ng wizard ang Samba server mo."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Nabigo"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Error"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -2002,7 +2045,7 @@ msgstr "Magdagdag ng boot image"
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 #, fuzzy
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "Ang paglalarawan ng PXE ay ginagamit para maipaliwanag ang rule ng boot "
@@ -2154,7 +2197,7 @@ msgstr ""
 "paraan ng pag-i-install."
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr "Ramsize: i-adjust ang parameter na ramsize sa boot disk."
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2822,6 +2865,42 @@ msgstr "Apache server"
 msgid "Configuring your system as Apache server ..."
 msgstr "Kino-configure ang sistema mo bilang Apache server ..."
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "Kino-configure ang DHCP server"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Kino-configure ang DHCP server"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Kino-configure ang DHCP server"
+
+#, fuzzy
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Magdagdag - magdagdag ng entry sa LDAP server"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "LDAP configuration wizard"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Mag-set ng PXE server."
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Mag-set ng PXE server."
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "Mag-alis ng host sa mayroon nang DNS configuration."
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Matagumpay na nakapagdagdag ang wizard ng entry sa LDAP"
+
 #~ msgid ""
 #~ "PXE name: the name displayed in PXE menu (please provide an ASCII word or "
 #~ "a number, without spaces)"
diff --git a/po/tr.po b/po/tr.po
index b4f2812d..fce3a924 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-03-01 11:43+0200\n"
 "Last-Translator: S. Alp ŞENYER <ssenyer@linux-sevenler.org>\n"
 "Language-Team: Turkish <Kde-i18n-tr@kde.org>\n"
@@ -47,7 +47,7 @@ msgstr "Hata."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -135,12 +135,13 @@ msgstr "dhcp kullanıyorsunuz, sunucu bu yapılandırmanızla çalışmayabilir.
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Hata"
 
@@ -561,7 +562,7 @@ msgid "Domainname:"
 msgstr "Alanadı:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Sihirbaz, makina adını başarılı bir şekilde DNS'inize ekledi."
 
 #: ../dns_wizard/Bind.pm:256
@@ -970,7 +971,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Parola:"
 
@@ -1016,196 +1017,238 @@ msgstr "Sisteminizde PXE sunucu yapılandırılıyor..."
 msgid "Configuring Kolab server on your system..."
 msgstr "Sisteminizde PXE sunucu yapılandırılıyor..."
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "DHCP Sunucusu yapılandırılıyor"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Ldap sihibazı"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "DHCP Sunucusu yapılandırılıyor"
+msgid "Show Ldap configuration"
+msgstr "LDAP yapılandırma sihirbazı"
 
-#: ../ldap_wizard/Ldap.pm:81
+#: ../ldap_wizard/Ldap.pm:86
 #, fuzzy
-msgid "Add user in OpenLDAP server"
+msgid "Add user in Ldap server"
 msgstr "Ekle - LDAP sunucusuna veri ekle"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "LDAP yapılandırma sihirbazı"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "PXE sunucusu kur."
+msgid "Ldap configuration wizard"
+msgstr "LDAP yapılandırma sihirbazı"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "PXE sunucusu kur."
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "Varolan dns yapılandırmasından bir makine adını kaldır."
+msgid "Delete configuration"
+msgstr "Kurulum sunucusu yapılandırması"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Kullanıcı eklenmesi"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "İsim:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "Kullanıcı Adı:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Kullanıcı Adı:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Kullanıcı eklenmesi"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Parola"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "Parola:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Parolalar uyuşmuyor"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Samba Yapılandırılıyor"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Alanadı:"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "TFTP dizini:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "TFTP dizini:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Parola:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Parola:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "TFTP dizini:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "İsim:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Kullanıcı Adı:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "DHCP Sunucusu yapılandırılıyor"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Kullanıcı eklenmesi"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "Sihirbaz, LDAP sunucunuzu başarılı bir şekilde yapılandırdı."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 #, fuzzy
 msgid "Successfully added User"
 msgstr "Veri ekleme başarılı"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:256
 #, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Sihirbaz, ldap'a girişi başarılı bir şekilde ekledi."
+msgid "Error when adding user in Ldap datase"
+msgstr "Ekle - LDAP sunucusuna veri ekle"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Sihirbaz, vekil sunucunuzu başarılı bir şekilde yapılandırdı."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Başarısız"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "Hata"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -2021,7 +2064,7 @@ msgstr "Açılış imajı ekle"
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 #, fuzzy
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "PXE tanımlaması açılış imajının açıklanması için kullanılır. Örn: Mandrake "
@@ -2163,7 +2206,7 @@ msgid ""
 msgstr "Ağ istemci arayüzü: Kurulum işlemi için kullanılacak ağ arayüzü."
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2841,6 +2884,42 @@ msgstr "Apache web sunucusu"
 msgid "Configuring your system as Apache server ..."
 msgstr "Sisteminiz Apache Web Sunucu olarak yapılandırılıyor ..."
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "DHCP Sunucusu yapılandırılıyor"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "DHCP Sunucusu yapılandırılıyor"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "DHCP Sunucusu yapılandırılıyor"
+
+#, fuzzy
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Ekle - LDAP sunucusuna veri ekle"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "LDAP yapılandırma sihirbazı"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "PXE sunucusu kur."
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "PXE sunucusu kur."
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "Varolan dns yapılandırmasından bir makine adını kaldır."
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Sihirbaz, ldap'a girişi başarılı bir şekilde ekledi."
+
 #~ msgid ""
 #~ "PXE name: the name displayed in PXE menu (please provide an ASCII word or "
 #~ "a number, without spaces)"
diff --git a/po/uk.po b/po/uk.po
index 450fea55..390bd1ae 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,5 +1,5 @@
 # translation of drakwizard-uk.po to ukrainian
-# $Id: uk.po,v 1.87 2004-08-30 07:03:56 pablo Exp $
+# $Id: uk.po,v 1.88 2004-09-03 04:12:29 pablo Exp $
 # Ukrainian translation of drakwizard
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # Gladky Dima <gladimdim@mail.ru>, 2002.
@@ -11,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
-"PO-Revision-Date: 2004-08-09 09:26+0300\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
+"PO-Revision-Date: 2004-08-31 10:55+0300\n"
 "Last-Translator: Taras Boychuk <btr1@ukrpost.net>\n"
 "Language-Team: ukrainian <uk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3\n"
+"X-Generator: KBabel 1.0.1\n"
 
 #: ../Wiztemplate.pm:31
 msgid "configuration wizard"
@@ -45,7 +45,7 @@ msgstr "Помилка."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -60,7 +60,7 @@ msgstr "Помічник налаштування клієнта DNS"
 
 #: ../client_wizard/Bind_client.pm:47
 msgid "You must first run the DNS server wizard"
-msgstr "Спочатку потрібно запустити Помічника сервера DNS"
+msgstr "Спочатку потрібно викликати Помічника сервера DNS"
 
 #: ../client_wizard/Bind_client.pm:55
 msgid ""
@@ -133,12 +133,13 @@ msgstr "Ви знаходитесь в dhcp, сервер може не прац
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Помилка"
 
@@ -551,7 +552,7 @@ msgid "Domainname:"
 msgstr "Назва домена:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Помічник успішно додав машину до DNS."
 
 #: ../dns_wizard/Bind.pm:256
@@ -621,16 +622,15 @@ msgstr "Сервер NIS autofs map"
 
 #: ../drakwizard.pl:52
 msgid "Mandrakelinux Install server"
-msgstr "Сервер встановлення Мандрейклинукс"
+msgstr "Сервер встановлення Лінакс Мандрейк"
 
 #: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:154
 msgid "Kolab server"
 msgstr "Сервер Kolab"
 
 #: ../drakwizard.pl:54
-#, fuzzy
 msgid "ldap server"
-msgstr "Сервер Kolab"
+msgstr "Сервер ldap"
 
 #: ../drakwizard.pl:68
 msgid "Drakwizard wizard selection"
@@ -816,15 +816,15 @@ msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:53
 msgid "Configure a Mandrakelinux install server (via NFS and http)"
-msgstr "Налаштувати сервер встановлення Мандрейклинукс (через NFS і http)"
+msgstr "Налаштувати сервер встановлення Лінакс Мандрейк (через NFS і http)"
 
 #: ../installsrv_wizard/Installsrv.pm:53
 msgid ""
 "Easily configure a Mandrakelinux server installation directory, with NFS and "
 "HTTP access."
 msgstr ""
-"Легко налаштуйте сервер встановлення Мандрейклинукс шляхом доступу через NFS "
-"і HTTP."
+"Легко налаштуйте сервер встановлення Лінакс Мандрейк шляхом доступу через "
+"NFS і HTTP."
 
 #: ../installsrv_wizard/Installsrv.pm:58
 msgid "Destination directory: copy file in which directory?"
@@ -840,7 +840,7 @@ msgid ""
 "Mandrakelinux installation."
 msgstr ""
 "Шлях до даних: вкажіть теку з даними, повинна бути базою для встановлення "
-"Мандрейклинукса."
+"Лінакса Мандрейк."
 
 #: ../installsrv_wizard/Installsrv.pm:73
 msgid "The destination directory could not be '/var/install/'"
@@ -855,8 +855,8 @@ msgid ""
 "Error, the source path must be a directory with full Mandrakelinux "
 "installation directory."
 msgstr ""
-"Помилка, шляхом призначення повинна бути тека з повним встановленням "
-"Мандрейклинукс."
+"Помилка, шляхом призначення повинна бути тека з повним встановленням Лінакс "
+"Мандрейк."
 
 #: ../installsrv_wizard/Installsrv.pm:81
 msgid "The destination directory is already in use. Please choose another one."
@@ -884,9 +884,9 @@ msgid ""
 "configure a DHCP server with PXE support, and a PXE server. So it will be "
 "very easy to install Mandrakelinux through a network."
 msgstr ""
-"Поздоровляємо, Сервер встановлення Мандрейклинукс готовий. Зараз Ви можете "
+"Поздоровляємо, Сервер встановлення Лінакс Мандрейк готовий. Зараз Ви можете "
 "налаштувати сервер DHCP з підтримкою PXE і сервер PXE. Після цього стане "
-"дуже легко встановлювати Лінакс Мандрейклинукс по мережі."
+"дуже легко встановлювати Лінакс Лінакс Мандрейк по мережі."
 
 #: ../kolab_wizard/Kolab.pm:40
 msgid "Kolab configuration wizard"
@@ -936,7 +936,7 @@ msgstr "Введіть пароль для менеджера рахунку с�
 msgid "Password mismatch, or null password, please correct."
 msgstr "Пароль не співпадає або порожній, будь ласка, виправте."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Пароль:"
 
@@ -976,190 +976,230 @@ msgstr "Встановлюється сервер kolab на Вашій сист
 msgid "Configuring Kolab server on your system..."
 msgstr "Налаштовується сервер kolab на Вашій системі..."
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "Налаштовую сервер DHCP"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Помічник Ldap"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "Налаштовую сервер DHCP"
-
-#: ../ldap_wizard/Ldap.pm:81
-#, fuzzy
-msgid "Add user in OpenLDAP server"
-msgstr "Add - додати пункт в сервер LDAP"
+msgid "Show Ldap configuration"
+msgstr "Помічник налаштування Ldap"
 
 #: ../ldap_wizard/Ldap.pm:86
-msgid "OpenLDAP configuration wizard"
-msgstr "Помічник налаштування OpenLDAP"
+msgid "Add user in Ldap server"
+msgstr "Додати користувача в сервер Ldap"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "Встановити сервер PXE."
+msgid "Delete Ldap configuration"
+msgstr "Помічник налаштування Ldap"
 
-#: ../ldap_wizard/Ldap.pm:93
-#, fuzzy
-msgid "You must setup an OpenLDAP server first."
-msgstr "Встановити сервер PXE."
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
+msgid "Ldap configuration wizard"
+msgstr "Помічник налаштування Ldap"
+
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
+msgid "You must setup an Ldap server first."
+msgstr "Спочатку потрібно встановити сервер Ldap."
+
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Ваш вибір:"
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "Вилучити машину з існуючої конфігурації DNS."
+msgid "Delete configuration"
+msgstr "Налаштування сервера встановлення"
 
-#: ../ldap_wizard/Ldap.pm:115
-msgid "LDAP Adding User"
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:137
+msgid "LDAP Adding User"
+msgstr "Додавання користувача LDAP"
+
+#: ../ldap_wizard/Ldap.pm:140
 msgid "User Created in: "
-msgstr "Додати користувача"
+msgstr "Користувача створено в: "
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Ім'я:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 msgid "Name:"
 msgstr "Ім'я:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Ім'я користувача:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Контейнер користувачів:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
-msgstr ""
+msgstr "Потрібно ввести правильне ім'я."
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
-msgstr ""
+msgstr "Потрібно ввести правильну назву."
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
-msgstr ""
+msgstr "Потрібно ввести правильне ім'я користувача."
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 msgid "LDAP User Password"
 msgstr "Пароль користувача LDAP"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
-msgstr ""
+msgstr "паролі повинні співпадати"
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 msgid "Password (again):"
 msgstr "Пароль ще раз:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr "Вам потрібно вести пароль для LDAP."
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Паролі не співпадають"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
+msgid "Adrministrator"
+msgstr "Адміністратор LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
 msgid "Configuring LDAP Server"
-msgstr "Налаштовую сервер DHCP"
+msgstr "Налаштовується сервер LDAP"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Назва домена:"
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
+msgstr "Адміністратор LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Тека TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Тека TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr "Адміністратор LDAP:"
+
+#: ../ldap_wizard/Ldap.pm:188
 msgid "LDAP Password:"
 msgstr "Пароль LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 msgid "LDAP Password (again):"
 msgstr "Пароль LDAP ще раз:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
-msgstr "Вам потрібно ввести суфікс для LDAP."
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:192
+#, fuzzy
+msgid "Administrator"
+msgstr "Адміністратор LDAP"
+
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Потрібно ввести правильне ім'я."
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr "Підтвердження створення користувача"
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 msgid "First name:"
 msgstr "Ім'я:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Ім'я користувача:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr "Створити в:"
 
-#: ../ldap_wizard/Ldap.pm:192
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:225
 msgid "Confirmation Information for create an LDAP server"
-msgstr "Налаштовую сервер DHCP"
-
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
+msgstr "Підтвердження інформації про створення сервера LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 msgid "Users Container:"
-msgstr "Контейнер:"
+msgstr "Контейнер користувачів:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "Помічник успішно налаштував LDAP."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr "Користувача додано успішно"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:256
 #, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Помічник успішно додав запис у LDAP"
+msgid "Error when adding user in Ldap datase"
+msgstr "Додати користувача в сервер Ldap"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
-msgstr ""
+msgstr "Сервер вже налаштовано"
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Сервер Ldap вже було налаштовано з допомогою Помічника\n"
 
-#: ../ldap_wizard/Ldap.pm:351
-#, fuzzy, perl-format
+#: ../ldap_wizard/Ldap.pm:405
+#, perl-format
 msgid "%s Failed"
-msgstr "Збій"
+msgstr "Збій %s"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 msgid "Error!"
 msgstr "Помилка!"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
-msgstr ""
+msgstr "Неможливо під'єднатися до %s"
 
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
@@ -1905,7 +1945,7 @@ msgstr "Встановити сервер PXE"
 
 #: ../pxe_wizard/Pxe.pm:86
 msgid "Add boot image (Mandrakelinux release < 9.2)"
-msgstr "Додати образ завантаження (поширення Мандрейклинукс < 9.2)"
+msgstr "Додати образ завантаження (поширення Лінакс Мандрейк < 9.2)"
 
 #: ../pxe_wizard/Pxe.pm:87
 msgid "Remove boot image in PXE"
@@ -1917,7 +1957,7 @@ msgstr "Змінити образ завантаження в PXE"
 
 #: ../pxe_wizard/Pxe.pm:89
 msgid "Add all.rdz image (Mandrakelinux release > 10.0)"
-msgstr "Додати образ all.rdz (поширення Мандрейклинукс > 10.0)"
+msgstr "Додати образ all.rdz (поширення Лінакс Мандрейк > 10.0)"
 
 #: ../pxe_wizard/Pxe.pm:111
 msgid "PXE wizard"
@@ -1948,9 +1988,8 @@ msgid "Add a boot image"
 msgstr "Додати образ завантаження"
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
-#, fuzzy
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "Опис PXE використовується для пояснення застосування образу завантаження, "
@@ -2059,7 +2098,7 @@ msgstr "Додати параметр до диску завантаження P
 #: ../pxe_wizard/Pxe.pm:170
 msgid ""
 "Install directory: the full path to Mandrakelinux install server directory"
-msgstr "Тека встановлення: повний шлях до сервера встановлення Мандрейклинукс"
+msgstr "Тека встановлення: повний шлях до сервера встановлення Лінакс Мандрейк"
 
 #: ../pxe_wizard/Pxe.pm:170
 msgid "Installation method: choose NFS or HTTP."
@@ -2071,7 +2110,7 @@ msgid ""
 "You can create one with Mandrakelinux install server wizard."
 msgstr ""
 "IP сервера: IP-адреса сервера, який містить теку встановлення. Ви можете "
-"сервер з допомогою Помічника сервера встановлення Мандрейклинукс."
+"сервер з допомогою Помічника сервера встановлення Лінакс Мандрейк."
 
 #: ../pxe_wizard/Pxe.pm:173 ../pxe_wizard/Pxe.pm:251
 msgid "Server IP:"
@@ -2098,7 +2137,7 @@ msgstr ""
 "процесі встановлення."
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 "Ramsize: підберіть параметр ramsize (розмір ПЗП) на диску завантаження."
 
@@ -2169,7 +2208,7 @@ msgid ""
 "alt0/ directory."
 msgstr ""
 "Будь ласка, вкажіть образ all.rdz, який містить усі драйвери. Ви можете "
-"знайти такий на першому КД дистрибутиву Мандрейклинукс в теці /isolinux/"
+"знайти такий на першому КД дистрибутиву Лінакс Мандрейк в теці /isolinux/"
 "alt0/."
 
 #: ../pxe_wizard/Pxe.pm:212 ../pxe_wizard/Pxe.pm:216
@@ -2428,7 +2467,7 @@ msgstr "Введіть шлях до теки, доступ до якої хоч
 
 #: ../samba_wizard/Samba.pm:161
 msgid "Create shared directory if it doesn't exist"
-msgstr ""
+msgstr "Створити теку для спільного доступу, якщо такої не існує"
 
 #: ../samba_wizard/Samba.pm:166
 msgid "Failed to create directory."
@@ -2741,6 +2780,56 @@ msgstr "Сервер Апачі"
 msgid "Configuring your system as Apache server ..."
 msgstr "Налаштовую Вашу систему в якості сервера Апачі..."
 
+#~ msgid "Configure Ldap server"
+#~ msgstr "Налаштувати сервер Ldap"
+
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Налаштувати сервер OpenLDAP"
+
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Налаштувати сервер OpenLDAP"
+
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Додати користувача в сервер OpenLDAP"
+
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Помічник налаштування OpenLDAP"
+
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Встановити сервер OpenLDAP."
+
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Спочатку потрібно встановити сервер OpenLDAP."
+
+#~ msgid "Save an existing configuration"
+#~ msgstr "Зберегти існуючу конфігурацію"
+
+#~ msgid ""
+#~ "LDAP Suffix:\n"
+#~ " ex: dc=example,dc=com\n"
+#~ msgstr ""
+#~ "Суфікс LDAP:\n"
+#~ " ex: dc=example,dc=com\n"
+
+#~ msgid ""
+#~ "LDAP Administrator:\n"
+#~ " ex: cn=admin,dc=example,dc=com\n"
+#~ msgstr ""
+#~ "Адміністратор LDAP:\n"
+#~ " ex: cn=admin,dc=example,dc=com\n"
+
+#~ msgid "You must enter a suffix for LDAP."
+#~ msgstr "Вам потрібно ввести суфікс для LDAP."
+
+#~ msgid "Organisation LDAP:"
+#~ msgstr "Організація LDAP:"
+
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Помічник успішно додав користувача у LDAP"
+
+#~ msgid "You have already configured your OpenLDAP Server with drakwizard\n"
+#~ msgstr "Сервер OpenLDAP вже було налаштовано з допомогою Помічника\n"
+
 #~ msgid "The wizard successfully add host in your DNS."
 #~ msgstr "Помічник успішно додав машину до DNS."
 
@@ -2795,9 +2884,6 @@ msgstr "Налаштовую Вашу систему в якості серве�
 #~ msgid "LDAP Suffix:"
 #~ msgstr "Суфікс LDAP:"
 
-#~ msgid "LDAP Administrator:"
-#~ msgstr "Адміністратор LDAP:"
-
 #~ msgid "The wizard successfully added an user in LDAP"
 #~ msgstr "Помічник успішно додав користувача у LDAP"
 
diff --git a/po/uz.po b/po/uz.po
index d7f8a540..9714bf49 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-08-13 01:26+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <kmashrab@uni-bremen.de>\n"
@@ -42,7 +42,7 @@ msgstr "Хато."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -129,12 +129,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Хато"
 
@@ -509,7 +510,7 @@ msgstr ""
 
 # M:
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Ёрдамчи клиентни муваффақиятли DNS'га қўшди."
 
 # M:
@@ -868,7 +869,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Махфий сўз:"
 
@@ -906,190 +907,232 @@ msgstr "Kolab сервери мосланмоқда..."
 msgid "Configuring Kolab server on your system..."
 msgstr "Kolab сервери мосланмоқда..."
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "DHCP сервери мосланмоқда"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Ldap ёрдамчиси"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "DHCP сервери мосланмоқда"
+msgid "Show Ldap configuration"
+msgstr "мослаш учун ёрдамчи"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
+#: ../ldap_wizard/Ldap.pm:86
+msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "мослаш учун ёрдамчи"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "LDAP серверини ўрнатиш."
+msgid "Ldap configuration wizard"
+msgstr "мослаш учун ёрдамчи"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "LDAP серверини ўрнатиш."
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "Асосий DNS хизматини мослаш учун ёрдамчи"
+msgid "Delete configuration"
+msgstr "Ўрнатиш сервернинг мосламаси"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
 # M:
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Фойдаланувчи:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Исми:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 msgid "Name:"
 msgstr "Номи:"
 
 # M:
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
 msgstr "Фойдаланувчи:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 msgid "LDAP User Password"
 msgstr "Махфий сўз"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "passwords must match"
 msgstr "Махфий сўзлар мос келмайди"
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 msgid "Password (again):"
 msgstr "Махфий сўз (яна):"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Махфий сўзлар мос келмайди"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "LDAP сервери мослаш"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Domain name: "
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Директория:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Директория:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:188
 msgid "LDAP Password:"
 msgstr "LDAP махфий сўз:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 msgid "LDAP Password (again):"
 msgstr "LDAP махфий сўз (яна):"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Директория:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 msgid "First name:"
 msgstr "Исми:"
 
-#: ../ldap_wizard/Ldap.pm:186
+# M:
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Фойдаланувчи:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "DHCP сервери мосланмоқда"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
 # M:
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Фойдаланувчи:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "Ёрдамчи LDAP серверини муваффақиятли мослади."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr "Фойдаланувчи муваффақиятли қўшилди"
 
-#: ../ldap_wizard/Ldap.pm:211
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Ёрдамчи фойдаланувчини LDAP серверига муваффақиятли қўшди"
+#: ../ldap_wizard/Ldap.pm:256
+msgid "Error when adding user in Ldap datase"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Ёрдамчи Samba серверингизни муваффақиятли мослади."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Муваффақиятсиз тугади"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 msgid "Error!"
 msgstr "Хато!"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1815,7 +1858,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 
@@ -1936,7 +1979,7 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2528,6 +2571,37 @@ msgstr "Apache сервери"
 msgid "Configuring your system as Apache server ..."
 msgstr "Тизим Apache сервер сифатида мосланмоқда..."
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "DHCP сервери мосланмоқда"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "DHCP сервери мосланмоқда"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "DHCP сервери мосланмоқда"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "мослаш учун ёрдамчи"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "LDAP серверини ўрнатиш."
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "LDAP серверини ўрнатиш."
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "Асосий DNS хизматини мослаш учун ёрдамчи"
+
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Ёрдамчи фойдаланувчини LDAP серверига муваффақиятли қўшди"
+
 #~ msgid "Server Name: "
 #~ msgstr "Сервернинг номи: "
 
diff --git a/po/uz@Latn.po b/po/uz@Latn.po
index fb3ac1cd..41f4437f 100644
--- a/po/uz@Latn.po
+++ b/po/uz@Latn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-08-13 01:26+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <kmashrab@uni-bremen.de>\n"
@@ -42,7 +42,7 @@ msgstr "Xato."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -130,12 +130,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Xato"
 
@@ -514,7 +515,7 @@ msgstr ""
 
 # M:
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Yordamchi klientni muvaffaqiyatli DNS'ga qo'shdi."
 
 # M:
@@ -876,7 +877,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Maxfiy so'z:"
 
@@ -914,190 +915,232 @@ msgstr "Kolab serveri moslanmoqda..."
 msgid "Configuring Kolab server on your system..."
 msgstr "Kolab serveri moslanmoqda..."
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "DHCP serveri moslanmoqda"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Ldap yordamchisi"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "DHCP serveri moslanmoqda"
+msgid "Show Ldap configuration"
+msgstr "moslash uchun yordamchi"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
+#: ../ldap_wizard/Ldap.pm:86
+msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "moslash uchun yordamchi"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "LDAP serverini o'rnatish."
+msgid "Ldap configuration wizard"
+msgstr "moslash uchun yordamchi"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "LDAP serverini o'rnatish."
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "Asosiy DNS xizmatini moslash uchun yordamchi"
+msgid "Delete configuration"
+msgstr "O'rnatish serverning moslamasi"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
 # M:
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "Foydalanuvchi:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Ismi:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 msgid "Name:"
 msgstr "Nomi:"
 
 # M:
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
 msgstr "Foydalanuvchi:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 msgid "LDAP User Password"
 msgstr "Maxfiy so'z"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "passwords must match"
 msgstr "Maxfiy so'zlar mos kelmaydi"
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 msgid "Password (again):"
 msgstr "Maxfiy so'z (yana):"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Maxfiy so'zlar mos kelmaydi"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "LDAP serveri moslash"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Domain name: "
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Direktoriya:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Direktoriya:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:188
 msgid "LDAP Password:"
 msgstr "LDAP maxfiy so'z:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 msgid "LDAP Password (again):"
 msgstr "LDAP maxfiy so'z (yana):"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Direktoriya:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 msgid "First name:"
 msgstr "Ismi:"
 
-#: ../ldap_wizard/Ldap.pm:186
+# M:
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Foydalanuvchi:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "DHCP serveri moslanmoqda"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
 # M:
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "Foydalanuvchi:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "Yordamchi LDAP serverini muvaffaqiyatli mosladi."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr "Foydalanuvchi muvaffaqiyatli qo'shildi"
 
-#: ../ldap_wizard/Ldap.pm:211
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Yordamchi foydalanuvchini LDAP serveriga muvaffaqiyatli qo'shdi"
+#: ../ldap_wizard/Ldap.pm:256
+msgid "Error when adding user in Ldap datase"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Yordamchi Samba serveringizni muvaffaqiyatli mosladi."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Muvaffaqiyatsiz tugadi"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 msgid "Error!"
 msgstr "Xato!"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1828,7 +1871,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 
@@ -1949,7 +1992,7 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2545,6 +2588,37 @@ msgstr "Apache serveri"
 msgid "Configuring your system as Apache server ..."
 msgstr "Tizim Apache server sifatida moslanmoqda..."
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "DHCP serveri moslanmoqda"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "DHCP serveri moslanmoqda"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "DHCP serveri moslanmoqda"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "moslash uchun yordamchi"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "LDAP serverini o'rnatish."
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "LDAP serverini o'rnatish."
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "Asosiy DNS xizmatini moslash uchun yordamchi"
+
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Yordamchi foydalanuvchini LDAP serveriga muvaffaqiyatli qo'shdi"
+
 #~ msgid "Server Name: "
 #~ msgstr "Serverning nomi: "
 
diff --git a/po/vi.po b/po/vi.po
index 52d72c93..14f0eb1e 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-vi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-08-25 15:10+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -45,7 +45,7 @@ msgstr "Lỗi."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -134,12 +134,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Lỗi"
 
@@ -536,7 +537,7 @@ msgid "Domainname:"
 msgstr "Tên miền:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Đồ thuật hoàn thành việc thêm host vào DNS của bạn."
 
 #: ../dns_wizard/Bind.pm:256
@@ -912,7 +913,7 @@ msgstr "Hãy nhập mật khẩu để quản trị tài khoản cho Kolab serve
 msgid "Password mismatch, or null password, please correct."
 msgstr "Mật khẩu không khớp hoặc để trống, hãy kiểm tra lại."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Mật khẩu:"
 
@@ -952,180 +953,227 @@ msgstr "Đang cài đặt máy chủ Kolab..."
 msgid "Configuring Kolab server on your system..."
 msgstr "Đang cấu hình máy chủ Kolab...."
 
-#: ../ldap_wizard/Ldap.pm:26
-msgid "Configure OpenLDAP Server "
-msgstr "Cấu hình máy chủ OpenLDAP"
-
-#: ../ldap_wizard/Ldap.pm:80
-msgid "Configure OpenLDAP server"
-msgstr "Cấu hình máy chủ OpenLDAP"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Đồ thuật Ldap"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
-msgstr "Thêm người dùng vào máy chủ OpenLDAP"
+#: ../ldap_wizard/Ldap.pm:85
+#, fuzzy
+msgid "Show Ldap configuration"
+msgstr "Đồ thuật cấu hình Ldap"
 
 #: ../ldap_wizard/Ldap.pm:86
-msgid "OpenLDAP configuration wizard"
-msgstr "Đồ thuật cấu hình OpenLDAP"
+msgid "Add user in Ldap server"
+msgstr "Thêm người dùng vào máy chủ Ldap"
 
-#: ../ldap_wizard/Ldap.pm:86
-msgid "Setup an OpenLDAP server."
-msgstr "Thiết lập máy chủ OpenLDAP."
+#: ../ldap_wizard/Ldap.pm:87
+#, fuzzy
+msgid "Delete Ldap configuration"
+msgstr "Đồ thuật cấu hình Ldap"
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:93
-msgid "You must setup an OpenLDAP server first."
-msgstr "Trước tiên, bạn phải thiết lập máy chủ OpenLDAP."
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
+msgid "Ldap configuration wizard"
+msgstr "Đồ thuật cấu hình Ldap"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
+msgid "You must setup an Ldap server first."
+msgstr "Trước tiên, bạn phải thiết lập máy chủ Ldap."
+
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Lựa chọn của bạn:"
 
-#: ../ldap_wizard/Ldap.pm:110
-msgid "Save an existing configuration"
-msgstr "Lưu lại cấu hình hiện thời."
+#: ../ldap_wizard/Ldap.pm:132
+#, fuzzy
+msgid "Delete configuration"
+msgstr "Cấu hình máy chủ cài đặt"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr "Thêm Người Dùng LDAP"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 msgid "User Created in: "
 msgstr "Người dùng được tạo trong:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Tên:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 msgid "Name:"
 msgstr "Tên:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "Tên người dùng:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "Container người dùng:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr "Bạn phải nhập tên gọi hợp lệ."
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr "Bạn phải nhập tên hợp lệ."
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr "Bạn phải nhập tên người dùng hợp lệ."
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 msgid "LDAP User Password"
 msgstr "Mật khẩu người dùng LDAP"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr "Mật khẩu không khớp"
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 msgid "Password (again):"
 msgstr "Mật khẩu (nhập lại):"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr "Bạn phải nhập mật khẩu cho LDAP."
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Mật khẩu không khớp nhau"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Adrministrator"
+msgstr "Quản trị LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
 msgid "Configuring LDAP Server"
 msgstr "Cấu hình LDAP Server"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
-msgstr ""
-"LDAP Suffix:\n"
-" ví dụ: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "Tên miền:"
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
+msgstr "Quản trị LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "Thư mục TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
-"Người quản trị LDAP:\n"
-" ví dụ: cn=admin,dc=example,dc=com\n"
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "Thư mục TFTP:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr "Quản trị LDAP:"
+
+#: ../ldap_wizard/Ldap.pm:188
 msgid "LDAP Password:"
 msgstr "Mật khẩu LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 msgid "LDAP Password (again):"
 msgstr "Mật khẩu LDAP (nhập lại):"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
-msgstr "Bạn phải nhập hậu tố (suffix) cho LDAP."
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:192
+#, fuzzy
+msgid "Administrator"
+msgstr "Quản trị LDAP"
+
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Bạn phải nhập tên gọi hợp lệ."
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr "Khẳng định vệc tạo người dùng"
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 msgid "First name:"
 msgstr "Tên đầu:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "Tên người dùng:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr "Tạo ở:"
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Thông tin xác định để cấu hình máy chủ LDAP"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr "Tổ chức LDAP:"
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr "Quản trị LDAP:"
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 msgid "Users Container:"
 msgstr "Container người dùng:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "Đồ thuật hoàn thành cấu hình LDAP."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr "Hoàn thành việc thêm người dùng"
 
-#: ../ldap_wizard/Ldap.pm:211
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Đồ thuật hoàn thành việc thêm người dùng trong LDAP"
+#: ../ldap_wizard/Ldap.pm:256
+#, fuzzy
+msgid "Error when adding user in Ldap datase"
+msgstr "Thêm người dùng vào máy chủ Ldap"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr "Máy chủ đã được cấu hình rồi"
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr "Bạn đã cấu hình OpenLDAP Server bằng drakwizard rồi\n"
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "Bạn đã cấu hình Ldap Server bằng drakwizard rồi\n"
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, perl-format
 msgid "%s Failed"
 msgstr "%s lỗi"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 msgid "Error!"
 msgstr "Lỗi!"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr "Không thể kết nối đến %s"
@@ -1894,7 +1942,7 @@ msgstr "Thêm ảnh khởi động"
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "Mô tả PXE dùng để giải thích vai trò của ảnh khởi động, ví dụ: Mandrakelinux "
@@ -2023,7 +2071,7 @@ msgid ""
 msgstr "Giao diện máy khách mạng: giao diện dùng để tiến hành cài đặt."
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr "Ramsize: hiệu chỉnh tham số ramsize lên đĩa khởi động."
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2652,3 +2700,53 @@ msgstr "Máy chủ Apache"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "Cấu hình hệ thống làm máy chủ Apache..."
+
+#~ msgid "Configure Ldap server"
+#~ msgstr "Cấu hình máy chủ Ldap"
+
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Cấu hình máy chủ OpenLDAP"
+
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Cấu hình máy chủ OpenLDAP"
+
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Thêm người dùng vào máy chủ OpenLDAP"
+
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Đồ thuật cấu hình OpenLDAP"
+
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Thiết lập máy chủ OpenLDAP."
+
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Trước tiên, bạn phải thiết lập máy chủ OpenLDAP."
+
+#~ msgid "Save an existing configuration"
+#~ msgstr "Lưu lại cấu hình hiện thời."
+
+#~ msgid ""
+#~ "LDAP Suffix:\n"
+#~ " ex: dc=example,dc=com\n"
+#~ msgstr ""
+#~ "LDAP Suffix:\n"
+#~ " ví dụ: dc=example,dc=com\n"
+
+#~ msgid ""
+#~ "LDAP Administrator:\n"
+#~ " ex: cn=admin,dc=example,dc=com\n"
+#~ msgstr ""
+#~ "Người quản trị LDAP:\n"
+#~ " ví dụ: cn=admin,dc=example,dc=com\n"
+
+#~ msgid "You must enter a suffix for LDAP."
+#~ msgstr "Bạn phải nhập hậu tố (suffix) cho LDAP."
+
+#~ msgid "Organisation LDAP:"
+#~ msgstr "Tổ chức LDAP:"
+
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Đồ thuật hoàn thành việc thêm người dùng trong LDAP"
+
+#~ msgid "You have already configured your OpenLDAP Server with drakwizard\n"
+#~ msgstr "Bạn đã cấu hình OpenLDAP Server bằng drakwizard rồi\n"
diff --git a/po/wa.po b/po/wa.po
index ee47d043..a019cc14 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:23+0200\n"
 "PO-Revision-Date: 2004-08-08 18:25+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -43,7 +43,7 @@ msgstr "Aroke."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -134,12 +134,13 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Aroke"
 
@@ -560,7 +561,7 @@ msgid "Domainname:"
 msgstr "Dominne:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "Li macrea a radjouté comifåt l' lodjoe a vosse DNS."
 
 #: ../dns_wizard/Bind.pm:256
@@ -942,7 +943,7 @@ msgstr ""
 "Les screts n' corespondèt nén, oudonbén end a onk k' est vude, coridjîz s' i "
 "vs plait."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "Sicret:"
 
@@ -983,180 +984,222 @@ msgstr "Astalaedje do sierveu Kolab so vosse sistinme..."
 msgid "Configuring Kolab server on your system..."
 msgstr "Apontiaedje do sierveu Kolab so vosse sistinme..."
 
-#: ../ldap_wizard/Ldap.pm:26
-msgid "Configure OpenLDAP Server "
-msgstr "Apontiaedje do sierveu OpenLDAP "
-
-#: ../ldap_wizard/Ldap.pm:80
-msgid "Configure OpenLDAP server"
-msgstr "Apontiaedje do sierveu OpenLDAP"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Macrea Ldap"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
-msgstr "Radjouter èn uzeu å sierveu OpenLDAP"
+#: ../ldap_wizard/Ldap.pm:85
+msgid "Show Ldap configuration"
+msgstr "Mostrer l' apontiaedje Ldap"
 
 #: ../ldap_wizard/Ldap.pm:86
-msgid "OpenLDAP configuration wizard"
-msgstr "Macrea d' apontiaedje OpenLDAP"
+msgid "Add user in Ldap server"
+msgstr "Radjouter èn uzeu å sierveu Ldap"
 
-#: ../ldap_wizard/Ldap.pm:86
-msgid "Setup an OpenLDAP server."
-msgstr "Apontyî on sierveu OpenLDAP."
+#: ../ldap_wizard/Ldap.pm:87
+msgid "Delete Ldap configuration"
+msgstr "Disfacer l' apontiaedje Ldap"
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+"C' est on protocole ledjir po-z aveur accès åzès siervices di botins, "
+"copurade les siervices di botins båzés so X.500."
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+"LDAP vout dir protocole ledjir d' accès åzès botins (Lightweight Directory "
+"Access Protocol)."
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
+msgid "Ldap configuration wizard"
+msgstr "Macrea d' apontiaedje Ldap"
 
-#: ../ldap_wizard/Ldap.pm:93
-msgid "You must setup an OpenLDAP server first."
-msgstr "Vos dvoz aprume apontyî on sierveu OpenLDAP."
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
+msgid "You must setup an Ldap server first."
+msgstr "Vos dvoz aprume apontyî on sierveu Ldap."
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Vosse tchuze:"
 
-#: ../ldap_wizard/Ldap.pm:110
-msgid "Save an existing configuration"
-msgstr "Schaper èn apontiaedje k' i gn a"
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Delete configuration"
+msgstr "Disfacer l' apontiaedje"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr "Wårdant li båze k' egzistêye dedja e /root/ldap-sav.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr "Radjoutaedje d' èn uzeu LDAP"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 msgid "User Created in: "
 msgstr "Uzeu askepyî e: "
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "Pitit No:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 msgid "Name:"
 msgstr "No:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
+#: ../ldap_wizard/Ldap.pm:144
+msgid "User Login:"
 msgstr "No d' elodjaedje:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr "Vos dvoz dner on ptit no valide."
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr "Vos dvoz dner on no valide."
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr "Vos dvoz dner on no d' uzeu valide."
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 msgid "LDAP User Password"
 msgstr "Sicret po l' uzeu LDAP"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr "les screts èn corespondèt nén"
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 msgid "Password (again):"
 msgstr "Ritapez l' sicret:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr "Vos dvoz dner on scret po LDAP."
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Les screts èn corespondèt nén"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+"Li manaedjeu est èn uzeu k' a-st accès al båze di dnêyes LDAP, eyet "
+"l' poleur candjî"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr "Manaedjeu"
+
+#: ../ldap_wizard/Ldap.pm:183
 msgid "Configuring LDAP Server"
 msgstr "Apontiaedje do sierveu LDAP"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
-msgstr ""
-"Cawete LDAP:\n"
-" eg: dc=egzimpe,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Domain name: "
+msgstr "No d' dominne: "
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
+msgstr "Manaedjeu LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP directory tree"
+msgstr "Coxhlaedje di botins LDAP:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
-"Manaedjeu LDAP:\n"
-" eg: cn=admin,dc=egzimpe,dc=com\n"
+"Li lomaedje DNS est eployî pol definixhaedje do coxhlaedje di botins LDAP"
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+msgid "LDAP directory tree:"
+msgstr "Coxhlaedje di botins LDAP:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr "Manaedjeu LDAP:"
+
+#: ../ldap_wizard/Ldap.pm:188
 msgid "LDAP Password:"
 msgstr "Sicret LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 msgid "LDAP Password (again):"
 msgstr "Ritapez l' sicret LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
-msgstr "Vos dvoz dner ene cawete po LDAP."
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
+msgstr "Manaedjeu"
+
+#: ../ldap_wizard/Ldap.pm:197
+msgid "You must enter a valid LDAP directory tree."
+msgstr "Vos dvoz dner on coxhlaedje di botins LDAP valide."
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr "Acertinaedje di l' uzeu a-z askepyî"
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 msgid "First name:"
 msgstr "Pitit No:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "No d' elodjaedje:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr "Askepyî e:"
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Acertinaedje di l' informåcion po l' askepiaedje d' on sierveu LDAP"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr "Organizåcion LDAP:"
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr "Manaedjeu LDAP:"
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 msgid "Users Container:"
 msgstr "Contneu des uzeus:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "Li macrea a-st apontyî comifåt li LDAP."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr "Uzeu radjouté comifåt"
 
-#: ../ldap_wizard/Ldap.pm:211
-msgid "The wizard successfully added a user in LDAP"
-msgstr "Li macrea a radjouté comifåt èn uzeu LDAP."
+#: ../ldap_wizard/Ldap.pm:256
+msgid "Error when adding user in Ldap datase"
+msgstr "Åk n' a nén stî tot radjoutant èn uzeu å sierveu Ldap"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr "Sierveu ddja apontyî"
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr "Vos avoz ddja apontyî vosse sierveu OpenLDAP avou drakwizard\n"
+#: ../ldap_wizard/Ldap.pm:269
+msgid "You have already configured your Ldap Server"
+msgstr "Vos avoz ddja apontyî vosse sierveu Ldap"
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, perl-format
 msgid "%s Failed"
 msgstr "%s a fwait berwete"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 msgid "Error!"
 msgstr "Aroke!"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr "Dji n' a savou m' raloyî a %s"
@@ -1917,7 +1960,7 @@ msgstr "Radjouter ene imådje d' enondaedje"
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 
@@ -2050,7 +2093,7 @@ msgstr ""
 "doet i esse astalé."
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 "Memwere: coridjî li grandeu del memwere (ramsize) sol plakete d' enondaedje."
 
@@ -2702,6 +2745,62 @@ msgstr "Sierveu waibe apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Apontiaedje di vosse sistinme come sierveu waibe Apache..."
 
+#~ msgid "Configure Ldap server"
+#~ msgstr "Apontiaedje do sierveu Ldap"
+
+#~ msgid "Error for added User"
+#~ msgstr "Åk n' a nén stî tot radjoutant l' uzeu"
+
+#~ msgid "ex: Domain mandrakesoft.com dc=mandrakesoft,dc=com"
+#~ msgstr "eg: Dominne mandrakesoft.com dc=mandrakesoft,dc=com"
+
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "Apontiaedje do sierveu OpenLDAP "
+
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "Apontiaedje do sierveu OpenLDAP"
+
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "Radjouter èn uzeu å sierveu OpenLDAP"
+
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "Macrea d' apontiaedje OpenLDAP"
+
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "Apontyî on sierveu OpenLDAP."
+
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "Vos dvoz aprume apontyî on sierveu OpenLDAP."
+
+#~ msgid "Save an existing configuration"
+#~ msgstr "Schaper èn apontiaedje k' i gn a"
+
+#~ msgid ""
+#~ "LDAP Suffix:\n"
+#~ " ex: dc=example,dc=com\n"
+#~ msgstr ""
+#~ "Cawete LDAP:\n"
+#~ " eg: dc=egzimpe,dc=com\n"
+
+#~ msgid ""
+#~ "LDAP Administrator:\n"
+#~ " ex: cn=admin,dc=example,dc=com\n"
+#~ msgstr ""
+#~ "Manaedjeu LDAP:\n"
+#~ " eg: cn=admin,dc=egzimpe,dc=com\n"
+
+#~ msgid "You must enter a suffix for LDAP."
+#~ msgstr "Vos dvoz dner ene cawete po LDAP."
+
+#~ msgid "Organisation LDAP:"
+#~ msgstr "Organizåcion LDAP:"
+
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "Li macrea a radjouté comifåt èn uzeu LDAP."
+
+#~ msgid "You have already configured your OpenLDAP Server with drakwizard\n"
+#~ msgstr "Vos avoz ddja apontyî vosse sierveu OpenLDAP avou drakwizard\n"
+
 #~ msgid "LDAP User Add"
 #~ msgstr "Radjouter èn uzeu LDAP"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b3281af5..2d39e3b2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-08-23 01:05+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandrakelinux i18n Team <cooker-i18n@linux-mandrake.com>\n"
@@ -43,7 +43,7 @@ msgstr "出错。"
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -125,12 +125,13 @@ msgstr "您在使用 dhcp，服务器可能无法按照您的配置工作。"
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "出错"
 
@@ -517,7 +518,7 @@ msgid "Domainname:"
 msgstr "域名:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "向导成功地在您的 DNS 中添加了主机。"
 
 #: ../dns_wizard/Bind.pm:256
@@ -879,7 +880,7 @@ msgstr "输入 Kolab 服务器管理员账户的密码。"
 msgid "Password mismatch, or null password, please correct."
 msgstr "密码不相配，或者密码为空，请纠正。"
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "密码:"
 
@@ -919,180 +920,227 @@ msgstr "正在您的系统中安装 Kolab 服务器..."
 msgid "Configuring Kolab server on your system..."
 msgstr "正在您的系统中配置 Kolab 服务器..."
 
-#: ../ldap_wizard/Ldap.pm:26
-msgid "Configure OpenLDAP Server "
-msgstr "配置 OpenLDAP 服务器"
-
-#: ../ldap_wizard/Ldap.pm:80
-msgid "Configure OpenLDAP server"
-msgstr "配置 OpenLDAP 服务器"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Ldap 向导"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
-msgstr "在 OpenLDAP 服务器中添加用户"
+#: ../ldap_wizard/Ldap.pm:85
+#, fuzzy
+msgid "Show Ldap configuration"
+msgstr "Ldap 配置向导"
 
 #: ../ldap_wizard/Ldap.pm:86
-msgid "OpenLDAP configuration wizard"
-msgstr "OpenLDAP 配置向导"
+msgid "Add user in Ldap server"
+msgstr "在 Ldap 服务器中添加用户"
 
-#: ../ldap_wizard/Ldap.pm:86
-msgid "Setup an OpenLDAP server."
-msgstr "设置 OpenLDAP 服务器。"
+#: ../ldap_wizard/Ldap.pm:87
+#, fuzzy
+msgid "Delete Ldap configuration"
+msgstr "Ldap 配置向导"
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:93
-msgid "You must setup an OpenLDAP server first."
-msgstr "您必须先设置 OpenLDAP 服务器。"
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
+msgid "Ldap configuration wizard"
+msgstr "Ldap 配置向导"
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
+msgid "You must setup an Ldap server first."
+msgstr "您必须先设置 Ldap 服务器。"
+
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "您的选择："
 
-#: ../ldap_wizard/Ldap.pm:110
-msgid "Save an existing configuration"
-msgstr "保存现有的配置"
+#: ../ldap_wizard/Ldap.pm:132
+#, fuzzy
+msgid "Delete configuration"
+msgstr "安装服务器配置"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr "LDAP 添加用户"
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 msgid "User Created in: "
 msgstr "用户创建于:"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "名:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 msgid "Name:"
 msgstr "名称:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "用户名:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "用户容器:"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr "您必须输入有效的名。"
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr "您必须输入有效的名称。"
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr "您必须输入有效的用户名。"
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 msgid "LDAP User Password"
 msgstr "LDAP 用户密码"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr "密码不匹配"
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 msgid "Password (again):"
 msgstr "重输密码:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr "您必须为 LDAP 输入密码。"
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "密码不匹配"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Adrministrator"
+msgstr "管理员 LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
 msgid "Configuring LDAP Server"
 msgstr "配置 LDAP 服务器"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
-msgstr ""
-"LDAP 后缀:\n"
-" 如: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "域名:"
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
+msgstr "管理员 LDAP"
+
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "TFTP 目录:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
-"LDAP 管理员:\n"
-" 如: dc=example,dc=com\n"
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "TFTP 目录:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr "管理员 LDAP:"
+
+#: ../ldap_wizard/Ldap.pm:188
 msgid "LDAP Password:"
 msgstr "LDAP 密码:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 msgid "LDAP Password (again):"
 msgstr "LDAP 重输密码:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
-msgstr "您必须输入 LDAP 的后缀。"
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:192
+#, fuzzy
+msgid "Administrator"
+msgstr "管理员 LDAP"
+
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "您必须输入有效的名。"
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr "确认创建用户"
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 msgid "First name:"
 msgstr "名:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "用户名:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr "创建于:"
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 msgid "Confirmation Information for create an LDAP server"
 msgstr "确认创建 LDAP 服务器的信息"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr "组织 LDAP:"
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr "管理员 LDAP:"
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 msgid "Users Container:"
 msgstr "用户容器:"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "向导成功地配置了 LDAP。"
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr "成功地添加了用户"
 
-#: ../ldap_wizard/Ldap.pm:211
-msgid "The wizard successfully added a user in LDAP"
-msgstr "向导成功地在 LDAP 中添加了用户"
+#: ../ldap_wizard/Ldap.pm:256
+#, fuzzy
+msgid "Error when adding user in Ldap datase"
+msgstr "在 Ldap 服务器中添加用户"
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr "服务器已经配置"
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr "您已经使用 Drakwizard 配置了您的 OpenLDAP 服务器\n"
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "您已经使用 Drakwizard 配置了您的 Ldap 服务器\n"
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, perl-format
 msgid "%s Failed"
 msgstr "%s 失败"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 msgid "Error!"
 msgstr "出错!"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr "无法连接到 %s"
@@ -1833,7 +1881,7 @@ msgstr "添加启动映像"
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "PXE 描述用于解释引导映像的规则，即: Mandrakelinux 10 映像，Mandrakelinux "
@@ -1968,7 +2016,7 @@ msgid ""
 msgstr "网卡：通过哪块网卡安装。"
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr "内存大小：在启动盘上调整内存大小。"
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2581,6 +2629,56 @@ msgstr "Apache 服务器"
 msgid "Configuring your system as Apache server ..."
 msgstr "正在将您的系统配置为 Apache 服务器..."
 
+#~ msgid "Configure Ldap server"
+#~ msgstr "配置 Ldap 服务器"
+
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "配置 OpenLDAP 服务器"
+
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "配置 OpenLDAP 服务器"
+
+#~ msgid "Add user in OpenLDAP server"
+#~ msgstr "在 OpenLDAP 服务器中添加用户"
+
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "OpenLDAP 配置向导"
+
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "设置 OpenLDAP 服务器。"
+
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "您必须先设置 OpenLDAP 服务器。"
+
+#~ msgid "Save an existing configuration"
+#~ msgstr "保存现有的配置"
+
+#~ msgid ""
+#~ "LDAP Suffix:\n"
+#~ " ex: dc=example,dc=com\n"
+#~ msgstr ""
+#~ "LDAP 后缀:\n"
+#~ " 如: dc=example,dc=com\n"
+
+#~ msgid ""
+#~ "LDAP Administrator:\n"
+#~ " ex: cn=admin,dc=example,dc=com\n"
+#~ msgstr ""
+#~ "LDAP 管理员:\n"
+#~ " 如: dc=example,dc=com\n"
+
+#~ msgid "You must enter a suffix for LDAP."
+#~ msgstr "您必须输入 LDAP 的后缀。"
+
+#~ msgid "Organisation LDAP:"
+#~ msgstr "组织 LDAP:"
+
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "向导成功地在 LDAP 中添加了用户"
+
+#~ msgid "You have already configured your OpenLDAP Server with drakwizard\n"
+#~ msgstr "您已经使用 Drakwizard 配置了您的 OpenLDAP 服务器\n"
+
 #~ msgid ""
 #~ "PXE name: the name displayed in PXE menu (please provide an ASCII word or "
 #~ "a number, without spaces)"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d443e2d9..5cff0c76 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-24 01:02+0200\n"
+"POT-Creation-Date: 2004-09-03 13:26+0200\n"
 "PO-Revision-Date: 2004-02-21 22:10+0800\n"
 "Last-Translator: Hilbert <h@mandrake.org>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -42,7 +42,7 @@ msgstr "錯誤."
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
 #: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:203 ../news_wizard/Inn.pm:95
+#: ../ldap_wizard/Ldap.pm:236 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
 #: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
@@ -125,12 +125,13 @@ msgstr "您正在 dncp 中, 伺服器可能不能與您的設定運作."
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:93
-#: ../ldap_wizard/Ldap.pm:123 ../ldap_wizard/Ldap.pm:126
-#: ../ldap_wizard/Ldap.pm:130 ../ldap_wizard/Ldap.pm:145
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:165
-#: ../ldap_wizard/Ldap.pm:169 ../ldap_wizard/Ldap.pm:173
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:88
+#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:148
+#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:176
+#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:201
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "錯誤"
 
@@ -515,7 +516,7 @@ msgid "Domainname:"
 msgstr "網域名稱:"
 
 #: ../dns_wizard/Bind.pm:246
-msgid "The wizard successfully added host in your DNS."
+msgid "The wizard successfully added the host in your DNS."
 msgstr "精靈成功地加入主機於您的 DNS."
 
 #: ../dns_wizard/Bind.pm:256
@@ -880,7 +881,7 @@ msgstr ""
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:140
+#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:167
 msgid "Password:"
 msgstr "密碼:"
 
@@ -925,194 +926,235 @@ msgstr "正在設定您的 Samba 伺服器..."
 msgid "Configuring Kolab server on your system..."
 msgstr "正在設定您的 Samba 伺服器..."
 
-#: ../ldap_wizard/Ldap.pm:26
-#, fuzzy
-msgid "Configure OpenLDAP Server "
-msgstr "正在設定 DHCP 伺服器"
+#: ../ldap_wizard/Ldap.pm:27
+msgid "Ldap wizard"
+msgstr "Ldap 精靈"
 
-#: ../ldap_wizard/Ldap.pm:80
+#: ../ldap_wizard/Ldap.pm:85
 #, fuzzy
-msgid "Configure OpenLDAP server"
-msgstr "正在設定 DHCP 伺服器"
+msgid "Show Ldap configuration"
+msgstr "LDAP 組態設定精靈"
 
-#: ../ldap_wizard/Ldap.pm:81
-msgid "Add user in OpenLDAP server"
+#: ../ldap_wizard/Ldap.pm:86
+msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:87
 #, fuzzy
-msgid "OpenLDAP configuration wizard"
+msgid "Delete Ldap configuration"
 msgstr "LDAP 組態設定精靈"
 
-#: ../ldap_wizard/Ldap.pm:86
+#: ../ldap_wizard/Ldap.pm:92
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92 ../ldap_wizard/Ldap.pm:102
 #, fuzzy
-msgid "Setup an OpenLDAP server."
-msgstr "設定 PXE 伺服器."
+msgid "Ldap configuration wizard"
+msgstr "LDAP 組態設定精靈"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:119
 #, fuzzy
-msgid "You must setup an OpenLDAP server first."
+msgid "You must setup an Ldap server first."
 msgstr "設定 PXE 伺服器."
 
-#: ../ldap_wizard/Ldap.pm:104
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:132
 #, fuzzy
-msgid "Save an existing configuration"
-msgstr "於存在的 dns 組態設定中移除一個主機."
+msgid "Delete configuration"
+msgstr "安裝伺服器組態設定"
+
+#: ../ldap_wizard/Ldap.pm:132
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:137
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:115
+#: ../ldap_wizard/Ldap.pm:140
 #, fuzzy
 msgid "User Created in: "
 msgstr "增加使用者"
 
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:142
 msgid "First Name:"
 msgstr "名子:"
 
-#: ../ldap_wizard/Ldap.pm:118 ../ldap_wizard/Ldap.pm:183
+#: ../ldap_wizard/Ldap.pm:143 ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Name:"
 msgstr "使用者名稱:"
 
-#: ../ldap_wizard/Ldap.pm:119 ../ldap_wizard/Ldap.pm:185
-msgid "User Name:"
-msgstr "使用者名稱:"
+#: ../ldap_wizard/Ldap.pm:144
+#, fuzzy
+msgid "User Login:"
+msgstr "增加使用者"
 
-#: ../ldap_wizard/Ldap.pm:123
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:130
+#: ../ldap_wizard/Ldap.pm:156
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:138
+#: ../ldap_wizard/Ldap.pm:164
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "密碼"
 
-#: ../ldap_wizard/Ldap.pm:140 ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:168
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:168
 #, fuzzy
 msgid "Password (again):"
 msgstr "密碼:"
 
-#: ../ldap_wizard/Ldap.pm:145 ../ldap_wizard/Ldap.pm:169
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:201
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:149 ../ldap_wizard/Ldap.pm:173
+#: ../ldap_wizard/Ldap.pm:176 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "密碼不符合"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "Adrministrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:183
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "正在設定 Samba 中"
 
-#: ../ldap_wizard/Ldap.pm:158
-msgid ""
-"LDAP Suffix:\n"
-" ex: dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "Domain name: "
+msgstr "網域名稱:"
+
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:183
+msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:159
-msgid ""
-"LDAP Administrator:\n"
-" ex: cn=admin,dc=example,dc=com\n"
+#: ../ldap_wizard/Ldap.pm:183
+#, fuzzy
+msgid "LDAP directory tree"
+msgstr "TFTP 目錄:"
+
+#: ../ldap_wizard/Ldap.pm:183
+msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:160
+#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:228
+#: ../ldap_wizard/Ldap.pm:274
+#, fuzzy
+msgid "LDAP directory tree:"
+msgstr "TFTP 目錄:"
+
+#: ../ldap_wizard/Ldap.pm:187 ../ldap_wizard/Ldap.pm:229
+#: ../ldap_wizard/Ldap.pm:275
+msgid "LDAP Administrator:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:188
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "密碼:"
 
-#: ../ldap_wizard/Ldap.pm:161
+#: ../ldap_wizard/Ldap.pm:189
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "密碼:"
 
-#: ../ldap_wizard/Ldap.pm:165
-msgid "You must enter a suffix for LDAP."
+#: ../ldap_wizard/Ldap.pm:192
+msgid "Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
+#: ../ldap_wizard/Ldap.pm:197
+#, fuzzy
+msgid "You must enter a valid LDAP directory tree."
+msgstr "TFTP 目錄:"
+
+#: ../ldap_wizard/Ldap.pm:213
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
+#: ../ldap_wizard/Ldap.pm:217
 #, fuzzy
 msgid "First name:"
 msgstr "名子:"
 
-#: ../ldap_wizard/Ldap.pm:186
+#: ../ldap_wizard/Ldap.pm:218
+msgid "User Name:"
+msgstr "使用者名稱:"
+
+#: ../ldap_wizard/Ldap.pm:219
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:192
+#: ../ldap_wizard/Ldap.pm:225
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "正在設定 DHCP 伺服器"
 
-#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:222
-msgid "Organisation LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:195 ../ldap_wizard/Ldap.pm:223
-msgid "Administrator LDAP:"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:224
+#: ../ldap_wizard/Ldap.pm:230 ../ldap_wizard/Ldap.pm:276
 #, fuzzy
 msgid "Users Container:"
 msgstr "增加使用者"
 
-#: ../ldap_wizard/Ldap.pm:204
+#: ../ldap_wizard/Ldap.pm:239
 msgid "The wizard successfully configured the LDAP."
 msgstr "精靈成功地設定 LDAP."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:246
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:211
-#, fuzzy
-msgid "The wizard successfully added a user in LDAP"
-msgstr "精靈成功地增加 LDAP 條目."
+#: ../ldap_wizard/Ldap.pm:256
+msgid "Error when adding user in Ldap datase"
+msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:217
+#: ../ldap_wizard/Ldap.pm:269
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:221
-msgid "You have already configured your OpenLDAP Server with drakwizard\n"
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:269
+#, fuzzy
+msgid "You have already configured your Ldap Server"
+msgstr "這精靈成功設定您的 Samba 伺服器."
 
-#: ../ldap_wizard/Ldap.pm:351
+#: ../ldap_wizard/Ldap.pm:405
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "失敗"
 
-#: ../ldap_wizard/Ldap.pm:351 ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/Ldap.pm:405 ../ldap_wizard/ldapdef.pm:21
 #, fuzzy
 msgid "Error!"
 msgstr "錯誤"
 
-#: ../ldap_wizard/ldapdef.pm:22
+#: ../ldap_wizard/ldapdef.pm:21
 #, perl-format
 msgid "Unable to connect to %s"
 msgstr ""
@@ -1858,7 +1900,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
-"PXE description is used to explain the role of the boot image, ie: "
+"PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 
@@ -1980,7 +2022,7 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Ramsize: adjust the ramsize parameter on boot disk."
+msgid "Ramsize: adjust the ramsize parameter on boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2572,6 +2614,38 @@ msgstr "Apache 伺服器"
 msgid "Configuring your system as Apache server ..."
 msgstr "正在設定您的系統成為 Apache 伺服器 ..."
 
+#, fuzzy
+#~ msgid "Configure Ldap server"
+#~ msgstr "正在設定 DHCP 伺服器"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP Server "
+#~ msgstr "正在設定 DHCP 伺服器"
+
+#, fuzzy
+#~ msgid "Configure OpenLDAP server"
+#~ msgstr "正在設定 DHCP 伺服器"
+
+#, fuzzy
+#~ msgid "OpenLDAP configuration wizard"
+#~ msgstr "LDAP 組態設定精靈"
+
+#, fuzzy
+#~ msgid "Setup an OpenLDAP server."
+#~ msgstr "設定 PXE 伺服器."
+
+#, fuzzy
+#~ msgid "You must setup an OpenLDAP server first."
+#~ msgstr "設定 PXE 伺服器."
+
+#, fuzzy
+#~ msgid "Save an existing configuration"
+#~ msgstr "於存在的 dns 組態設定中移除一個主機."
+
+#, fuzzy
+#~ msgid "The wizard successfully added a user in LDAP"
+#~ msgstr "精靈成功地增加 LDAP 條目."
+
 #~ msgid "Server - Set configuration of LDAP server"
 #~ msgstr "伺服器 - 設定 LDAP 伺服器組態"