s3: Rerun genmsg after adding more strings.

Signed-off-by: Bo Yang <boyang@samba.org>

20 files changed, 8390 insertions, 799 deletions

diff --git a/source3/locale/pam_winbind/ar.po b/source3/locale/pam_winbind/ar.po
index 43e8a8720da..6ed0ac1844e 100644
--- a/source3/locale/pam_winbind/ar.po
+++ b/source3/locale/pam_winbind/ar.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_winbind\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-16 15:30+0800\n"
+"POT-Creation-Date: 2010-03-06 01:55+0800\n"
 "PO-Revision-Date: 2009-02-06 08:04\n"
 "Last-Translator: Novell Language <language@novell.com>\n"
 "Language-Team: Novell Language <language@novell.com>\n"
@@ -13,141 +13,546 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../../nsswitch/pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:583 ../../libsmb/nterr.c:558
 msgid "Success"
 msgstr "نجاح"
 
-#: ../../../nsswitch/pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:585
 msgid "No primary Domain Controler available"
 msgstr "جهاز التحكم في المجال الرئيسي غير متوفر"
 
-#: ../../../nsswitch/pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:587
 msgid "No domain controllers found"
 msgstr "لم يتم العثور على أجهزة تحكم في المجال"
 
-#: ../../../nsswitch/pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:589 ../../libsmb/nterr.c:566
 msgid "No logon servers"
 msgstr "لا توجد خوادم تسجيل الدخول"
 
-#: ../../../nsswitch/pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:591
 msgid "Password too short"
 msgstr "كلمة السر قصيرة جدًا"
 
-#: ../../../nsswitch/pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:593
 msgid "The password of this user is too recent to change"
 msgstr "كلمة سر هذا المستخدم حديثة جدًا على التغيير"
 
-#: ../../../nsswitch/pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:595
 msgid "Password is already in password history"
 msgstr "كلمة السر موجودة بالفعل في سجل كلمات السر"
 
-#: ../../../nsswitch/pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:597
 msgid "Your password has expired"
 msgstr "انتهت صلاحية كلمة السر الخاصة بك"
 
-#: ../../../nsswitch/pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:599
 msgid "You need to change your password now"
 msgstr "يلزم تغيير كلمة السر الآن"
 
-#: ../../../nsswitch/pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:601
 msgid "You are not allowed to logon from this workstation"
 msgstr "غير مسموح لك بتسجيل الدخول من محطة العمل هذه"
 
-#: ../../../nsswitch/pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:603
 msgid "You are not allowed to logon at this time"
 msgstr "غير مسموح لك بتسجيل الدخول في هذا الوقت"
 
-#: ../../../nsswitch/pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:605
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "انتهت صلاحية حسابك. الرجاء الاتصال بمسؤول النظام"
 
-#: ../../../nsswitch/pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:608
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "تم تعطيل حسابك. الرجاء الاتصال بمسؤول النظام"
 
-#: ../../../nsswitch/pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:611
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "تم قفل حسابك. الرجاء الاتصال بمسؤول النظام"
 
-#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:614 ../../../nsswitch/pam_winbind.c:616 ../../../nsswitch/pam_winbind.c:618
 msgid "Invalid Trust Account"
 msgstr "حساب ثقة غير صالح"
 
-#: ../../../nsswitch/pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:620
 msgid "Access is denied"
 msgstr "الوصول مرفوض"
 
-#: ../../../nsswitch/pam_winbind.c:592
-msgid "Your password expires today"
+#: ../../../nsswitch/pam_winbind.c:818
+#, fuzzy
+msgid "Do you want to change your password now?"
+msgstr "يلزم تغيير كلمة السر الآن"
+
+#: ../../../nsswitch/pam_winbind.c:902
+#, fuzzy
+msgid "Your password expires today.\n"
 msgstr "انتهت صلاحية كلمة السر الخاصة بك اليوم"
 
-#: ../../../nsswitch/pam_winbind.c:597
-#, c-format
-msgid "Your password will expire in %d %s"
+#: ../../../nsswitch/pam_winbind.c:932
+#, fuzzy, c-format
+msgid "Your password will expire in %d %s.\n"
 msgstr "ستنتهي صلاحية كلمة السر الخاصة بك خلال %d %s"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "days"
 msgstr "أيام"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "day"
 msgstr "اليوم"
 
-#: ../../../nsswitch/pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:1169 ../../../nsswitch/pam_winbind.c:1193
+#, c-format
+msgid "Cannot convert group %s to sid, please contact your administrator to see if group %s is valid."
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1387
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "تسجيل الدخول في فترة السماح. الرجاء تغيير كلمة السر الخاصة بك عند الاتصال بالإنترنت مرة أخرى."
 
-#: ../../../nsswitch/pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:1397
 msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable"
 msgstr "تعذر الوصول إلى جهاز التحكم في المجال، قم باستخدام بيانات تعريف مؤقتة بدلاً من ذلك. ربما لا تتوفر مصادر الشبكة"
 
-#: ../../../nsswitch/pam_winbind.c:950
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1422
+msgid ""
+"Failed to establish your Kerberos Ticket cache due time differences\n"
+"with the domain controller.  Please verify the system time.\n"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1490
 msgid "Your password "
 msgstr "كلمة السر الخاصة بك "
 
-#: ../../../nsswitch/pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:1497
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "يجب أن تكون %d من الأحرف على الأقل؛ "
 
-#: ../../../nsswitch/pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:1506
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "لا يمكنك تكرار أي من كلمات السر %dالسابقة الخاصة بك؛"
 
-#: ../../../nsswitch/pam_winbind.c:977
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1516
 msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; "
 msgstr "يجب أن تحتوي على حروف كبيرة أو أرقام أو علامات ترقيم؛ وألا تحتوي على اسم الحساب الخاص بك أو الاسم الكامل؛"
 
-#: ../../../nsswitch/pam_winbind.c:986
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1526
 msgid "Please type a different password. Type a password which meets these requirements in both text boxes."
 msgstr "الرجاء كتابة كلمة سر مختلفة. قم بكتابة كلمة سر تتوافق مع هذه المتطلبات الموجودة في مربعي النص."
 
-#: ../../../nsswitch/pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1553
+#, c-format
+msgid "Creating directory: %s failed: %s"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2018
 msgid "Password does not meet complexity requirements"
 msgstr "كلمة السر لا تتوافق مع المتطلبات المعقدة"
 
-#: ../../../nsswitch/pam_winbind.c:1564
+#.
+#. * First get the name of a user
+#.
+#: ../../../nsswitch/pam_winbind.c:2489 ../../../nsswitch/pam_winbind.c:3035
+msgid "Username: "
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2665
 msgid "Password: "
 msgstr "كلمة السر: "
 
-#: ../../../nsswitch/pam_winbind.c:2013
+#. instruct user what is happening
+#: ../../../nsswitch/pam_winbind.c:3073
 msgid "Changing password for"
 msgstr "تغيير كلمة السر لـ"
 
-#: ../../../nsswitch/pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:3086
 msgid "(current) NT password: "
 msgstr "كلمة سر NT (الحالية) "
 
-#: ../../../nsswitch/pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:3156
 msgid "Enter new NT password: "
 msgstr "إدخال كلمة سر NT: "
 
-#: ../../../nsswitch/pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:3157
 msgid "Retype new NT password: "
 msgstr "إعادة كتابة كلمة سر NT الجديدة: "
 
+#.
+#. * here is the string to inform the user that the new passwords they
+#. * typed were not the same.
+#.
+#: ../../../nsswitch/pam_winbind.h:128
+msgid "Sorry, passwords do not match"
+msgstr ""
+
+#: ../../libsmb/nterr.c:559
+msgid "Undetermined error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:560
+#, fuzzy
+msgid "Access denied"
+msgstr "الوصول مرفوض"
+
+#: ../../libsmb/nterr.c:561
+msgid "Account locked out"
+msgstr ""
+
+#: ../../libsmb/nterr.c:562
+#, fuzzy
+msgid "Must change password"
+msgstr "يلزم تغيير كلمة السر الآن"
+
+#: ../../libsmb/nterr.c:563
+#, fuzzy
+msgid "Password is too short"
+msgstr "كلمة السر قصيرة جدًا"
+
+#: ../../libsmb/nterr.c:564
+#, fuzzy
+msgid "Password is too recent"
+msgstr "كلمة السر قصيرة جدًا"
+
+#: ../../libsmb/nterr.c:565
+#, fuzzy
+msgid "Password history conflict"
+msgstr "كلمة السر قصيرة جدًا"
+
+#: ../../libsmb/nterr.c:567
+msgid "Improperly formed account name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:568
+msgid "User exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:569
+msgid "No such user"
+msgstr ""
+
+#: ../../libsmb/nterr.c:570
+msgid "Group exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:571
+msgid "No such group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:572
+msgid "Member not in group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:573
+#, fuzzy
+msgid "Wrong Password"
+msgstr "كلمة السر: "
+
+#: ../../libsmb/nterr.c:574
+#, fuzzy
+msgid "Ill formed password"
+msgstr "كلمة السر الخاصة بك "
+
+#: ../../libsmb/nterr.c:575
+#, fuzzy
+msgid "Password restriction"
+msgstr "كلمة السر قصيرة جدًا"
+
+#: ../../libsmb/nterr.c:576
+msgid "Logon failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:577
+msgid "Account restriction"
+msgstr ""
+
+#: ../../libsmb/nterr.c:578
+msgid "Invalid logon hours"
+msgstr ""
+
+#: ../../libsmb/nterr.c:579
+#, fuzzy
+msgid "Invalid workstation"
+msgstr "حساب ثقة غير صالح"
+
+#: ../../libsmb/nterr.c:580
+#, fuzzy
+msgid "Password expired"
+msgstr "انتهت صلاحية كلمة السر الخاصة بك"
+
+#: ../../libsmb/nterr.c:581
+msgid "Account disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:582
+msgid "Memory allocation error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:583
+#, fuzzy
+msgid "No domain controllers located"
+msgstr "لم يتم العثور على أجهزة تحكم في المجال"
+
+#: ../../libsmb/nterr.c:584
+msgid "Named pipe not available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:585
+msgid "Not implemented"
+msgstr ""
+
+#: ../../libsmb/nterr.c:586
+msgid "Invalid information class"
+msgstr ""
+
+#: ../../libsmb/nterr.c:587
+msgid "Information length mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:588
+msgid "Access violation"
+msgstr ""
+
+#: ../../libsmb/nterr.c:589
+msgid "Invalid handle"
+msgstr ""
+
+#: ../../libsmb/nterr.c:590
+msgid "Invalid parameter"
+msgstr ""
+
+#: ../../libsmb/nterr.c:591
+msgid "No memory"
+msgstr ""
+
+#: ../../libsmb/nterr.c:592
+msgid "Buffer too small"
+msgstr ""
+
+#: ../../libsmb/nterr.c:593
+msgid "Revision mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:594
+#, fuzzy
+msgid "No such logon session"
+msgstr "لا توجد خوادم تسجيل الدخول"
+
+#: ../../libsmb/nterr.c:595
+msgid "No such privilege"
+msgstr ""
+
+#: ../../libsmb/nterr.c:596
+msgid "Procedure not found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:597
+msgid "Server disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:598
+msgid "Invalid pipe state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:599
+msgid "Named pipe busy"
+msgstr ""
+
+#: ../../libsmb/nterr.c:600
+msgid "Illegal function"
+msgstr ""
+
+#: ../../libsmb/nterr.c:601
+msgid "Named pipe dicconnected"
+msgstr ""
+
+#: ../../libsmb/nterr.c:602
+msgid "Named pipe closing"
+msgstr ""
+
+#: ../../libsmb/nterr.c:603
+msgid "Remote host not listening"
+msgstr ""
+
+#: ../../libsmb/nterr.c:604
+msgid "Duplicate name on network"
+msgstr ""
+
+#: ../../libsmb/nterr.c:605
+msgid "Print queue is full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:606
+#, fuzzy
+msgid "No print spool space available"
+msgstr "جهاز التحكم في المجال الرئيسي غير متوفر"
+
+#: ../../libsmb/nterr.c:607
+msgid "The network name cannot be found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:608
+msgid "The connection was refused"
+msgstr ""
+
+#: ../../libsmb/nterr.c:609
+msgid "Too many names"
+msgstr ""
+
+#: ../../libsmb/nterr.c:610
+msgid "Too many sessions"
+msgstr ""
+
+#: ../../libsmb/nterr.c:611
+msgid "Invalid server state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:612
+msgid "Invalid domain state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:613
+msgid "Invalid domain role"
+msgstr ""
+
+#: ../../libsmb/nterr.c:614
+msgid "No such domain"
+msgstr ""
+
+#: ../../libsmb/nterr.c:615
+msgid "Domain exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:616
+msgid "Domain limit exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:617
+msgid "Bad logon session state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:618
+msgid "Logon session collision"
+msgstr ""
+
+#: ../../libsmb/nterr.c:619
+msgid "Invalid logon type"
+msgstr ""
+
+#: ../../libsmb/nterr.c:620
+msgid "Cancelled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:621
+msgid "Invalid computer name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:622
+msgid "Logon server conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:623
+msgid "Time difference at domain controller"
+msgstr ""
+
+#: ../../libsmb/nterr.c:624
+msgid "Pipe broken"
+msgstr ""
+
+#: ../../libsmb/nterr.c:625
+msgid "Registry corrupt"
+msgstr ""
+
+#: ../../libsmb/nterr.c:626
+msgid "Too many secrets"
+msgstr ""
+
+#: ../../libsmb/nterr.c:627
+msgid "Too many SIDs"
+msgstr ""
+
+#: ../../libsmb/nterr.c:628
+msgid "Lanmanager cross encryption required"
+msgstr ""
+
+#: ../../libsmb/nterr.c:629
+msgid "Log file full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:630
+msgid "No trusted LSA secret"
+msgstr ""
+
+#: ../../libsmb/nterr.c:631
+#, fuzzy
+msgid "No trusted SAM account"
+msgstr "حساب ثقة غير صالح"
+
+#: ../../libsmb/nterr.c:632
+msgid "Trusted domain failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:633
+msgid "Trust relationship failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:634
+msgid "Trust failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:635
+msgid "Netlogon service not started"
+msgstr ""
+
+#: ../../libsmb/nterr.c:636
+msgid "Account expired"
+msgstr ""
+
+#: ../../libsmb/nterr.c:637
+msgid "Network credential conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:638
+msgid "Remote session limit"
+msgstr ""
+
+#: ../../libsmb/nterr.c:639
+msgid "No logon interdomain trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:640
+msgid "No logon workstation trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:641
+#, fuzzy
+msgid "No logon server trust account"
+msgstr "لا توجد خوادم تسجيل الدخول"
+
+#: ../../libsmb/nterr.c:642
+msgid "Domain trust inconsistent"
+msgstr ""
+
+#: ../../libsmb/nterr.c:643
+msgid "No user session key available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:644
+msgid "User session deleted"
+msgstr ""
+
+#: ../../libsmb/nterr.c:645
+msgid "Insufficient server resources"
+msgstr ""
+
+#: ../../libsmb/nterr.c:646
+msgid "Insufficient logon information"
+msgstr ""
+
+#: ../../libsmb/nterr.c:648
+msgid "License quota exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:649
+msgid "No more files"
+msgstr ""
diff --git a/source3/locale/pam_winbind/cs.po b/source3/locale/pam_winbind/cs.po
index d927ceb248a..8c15431c2df 100644
--- a/source3/locale/pam_winbind/cs.po
+++ b/source3/locale/pam_winbind/cs.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_winbind\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-16 15:30+0800\n"
+"POT-Creation-Date: 2010-03-06 01:55+0800\n"
 "PO-Revision-Date: 2009-02-05 14:25\n"
 "Last-Translator: Novell Language <language@novell.com>\n"
 "Language-Team: Novell Language <language@novell.com>\n"
@@ -13,141 +13,546 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../../nsswitch/pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:583 ../../libsmb/nterr.c:558
 msgid "Success"
 msgstr "úspěch"
 
-#: ../../../nsswitch/pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:585
 msgid "No primary Domain Controler available"
 msgstr "Žádný primární doménový kontrolér není dostupný."
 
-#: ../../../nsswitch/pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:587
 msgid "No domain controllers found"
 msgstr "Nenalezeny žádné doménové kontroléry"
 
-#: ../../../nsswitch/pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:589 ../../libsmb/nterr.c:566
 msgid "No logon servers"
 msgstr "Žádné přihlašovací servery"
 
-#: ../../../nsswitch/pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:591
 msgid "Password too short"
 msgstr "Heslo je příliš krátké"
 
-#: ../../../nsswitch/pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:593
 msgid "The password of this user is too recent to change"
 msgstr "Heslo tohoto uživatele nelze změnit, protože je příliš nové"
 
-#: ../../../nsswitch/pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:595
 msgid "Password is already in password history"
 msgstr "Heslo je již v historii hesel"
 
-#: ../../../nsswitch/pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:597
 msgid "Your password has expired"
 msgstr "Vaše heslo vypršelo"
 
-#: ../../../nsswitch/pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:599
 msgid "You need to change your password now"
 msgstr "Je potřeba změnit Vaše heslo"
 
-#: ../../../nsswitch/pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:601
 msgid "You are not allowed to logon from this workstation"
 msgstr "Nemáte práva pro přihlášení z této stanice."
 
-#: ../../../nsswitch/pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:603
 msgid "You are not allowed to logon at this time"
 msgstr "Nyní nemáte povolení k přihlášení."
 
-#: ../../../nsswitch/pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:605
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "Platnost vašeho účtu vypršela. Kontaktujte svého správce systému."
 
-#: ../../../nsswitch/pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:608
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "Váš účet je zablokován. Kontaktujte svého správce systému"
 
-#: ../../../nsswitch/pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:611
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "Váš účet byl uzamčen. Prosím kontaktujte svého správce systému."
 
-#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:614 ../../../nsswitch/pam_winbind.c:616 ../../../nsswitch/pam_winbind.c:618
 msgid "Invalid Trust Account"
 msgstr "Neplatný účet vztahu důvěryhodnosti"
 
-#: ../../../nsswitch/pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:620
 msgid "Access is denied"
 msgstr "Přístup zamítnut"
 
-#: ../../../nsswitch/pam_winbind.c:592
-msgid "Your password expires today"
+#: ../../../nsswitch/pam_winbind.c:818
+#, fuzzy
+msgid "Do you want to change your password now?"
+msgstr "Je potřeba změnit Vaše heslo"
+
+#: ../../../nsswitch/pam_winbind.c:902
+#, fuzzy
+msgid "Your password expires today.\n"
 msgstr "Vaše heslo vyprší dnes."
 
-#: ../../../nsswitch/pam_winbind.c:597
-#, c-format
-msgid "Your password will expire in %d %s"
+#: ../../../nsswitch/pam_winbind.c:932
+#, fuzzy, c-format
+msgid "Your password will expire in %d %s.\n"
 msgstr "Vaše heslo vyprší %d %s"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "days"
 msgstr "Dní"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "day"
 msgstr "Den"
 
-#: ../../../nsswitch/pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:1169 ../../../nsswitch/pam_winbind.c:1193
+#, c-format
+msgid "Cannot convert group %s to sid, please contact your administrator to see if group %s is valid."
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1387
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "Výjimečně přidělený login. Změňte své heslo, jakmile budete znovu online"
 
-#: ../../../nsswitch/pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:1397
 msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable"
 msgstr "Doménový kontrolér je nedostupný, místo toho použity přihlašovací údaje. Síťové zdroje jsou možná nedostupné"
 
-#: ../../../nsswitch/pam_winbind.c:950
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1422
+msgid ""
+"Failed to establish your Kerberos Ticket cache due time differences\n"
+"with the domain controller.  Please verify the system time.\n"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1490
 msgid "Your password "
 msgstr "Vaše heslo:"
 
-#: ../../../nsswitch/pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:1497
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "musí mít nejméně %d znaků;"
 
-#: ../../../nsswitch/pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:1506
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "nelze zopakovat žádné z vašich %d hesel;"
 
-#: ../../../nsswitch/pam_winbind.c:977
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1516
 msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; "
 msgstr "musí obsahovat velká písmena, číslice nebo speciální znaky;nesmí obsahovat název vašeho účtu nebo celé jméno;"
 
-#: ../../../nsswitch/pam_winbind.c:986
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1526
 msgid "Please type a different password. Type a password which meets these requirements in both text boxes."
 msgstr "Prosím napište jiné heslo. Napište heslo, které bude splňovat požadavky uvedené v obou textových rámečcích."
 
-#: ../../../nsswitch/pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1553
+#, c-format
+msgid "Creating directory: %s failed: %s"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2018
 msgid "Password does not meet complexity requirements"
 msgstr "Heslo nesplňuje požadavky na složitost."
 
-#: ../../../nsswitch/pam_winbind.c:1564
+#.
+#. * First get the name of a user
+#.
+#: ../../../nsswitch/pam_winbind.c:2489 ../../../nsswitch/pam_winbind.c:3035
+msgid "Username: "
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2665
 msgid "Password: "
 msgstr "Heslo:"
 
-#: ../../../nsswitch/pam_winbind.c:2013
+#. instruct user what is happening
+#: ../../../nsswitch/pam_winbind.c:3073
 msgid "Changing password for"
 msgstr "Měním heslo pro"
 
-#: ../../../nsswitch/pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:3086
 msgid "(current) NT password: "
 msgstr "NT heslo (aktuální):"
 
-#: ../../../nsswitch/pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:3156
 msgid "Enter new NT password: "
 msgstr "Zadejte nové NT heslo:"
 
-#: ../../../nsswitch/pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:3157
 msgid "Retype new NT password: "
 msgstr "Zopakujte nové NT heslo: "
 
+#.
+#. * here is the string to inform the user that the new passwords they
+#. * typed were not the same.
+#.
+#: ../../../nsswitch/pam_winbind.h:128
+msgid "Sorry, passwords do not match"
+msgstr ""
+
+#: ../../libsmb/nterr.c:559
+msgid "Undetermined error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:560
+#, fuzzy
+msgid "Access denied"
+msgstr "Přístup zamítnut"
+
+#: ../../libsmb/nterr.c:561
+msgid "Account locked out"
+msgstr ""
+
+#: ../../libsmb/nterr.c:562
+#, fuzzy
+msgid "Must change password"
+msgstr "Je potřeba změnit Vaše heslo"
+
+#: ../../libsmb/nterr.c:563
+#, fuzzy
+msgid "Password is too short"
+msgstr "Heslo je příliš krátké"
+
+#: ../../libsmb/nterr.c:564
+#, fuzzy
+msgid "Password is too recent"
+msgstr "Heslo je příliš krátké"
+
+#: ../../libsmb/nterr.c:565
+#, fuzzy
+msgid "Password history conflict"
+msgstr "Heslo je příliš krátké"
+
+#: ../../libsmb/nterr.c:567
+msgid "Improperly formed account name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:568
+msgid "User exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:569
+msgid "No such user"
+msgstr ""
+
+#: ../../libsmb/nterr.c:570
+msgid "Group exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:571
+msgid "No such group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:572
+msgid "Member not in group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:573
+#, fuzzy
+msgid "Wrong Password"
+msgstr "Heslo:"
+
+#: ../../libsmb/nterr.c:574
+#, fuzzy
+msgid "Ill formed password"
+msgstr "Vaše heslo:"
+
+#: ../../libsmb/nterr.c:575
+#, fuzzy
+msgid "Password restriction"
+msgstr "Heslo je příliš krátké"
+
+#: ../../libsmb/nterr.c:576
+msgid "Logon failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:577
+msgid "Account restriction"
+msgstr ""
+
+#: ../../libsmb/nterr.c:578
+msgid "Invalid logon hours"
+msgstr ""
+
+#: ../../libsmb/nterr.c:579
+#, fuzzy
+msgid "Invalid workstation"
+msgstr "Neplatný účet vztahu důvěryhodnosti"
+
+#: ../../libsmb/nterr.c:580
+#, fuzzy
+msgid "Password expired"
+msgstr "Vaše heslo vypršelo"
+
+#: ../../libsmb/nterr.c:581
+msgid "Account disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:582
+msgid "Memory allocation error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:583
+#, fuzzy
+msgid "No domain controllers located"
+msgstr "Nenalezeny žádné doménové kontroléry"
+
+#: ../../libsmb/nterr.c:584
+msgid "Named pipe not available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:585
+msgid "Not implemented"
+msgstr ""
+
+#: ../../libsmb/nterr.c:586
+msgid "Invalid information class"
+msgstr ""
+
+#: ../../libsmb/nterr.c:587
+msgid "Information length mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:588
+msgid "Access violation"
+msgstr ""
+
+#: ../../libsmb/nterr.c:589
+msgid "Invalid handle"
+msgstr ""
+
+#: ../../libsmb/nterr.c:590
+msgid "Invalid parameter"
+msgstr ""
+
+#: ../../libsmb/nterr.c:591
+msgid "No memory"
+msgstr ""
+
+#: ../../libsmb/nterr.c:592
+msgid "Buffer too small"
+msgstr ""
+
+#: ../../libsmb/nterr.c:593
+msgid "Revision mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:594
+#, fuzzy
+msgid "No such logon session"
+msgstr "Žádné přihlašovací servery"
+
+#: ../../libsmb/nterr.c:595
+msgid "No such privilege"
+msgstr ""
+
+#: ../../libsmb/nterr.c:596
+msgid "Procedure not found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:597
+msgid "Server disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:598
+msgid "Invalid pipe state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:599
+msgid "Named pipe busy"
+msgstr ""
+
+#: ../../libsmb/nterr.c:600
+msgid "Illegal function"
+msgstr ""
+
+#: ../../libsmb/nterr.c:601
+msgid "Named pipe dicconnected"
+msgstr ""
+
+#: ../../libsmb/nterr.c:602
+msgid "Named pipe closing"
+msgstr ""
+
+#: ../../libsmb/nterr.c:603
+msgid "Remote host not listening"
+msgstr ""
+
+#: ../../libsmb/nterr.c:604
+msgid "Duplicate name on network"
+msgstr ""
+
+#: ../../libsmb/nterr.c:605
+msgid "Print queue is full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:606
+#, fuzzy
+msgid "No print spool space available"
+msgstr "Žádný primární doménový kontrolér není dostupný."
+
+#: ../../libsmb/nterr.c:607
+msgid "The network name cannot be found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:608
+msgid "The connection was refused"
+msgstr ""
+
+#: ../../libsmb/nterr.c:609
+msgid "Too many names"
+msgstr ""
+
+#: ../../libsmb/nterr.c:610
+msgid "Too many sessions"
+msgstr ""
+
+#: ../../libsmb/nterr.c:611
+msgid "Invalid server state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:612
+msgid "Invalid domain state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:613
+msgid "Invalid domain role"
+msgstr ""
+
+#: ../../libsmb/nterr.c:614
+msgid "No such domain"
+msgstr ""
+
+#: ../../libsmb/nterr.c:615
+msgid "Domain exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:616
+msgid "Domain limit exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:617
+msgid "Bad logon session state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:618
+msgid "Logon session collision"
+msgstr ""
+
+#: ../../libsmb/nterr.c:619
+msgid "Invalid logon type"
+msgstr ""
+
+#: ../../libsmb/nterr.c:620
+msgid "Cancelled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:621
+msgid "Invalid computer name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:622
+msgid "Logon server conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:623
+msgid "Time difference at domain controller"
+msgstr ""
+
+#: ../../libsmb/nterr.c:624
+msgid "Pipe broken"
+msgstr ""
+
+#: ../../libsmb/nterr.c:625
+msgid "Registry corrupt"
+msgstr ""
+
+#: ../../libsmb/nterr.c:626
+msgid "Too many secrets"
+msgstr ""
+
+#: ../../libsmb/nterr.c:627
+msgid "Too many SIDs"
+msgstr ""
+
+#: ../../libsmb/nterr.c:628
+msgid "Lanmanager cross encryption required"
+msgstr ""
+
+#: ../../libsmb/nterr.c:629
+msgid "Log file full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:630
+msgid "No trusted LSA secret"
+msgstr ""
+
+#: ../../libsmb/nterr.c:631
+#, fuzzy
+msgid "No trusted SAM account"
+msgstr "Neplatný účet vztahu důvěryhodnosti"
+
+#: ../../libsmb/nterr.c:632
+msgid "Trusted domain failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:633
+msgid "Trust relationship failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:634
+msgid "Trust failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:635
+msgid "Netlogon service not started"
+msgstr ""
+
+#: ../../libsmb/nterr.c:636
+msgid "Account expired"
+msgstr ""
+
+#: ../../libsmb/nterr.c:637
+msgid "Network credential conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:638
+msgid "Remote session limit"
+msgstr ""
+
+#: ../../libsmb/nterr.c:639
+msgid "No logon interdomain trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:640
+msgid "No logon workstation trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:641
+#, fuzzy
+msgid "No logon server trust account"
+msgstr "Žádné přihlašovací servery"
+
+#: ../../libsmb/nterr.c:642
+msgid "Domain trust inconsistent"
+msgstr ""
+
+#: ../../libsmb/nterr.c:643
+msgid "No user session key available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:644
+msgid "User session deleted"
+msgstr ""
+
+#: ../../libsmb/nterr.c:645
+msgid "Insufficient server resources"
+msgstr ""
+
+#: ../../libsmb/nterr.c:646
+msgid "Insufficient logon information"
+msgstr ""
+
+#: ../../libsmb/nterr.c:648
+msgid "License quota exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:649
+msgid "No more files"
+msgstr ""
diff --git a/source3/locale/pam_winbind/da.po b/source3/locale/pam_winbind/da.po
index dc3fc8a0680..3d8f2b1f4b5 100644
--- a/source3/locale/pam_winbind/da.po
+++ b/source3/locale/pam_winbind/da.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-16 17:11+0800\n"
+"POT-Creation-Date: 2010-03-06 01:55+0800\n"
 "PO-Revision-Date: 2008-11-23 15:44+0100\n"
 "Last-Translator: Martin Schlander <mschlander@opensuse.org>\n"
 "Language-Team: Danish <opensuse-translation@opensuse.org>\n"
@@ -13,97 +13,107 @@ msgstr ""
 "X-Generator: Lokalize 0.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../../nsswitch/pam_winbind.c:533
+#: ../../../nsswitch/pam_winbind.c:583 ../../libsmb/nterr.c:558
 msgid "Success"
 msgstr "Gennemført"
 
-#: ../../../nsswitch/pam_winbind.c:535
+#: ../../../nsswitch/pam_winbind.c:585
 msgid "No primary Domain Controler available"
 msgstr "Ingen primær domæne-controller tilgængelig"
 
-#: ../../../nsswitch/pam_winbind.c:537
+#: ../../../nsswitch/pam_winbind.c:587
 msgid "No domain controllers found"
 msgstr "Ingen domæne-controllere fundet"
 
-#: ../../../nsswitch/pam_winbind.c:539
+#: ../../../nsswitch/pam_winbind.c:589 ../../libsmb/nterr.c:566
 msgid "No logon servers"
 msgstr "Ingen log på-servere"
 
-#: ../../../nsswitch/pam_winbind.c:541
+#: ../../../nsswitch/pam_winbind.c:591
 msgid "Password too short"
 msgstr "For kort adgangskode"
 
-#: ../../../nsswitch/pam_winbind.c:543
+#: ../../../nsswitch/pam_winbind.c:593
 msgid "The password of this user is too recent to change"
 msgstr "Denne brugers adgangskode er for ny til at ændre"
 
-#: ../../../nsswitch/pam_winbind.c:545
+#: ../../../nsswitch/pam_winbind.c:595
 msgid "Password is already in password history"
 msgstr "Adgangskoden er allerede i adgangskode-historikken"
 
-#: ../../../nsswitch/pam_winbind.c:547
+#: ../../../nsswitch/pam_winbind.c:597
 msgid "Your password has expired"
 msgstr "Din adgangskode er udløbet"
 
-#: ../../../nsswitch/pam_winbind.c:549
+#: ../../../nsswitch/pam_winbind.c:599
 msgid "You need to change your password now"
 msgstr "Du skal ændre din adgangskode nu"
 
-#: ../../../nsswitch/pam_winbind.c:551
+#: ../../../nsswitch/pam_winbind.c:601
 msgid "You are not allowed to logon from this workstation"
 msgstr "Du har ikke tilladelse til at logge på fra denne arbejdsstation"
 
-#: ../../../nsswitch/pam_winbind.c:553
+#: ../../../nsswitch/pam_winbind.c:603
 msgid "You are not allowed to logon at this time"
 msgstr "Du har ikke tilladelse til at logge på, på nuværende tidspunkt"
 
-#: ../../../nsswitch/pam_winbind.c:555
+#: ../../../nsswitch/pam_winbind.c:605
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "Din konto er udløbet. Kontakt din systemadministrator"
 
-#: ../../../nsswitch/pam_winbind.c:558
+#: ../../../nsswitch/pam_winbind.c:608
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "Din konto er deaktiveret. Kontakt din systemadministrator"
 
-#: ../../../nsswitch/pam_winbind.c:561
+#: ../../../nsswitch/pam_winbind.c:611
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "Din konto er blevet låst. Kontakt din systemadministrator"
 
-#: ../../../nsswitch/pam_winbind.c:564 ../../../nsswitch/pam_winbind.c:566
-#: ../../../nsswitch/pam_winbind.c:568
+#: ../../../nsswitch/pam_winbind.c:614 ../../../nsswitch/pam_winbind.c:616 ../../../nsswitch/pam_winbind.c:618
 msgid "Invalid Trust Account"
 msgstr "Ugyldig tillidskonto"
 
-#: ../../../nsswitch/pam_winbind.c:570
+#: ../../../nsswitch/pam_winbind.c:620
 msgid "Access is denied"
 msgstr "Adgang nægtet"
 
-#: ../../../nsswitch/pam_winbind.c:845
-msgid "Your password expires today"
+#: ../../../nsswitch/pam_winbind.c:818
+#, fuzzy
+msgid "Do you want to change your password now?"
+msgstr "Du skal ændre din adgangskode nu"
+
+#: ../../../nsswitch/pam_winbind.c:902
+#, fuzzy
+msgid "Your password expires today.\n"
 msgstr "Din adgangskode udløber i dag"
 
-#: ../../../nsswitch/pam_winbind.c:851
-#, c-format
-msgid "Your password will expire in %d %s"
+#: ../../../nsswitch/pam_winbind.c:932
+#, fuzzy, c-format
+msgid "Your password will expire in %d %s.\n"
 msgstr "Din adgangskode udløber om %d %s"
 
-#: ../../../nsswitch/pam_winbind.c:852
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "days"
 msgstr "dage"
 
-#: ../../../nsswitch/pam_winbind.c:852
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "day"
 msgstr "dag"
 
-#: ../../../nsswitch/pam_winbind.c:1193
+#: ../../../nsswitch/pam_winbind.c:1169 ../../../nsswitch/pam_winbind.c:1193
+#, c-format
+msgid "Cannot convert group %s to sid, please contact your administrator to see if group %s is valid."
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1387
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "Nåde-login. Ændr venligst din adgangskode, så snart du er online igen"
 
-#: ../../../nsswitch/pam_winbind.c:1203
+#: ../../../nsswitch/pam_winbind.c:1397
 msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable"
 msgstr "Domæne-controller kan ikke nås, bruger cachede akkreditiver i stedet. Netværksressourcer kan være utilgængelige"
 
-#: ../../../nsswitch/pam_winbind.c:1228
+#: ../../../nsswitch/pam_winbind.c:1422
 msgid ""
 "Failed to establish your Kerberos Ticket cache due time differences\n"
 "with the domain controller.  Please verify the system time.\n"
@@ -111,60 +121,62 @@ msgstr ""
 "Kunne ikke etablere din Kerberos-billet-cache pga. tidsforskelle\n"
 "med domæne-controlleren. Verificér venligst systemtiden.\n"
 
-#: ../../../nsswitch/pam_winbind.c:1258
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1490
 msgid "Your password "
 msgstr "Din adgangskode"
 
-#: ../../../nsswitch/pam_winbind.c:1265
+#: ../../../nsswitch/pam_winbind.c:1497
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "skal have mindst %d tegn;"
 
-#: ../../../nsswitch/pam_winbind.c:1275
+#: ../../../nsswitch/pam_winbind.c:1506
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "kan ikke gentage nogen af dine forrige %d adgangskoder;"
 
-#: ../../../nsswitch/pam_winbind.c:1287
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1516
 msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; "
 msgstr "skal indeholde store bogstaver, tal eller skilletegn og må ikke indholde dit kontonavn eller fulde navn;"
 
-#: ../../../nsswitch/pam_winbind.c:1298
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1526
 msgid "Please type a different password. Type a password which meets these requirements in both text boxes."
 msgstr "Indtast venligst en anden adgangskode. Indtast en adgangskode, som opfylder disse krav, i begge tekstfelter."
 
-#: ../../../nsswitch/pam_winbind.c:1600
+#: ../../../nsswitch/pam_winbind.c:1553
+#, c-format
+msgid "Creating directory: %s failed: %s"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2018
 msgid "Password does not meet complexity requirements"
 msgstr "Adgangskoden opfylder ikke kravene til kompleksitet"
 
-#: ../../../nsswitch/pam_winbind.c:2114
-msgid "Password: "
-msgstr "Adgangskode: "
-
 #.
 #. * First get the name of a user
 #.
-#: ../../../nsswitch/pam_winbind.c:2403 ../../../nsswitch/pam_winbind.c:2552
+#: ../../../nsswitch/pam_winbind.c:2489 ../../../nsswitch/pam_winbind.c:3035
 msgid "Username: "
 msgstr "Brugernavn: "
 
+#: ../../../nsswitch/pam_winbind.c:2665
+msgid "Password: "
+msgstr "Adgangskode: "
+
 #. instruct user what is happening
-#: ../../../nsswitch/pam_winbind.c:2589
+#: ../../../nsswitch/pam_winbind.c:3073
 msgid "Changing password for"
 msgstr "Ændrer adgangskode for"
 
-#: ../../../nsswitch/pam_winbind.c:2604
+#: ../../../nsswitch/pam_winbind.c:3086
 msgid "(current) NT password: "
 msgstr "(nuværende) NT-adgangskode: "
 
-#: ../../../nsswitch/pam_winbind.c:2672
+#: ../../../nsswitch/pam_winbind.c:3156
 msgid "Enter new NT password: "
 msgstr "Indtast ny NT-adgangskode: "
 
-#: ../../../nsswitch/pam_winbind.c:2673
+#: ../../../nsswitch/pam_winbind.c:3157
 msgid "Retype new NT password: "
 msgstr "Indtast ny NT-adgangskode igen: "
 
@@ -172,7 +184,377 @@ msgstr "Indtast ny NT-adgangskode igen: "
 #. * here is the string to inform the user that the new passwords they
 #. * typed were not the same.
 #.
-#: ../../../nsswitch/pam_winbind.h:119
+#: ../../../nsswitch/pam_winbind.h:128
 msgid "Sorry, passwords do not match"
 msgstr "Beklager, adgangskoderne stemmer ikke overens"
 
+#: ../../libsmb/nterr.c:559
+msgid "Undetermined error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:560
+#, fuzzy
+msgid "Access denied"
+msgstr "Adgang nægtet"
+
+#: ../../libsmb/nterr.c:561
+msgid "Account locked out"
+msgstr ""
+
+#: ../../libsmb/nterr.c:562
+#, fuzzy
+msgid "Must change password"
+msgstr "Du skal ændre din adgangskode nu"
+
+#: ../../libsmb/nterr.c:563
+#, fuzzy
+msgid "Password is too short"
+msgstr "For kort adgangskode"
+
+#: ../../libsmb/nterr.c:564
+#, fuzzy
+msgid "Password is too recent"
+msgstr "For kort adgangskode"
+
+#: ../../libsmb/nterr.c:565
+#, fuzzy
+msgid "Password history conflict"
+msgstr "For kort adgangskode"
+
+#: ../../libsmb/nterr.c:567
+msgid "Improperly formed account name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:568
+msgid "User exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:569
+msgid "No such user"
+msgstr ""
+
+#: ../../libsmb/nterr.c:570
+msgid "Group exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:571
+msgid "No such group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:572
+msgid "Member not in group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:573
+#, fuzzy
+msgid "Wrong Password"
+msgstr "Adgangskode: "
+
+#: ../../libsmb/nterr.c:574
+#, fuzzy
+msgid "Ill formed password"
+msgstr "Din adgangskode"
+
+#: ../../libsmb/nterr.c:575
+#, fuzzy
+msgid "Password restriction"
+msgstr "For kort adgangskode"
+
+#: ../../libsmb/nterr.c:576
+msgid "Logon failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:577
+msgid "Account restriction"
+msgstr ""
+
+#: ../../libsmb/nterr.c:578
+msgid "Invalid logon hours"
+msgstr ""
+
+#: ../../libsmb/nterr.c:579
+#, fuzzy
+msgid "Invalid workstation"
+msgstr "Ugyldig tillidskonto"
+
+#: ../../libsmb/nterr.c:580
+#, fuzzy
+msgid "Password expired"
+msgstr "Din adgangskode er udløbet"
+
+#: ../../libsmb/nterr.c:581
+msgid "Account disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:582
+msgid "Memory allocation error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:583
+#, fuzzy
+msgid "No domain controllers located"
+msgstr "Ingen domæne-controllere fundet"
+
+#: ../../libsmb/nterr.c:584
+msgid "Named pipe not available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:585
+msgid "Not implemented"
+msgstr ""
+
+#: ../../libsmb/nterr.c:586
+msgid "Invalid information class"
+msgstr ""
+
+#: ../../libsmb/nterr.c:587
+msgid "Information length mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:588
+msgid "Access violation"
+msgstr ""
+
+#: ../../libsmb/nterr.c:589
+msgid "Invalid handle"
+msgstr ""
+
+#: ../../libsmb/nterr.c:590
+msgid "Invalid parameter"
+msgstr ""
+
+#: ../../libsmb/nterr.c:591
+msgid "No memory"
+msgstr ""
+
+#: ../../libsmb/nterr.c:592
+msgid "Buffer too small"
+msgstr ""
+
+#: ../../libsmb/nterr.c:593
+msgid "Revision mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:594
+#, fuzzy
+msgid "No such logon session"
+msgstr "Ingen log på-servere"
+
+#: ../../libsmb/nterr.c:595
+msgid "No such privilege"
+msgstr ""
+
+#: ../../libsmb/nterr.c:596
+msgid "Procedure not found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:597
+msgid "Server disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:598
+msgid "Invalid pipe state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:599
+msgid "Named pipe busy"
+msgstr ""
+
+#: ../../libsmb/nterr.c:600
+msgid "Illegal function"
+msgstr ""
+
+#: ../../libsmb/nterr.c:601
+msgid "Named pipe dicconnected"
+msgstr ""
+
+#: ../../libsmb/nterr.c:602
+msgid "Named pipe closing"
+msgstr ""
+
+#: ../../libsmb/nterr.c:603
+msgid "Remote host not listening"
+msgstr ""
+
+#: ../../libsmb/nterr.c:604
+msgid "Duplicate name on network"
+msgstr ""
+
+#: ../../libsmb/nterr.c:605
+msgid "Print queue is full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:606
+#, fuzzy
+msgid "No print spool space available"
+msgstr "Ingen primær domæne-controller tilgængelig"
+
+#: ../../libsmb/nterr.c:607
+msgid "The network name cannot be found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:608
+msgid "The connection was refused"
+msgstr ""
+
+#: ../../libsmb/nterr.c:609
+msgid "Too many names"
+msgstr ""
+
+#: ../../libsmb/nterr.c:610
+msgid "Too many sessions"
+msgstr ""
+
+#: ../../libsmb/nterr.c:611
+msgid "Invalid server state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:612
+msgid "Invalid domain state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:613
+msgid "Invalid domain role"
+msgstr ""
+
+#: ../../libsmb/nterr.c:614
+msgid "No such domain"
+msgstr ""
+
+#: ../../libsmb/nterr.c:615
+msgid "Domain exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:616
+msgid "Domain limit exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:617
+msgid "Bad logon session state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:618
+msgid "Logon session collision"
+msgstr ""
+
+#: ../../libsmb/nterr.c:619
+msgid "Invalid logon type"
+msgstr ""
+
+#: ../../libsmb/nterr.c:620
+msgid "Cancelled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:621
+msgid "Invalid computer name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:622
+msgid "Logon server conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:623
+msgid "Time difference at domain controller"
+msgstr ""
+
+#: ../../libsmb/nterr.c:624
+msgid "Pipe broken"
+msgstr ""
+
+#: ../../libsmb/nterr.c:625
+msgid "Registry corrupt"
+msgstr ""
+
+#: ../../libsmb/nterr.c:626
+msgid "Too many secrets"
+msgstr ""
+
+#: ../../libsmb/nterr.c:627
+msgid "Too many SIDs"
+msgstr ""
+
+#: ../../libsmb/nterr.c:628
+msgid "Lanmanager cross encryption required"
+msgstr ""
+
+#: ../../libsmb/nterr.c:629
+msgid "Log file full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:630
+msgid "No trusted LSA secret"
+msgstr ""
+
+#: ../../libsmb/nterr.c:631
+#, fuzzy
+msgid "No trusted SAM account"
+msgstr "Ugyldig tillidskonto"
+
+#: ../../libsmb/nterr.c:632
+msgid "Trusted domain failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:633
+msgid "Trust relationship failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:634
+msgid "Trust failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:635
+msgid "Netlogon service not started"
+msgstr ""
+
+#: ../../libsmb/nterr.c:636
+msgid "Account expired"
+msgstr ""
+
+#: ../../libsmb/nterr.c:637
+msgid "Network credential conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:638
+msgid "Remote session limit"
+msgstr ""
+
+#: ../../libsmb/nterr.c:639
+msgid "No logon interdomain trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:640
+msgid "No logon workstation trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:641
+#, fuzzy
+msgid "No logon server trust account"
+msgstr "Ingen log på-servere"
+
+#: ../../libsmb/nterr.c:642
+msgid "Domain trust inconsistent"
+msgstr ""
+
+#: ../../libsmb/nterr.c:643
+msgid "No user session key available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:644
+msgid "User session deleted"
+msgstr ""
+
+#: ../../libsmb/nterr.c:645
+msgid "Insufficient server resources"
+msgstr ""
+
+#: ../../libsmb/nterr.c:646
+msgid "Insufficient logon information"
+msgstr ""
+
+#: ../../libsmb/nterr.c:648
+msgid "License quota exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:649
+msgid "No more files"
+msgstr ""
diff --git a/source3/locale/pam_winbind/de.po b/source3/locale/pam_winbind/de.po
index 1e7b0bc983a..f2614cb26da 100644
--- a/source3/locale/pam_winbind/de.po
+++ b/source3/locale/pam_winbind/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-17 12:00+0100\n"
+"POT-Creation-Date: 2010-03-06 01:55+0800\n"
 "PO-Revision-Date: 2008-11-13 14:29+0100\n"
 "Last-Translator: Guenther Deschner <gd@samba.org>\n"
 "MIME-Version: 1.0\n"
@@ -15,96 +15,107 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../../nsswitch/pam_winbind.c:579
+#: ../../../nsswitch/pam_winbind.c:583 ../../libsmb/nterr.c:558
 msgid "Success"
 msgstr "Erfolgreich"
 
-#: ../../../nsswitch/pam_winbind.c:581
+#: ../../../nsswitch/pam_winbind.c:585
 msgid "No primary Domain Controler available"
 msgstr "Kein primärer Domänen-Controller verfügbar"
 
-#: ../../../nsswitch/pam_winbind.c:583
+#: ../../../nsswitch/pam_winbind.c:587
 msgid "No domain controllers found"
 msgstr "Keine Domänen-Controller gefunden"
 
-#: ../../../nsswitch/pam_winbind.c:585
+#: ../../../nsswitch/pam_winbind.c:589 ../../libsmb/nterr.c:566
 msgid "No logon servers"
 msgstr "Keine Anmeldeserver verfügbar"
 
-#: ../../../nsswitch/pam_winbind.c:587
+#: ../../../nsswitch/pam_winbind.c:591
 msgid "Password too short"
 msgstr "Passwort ist zu kurz"
 
-#: ../../../nsswitch/pam_winbind.c:589
+#: ../../../nsswitch/pam_winbind.c:593
 msgid "The password of this user is too recent to change"
 msgstr "Das Passwort des Benutzers kann noch nicht erneut geändert werden"
 
-#: ../../../nsswitch/pam_winbind.c:591
+#: ../../../nsswitch/pam_winbind.c:595
 msgid "Password is already in password history"
 msgstr "Das neue Passwort ist bereits in der Passwort-Historie enthalten"
 
-#: ../../../nsswitch/pam_winbind.c:593
+#: ../../../nsswitch/pam_winbind.c:597
 msgid "Your password has expired"
 msgstr "Ihr Passwort ist abgelaufen"
 
-#: ../../../nsswitch/pam_winbind.c:595
+#: ../../../nsswitch/pam_winbind.c:599
 msgid "You need to change your password now"
 msgstr "Sie müssen Ihr Passwort jetzt ändern"
 
-#: ../../../nsswitch/pam_winbind.c:597
+#: ../../../nsswitch/pam_winbind.c:601
 msgid "You are not allowed to logon from this workstation"
 msgstr "Sie können sich nicht von diesem Arbeitsplatz aus anmelden"
 
-#: ../../../nsswitch/pam_winbind.c:599
+#: ../../../nsswitch/pam_winbind.c:603
 msgid "You are not allowed to logon at this time"
 msgstr "Sie können sich zum jetzigen Zeitpunkt nicht anmelden"
 
-#: ../../../nsswitch/pam_winbind.c:601
+#: ../../../nsswitch/pam_winbind.c:605
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "Ihr Benutzerkonto ist abgelaufen. Bitte kontaktieren Sie ihren System-Administrator"
 
-#: ../../../nsswitch/pam_winbind.c:604
+#: ../../../nsswitch/pam_winbind.c:608
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "Ihr Benutzerkonto ist deaktiviert. Bitte kontaktieren Sie ihren System-Administrator"
 
-#: ../../../nsswitch/pam_winbind.c:607
+#: ../../../nsswitch/pam_winbind.c:611
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "Ihr Benutzerkonto wurde gesperrt. Bitte kontaktieren Sie ihren System-Administrator"
 
-#: ../../../nsswitch/pam_winbind.c:610 ../../../nsswitch/pam_winbind.c:612 ../../../nsswitch/pam_winbind.c:614
+#: ../../../nsswitch/pam_winbind.c:614 ../../../nsswitch/pam_winbind.c:616 ../../../nsswitch/pam_winbind.c:618
 msgid "Invalid Trust Account"
 msgstr "Ungültiges Maschinen-Konto"
 
-#: ../../../nsswitch/pam_winbind.c:616
+#: ../../../nsswitch/pam_winbind.c:620
 msgid "Access is denied"
 msgstr "Zugriff verweigert"
 
-#: ../../../nsswitch/pam_winbind.c:854
-msgid "Your password expires today"
+#: ../../../nsswitch/pam_winbind.c:818
+#, fuzzy
+msgid "Do you want to change your password now?"
+msgstr "Sie müssen Ihr Passwort jetzt ändern"
+
+#: ../../../nsswitch/pam_winbind.c:902
+#, fuzzy
+msgid "Your password expires today.\n"
 msgstr "Ihr Passwort läuft heute ab"
 
-#: ../../../nsswitch/pam_winbind.c:860
-#, c-format
-msgid "Your password will expire in %d %s"
+#: ../../../nsswitch/pam_winbind.c:932
+#, fuzzy, c-format
+msgid "Your password will expire in %d %s.\n"
 msgstr "Ihr Passwort wird in %d %s ungültig"
 
-#: ../../../nsswitch/pam_winbind.c:861
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "days"
 msgstr "Tagen"
 
-#: ../../../nsswitch/pam_winbind.c:861
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "day"
 msgstr "Tag"
 
-#: ../../../nsswitch/pam_winbind.c:1253
+#: ../../../nsswitch/pam_winbind.c:1169 ../../../nsswitch/pam_winbind.c:1193
+#, c-format
+msgid "Cannot convert group %s to sid, please contact your administrator to see if group %s is valid."
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1387
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "Kulanzanmeldung. Bitte ändern sie ihr Passwort sobald sie wieder online sind"
 
-#: ../../../nsswitch/pam_winbind.c:1263
+#: ../../../nsswitch/pam_winbind.c:1397
 msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable"
 msgstr "Domänen-Controller unerreichbar. Anmeldung erfolgte mit gespeicherten Anmeldedaten. Netzwerk-Ressourcen können momentan nicht verfügbar sein"
 
-#: ../../../nsswitch/pam_winbind.c:1288
+#: ../../../nsswitch/pam_winbind.c:1422
 msgid ""
 "Failed to establish your Kerberos Ticket cache due time differences\n"
 "with the domain controller.  Please verify the system time.\n"
@@ -112,63 +123,63 @@ msgstr ""
 "Anforderung eines Kerberos-Tickets wegen Zeitunterschied zum \n"
 "Domänen-Controller fehlgeschlagen. Bitte überprüfen Sie die Systemzeit.\n"
 
-#: ../../../nsswitch/pam_winbind.c:1356
+#: ../../../nsswitch/pam_winbind.c:1490
 msgid "Your password "
 msgstr "Ihr Passwort "
 
-#: ../../../nsswitch/pam_winbind.c:1363
+#: ../../../nsswitch/pam_winbind.c:1497
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "muss mindestens %d Zeichen lang sein; "
 
-#: ../../../nsswitch/pam_winbind.c:1372
+#: ../../../nsswitch/pam_winbind.c:1506
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "kann keines der %d vorherigen Passwörter enthalten; "
 
-#: ../../../nsswitch/pam_winbind.c:1382
+#: ../../../nsswitch/pam_winbind.c:1516
 msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; "
 msgstr "muss Großbuchstaben, Ziffern oder Punktzeichen enthalten; kann nicht den Benutzer- oder vollen Namen enthalten; "
 
-#: ../../../nsswitch/pam_winbind.c:1392
+#: ../../../nsswitch/pam_winbind.c:1526
 msgid "Please type a different password. Type a password which meets these requirements in both text boxes."
 msgstr "Bitte wählen Sie ein anderes Passwort. Geben Sie ein geeignetes Passwort in beide Textfelder ein."
 
-#: ../../../nsswitch/pam_winbind.c:1419
+#: ../../../nsswitch/pam_winbind.c:1553
 #, c-format
 msgid "Creating directory: %s failed: %s"
 msgstr "Anlegen des Verzeichnisses: %s fehlgeschlagen: %s"
 
-#: ../../../nsswitch/pam_winbind.c:1877
+#: ../../../nsswitch/pam_winbind.c:2018
 msgid "Password does not meet complexity requirements"
 msgstr "Passwort genügt nicht den Komplexitätsanforderungen"
 
 #.
 #. * First get the name of a user
 #.
-#: ../../../nsswitch/pam_winbind.c:2336 ../../../nsswitch/pam_winbind.c:2883
+#: ../../../nsswitch/pam_winbind.c:2489 ../../../nsswitch/pam_winbind.c:3035
 msgid "Username: "
 msgstr "Benuzername: "
 
-#: ../../../nsswitch/pam_winbind.c:2513
+#: ../../../nsswitch/pam_winbind.c:2665
 msgid "Password: "
 msgstr "Passwort: "
 
 #. instruct user what is happening
-#: ../../../nsswitch/pam_winbind.c:2921
+#: ../../../nsswitch/pam_winbind.c:3073
 #, fuzzy
 msgid "Changing password for"
 msgstr "Ändere Passwort für"
 
-#: ../../../nsswitch/pam_winbind.c:2934
+#: ../../../nsswitch/pam_winbind.c:3086
 msgid "(current) NT password: "
 msgstr "(aktuelles) NT Passwort: "
 
-#: ../../../nsswitch/pam_winbind.c:3004
+#: ../../../nsswitch/pam_winbind.c:3156
 msgid "Enter new NT password: "
 msgstr "Neues NT Passwort eingeben: "
 
-#: ../../../nsswitch/pam_winbind.c:3005
+#: ../../../nsswitch/pam_winbind.c:3157
 msgid "Retype new NT password: "
 msgstr "Neues NT Passwort wiederholen: "
 
@@ -176,6 +187,377 @@ msgstr "Neues NT Passwort wiederholen: "
 #. * here is the string to inform the user that the new passwords they
 #. * typed were not the same.
 #.
-#: ../../../nsswitch/pam_winbind.h:122
+#: ../../../nsswitch/pam_winbind.h:128
 msgid "Sorry, passwords do not match"
 msgstr "Passwörter stimmen leider nicht überein"
+
+#: ../../libsmb/nterr.c:559
+msgid "Undetermined error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:560
+#, fuzzy
+msgid "Access denied"
+msgstr "Zugriff verweigert"
+
+#: ../../libsmb/nterr.c:561
+msgid "Account locked out"
+msgstr ""
+
+#: ../../libsmb/nterr.c:562
+#, fuzzy
+msgid "Must change password"
+msgstr "Sie müssen Ihr Passwort jetzt ändern"
+
+#: ../../libsmb/nterr.c:563
+#, fuzzy
+msgid "Password is too short"
+msgstr "Passwort ist zu kurz"
+
+#: ../../libsmb/nterr.c:564
+#, fuzzy
+msgid "Password is too recent"
+msgstr "Passwort ist zu kurz"
+
+#: ../../libsmb/nterr.c:565
+#, fuzzy
+msgid "Password history conflict"
+msgstr "Passwort ist zu kurz"
+
+#: ../../libsmb/nterr.c:567
+msgid "Improperly formed account name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:568
+msgid "User exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:569
+msgid "No such user"
+msgstr ""
+
+#: ../../libsmb/nterr.c:570
+msgid "Group exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:571
+msgid "No such group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:572
+msgid "Member not in group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:573
+#, fuzzy
+msgid "Wrong Password"
+msgstr "Passwort: "
+
+#: ../../libsmb/nterr.c:574
+#, fuzzy
+msgid "Ill formed password"
+msgstr "Ihr Passwort "
+
+#: ../../libsmb/nterr.c:575
+#, fuzzy
+msgid "Password restriction"
+msgstr "Passwort ist zu kurz"
+
+#: ../../libsmb/nterr.c:576
+msgid "Logon failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:577
+msgid "Account restriction"
+msgstr ""
+
+#: ../../libsmb/nterr.c:578
+msgid "Invalid logon hours"
+msgstr ""
+
+#: ../../libsmb/nterr.c:579
+#, fuzzy
+msgid "Invalid workstation"
+msgstr "Ungültiges Maschinen-Konto"
+
+#: ../../libsmb/nterr.c:580
+#, fuzzy
+msgid "Password expired"
+msgstr "Ihr Passwort ist abgelaufen"
+
+#: ../../libsmb/nterr.c:581
+msgid "Account disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:582
+msgid "Memory allocation error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:583
+#, fuzzy
+msgid "No domain controllers located"
+msgstr "Keine Domänen-Controller gefunden"
+
+#: ../../libsmb/nterr.c:584
+msgid "Named pipe not available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:585
+msgid "Not implemented"
+msgstr ""
+
+#: ../../libsmb/nterr.c:586
+msgid "Invalid information class"
+msgstr ""
+
+#: ../../libsmb/nterr.c:587
+msgid "Information length mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:588
+msgid "Access violation"
+msgstr ""
+
+#: ../../libsmb/nterr.c:589
+msgid "Invalid handle"
+msgstr ""
+
+#: ../../libsmb/nterr.c:590
+msgid "Invalid parameter"
+msgstr ""
+
+#: ../../libsmb/nterr.c:591
+msgid "No memory"
+msgstr ""
+
+#: ../../libsmb/nterr.c:592
+msgid "Buffer too small"
+msgstr ""
+
+#: ../../libsmb/nterr.c:593
+msgid "Revision mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:594
+#, fuzzy
+msgid "No such logon session"
+msgstr "Keine Anmeldeserver verfügbar"
+
+#: ../../libsmb/nterr.c:595
+msgid "No such privilege"
+msgstr ""
+
+#: ../../libsmb/nterr.c:596
+msgid "Procedure not found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:597
+msgid "Server disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:598
+msgid "Invalid pipe state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:599
+msgid "Named pipe busy"
+msgstr ""
+
+#: ../../libsmb/nterr.c:600
+msgid "Illegal function"
+msgstr ""
+
+#: ../../libsmb/nterr.c:601
+msgid "Named pipe dicconnected"
+msgstr ""
+
+#: ../../libsmb/nterr.c:602
+msgid "Named pipe closing"
+msgstr ""
+
+#: ../../libsmb/nterr.c:603
+msgid "Remote host not listening"
+msgstr ""
+
+#: ../../libsmb/nterr.c:604
+msgid "Duplicate name on network"
+msgstr ""
+
+#: ../../libsmb/nterr.c:605
+msgid "Print queue is full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:606
+#, fuzzy
+msgid "No print spool space available"
+msgstr "Kein primärer Domänen-Controller verfügbar"
+
+#: ../../libsmb/nterr.c:607
+msgid "The network name cannot be found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:608
+msgid "The connection was refused"
+msgstr ""
+
+#: ../../libsmb/nterr.c:609
+msgid "Too many names"
+msgstr ""
+
+#: ../../libsmb/nterr.c:610
+msgid "Too many sessions"
+msgstr ""
+
+#: ../../libsmb/nterr.c:611
+msgid "Invalid server state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:612
+msgid "Invalid domain state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:613
+msgid "Invalid domain role"
+msgstr ""
+
+#: ../../libsmb/nterr.c:614
+msgid "No such domain"
+msgstr ""
+
+#: ../../libsmb/nterr.c:615
+msgid "Domain exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:616
+msgid "Domain limit exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:617
+msgid "Bad logon session state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:618
+msgid "Logon session collision"
+msgstr ""
+
+#: ../../libsmb/nterr.c:619
+msgid "Invalid logon type"
+msgstr ""
+
+#: ../../libsmb/nterr.c:620
+msgid "Cancelled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:621
+msgid "Invalid computer name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:622
+msgid "Logon server conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:623
+msgid "Time difference at domain controller"
+msgstr ""
+
+#: ../../libsmb/nterr.c:624
+msgid "Pipe broken"
+msgstr ""
+
+#: ../../libsmb/nterr.c:625
+msgid "Registry corrupt"
+msgstr ""
+
+#: ../../libsmb/nterr.c:626
+msgid "Too many secrets"
+msgstr ""
+
+#: ../../libsmb/nterr.c:627
+msgid "Too many SIDs"
+msgstr ""
+
+#: ../../libsmb/nterr.c:628
+msgid "Lanmanager cross encryption required"
+msgstr ""
+
+#: ../../libsmb/nterr.c:629
+msgid "Log file full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:630
+msgid "No trusted LSA secret"
+msgstr ""
+
+#: ../../libsmb/nterr.c:631
+#, fuzzy
+msgid "No trusted SAM account"
+msgstr "Ungültiges Maschinen-Konto"
+
+#: ../../libsmb/nterr.c:632
+msgid "Trusted domain failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:633
+msgid "Trust relationship failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:634
+msgid "Trust failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:635
+msgid "Netlogon service not started"
+msgstr ""
+
+#: ../../libsmb/nterr.c:636
+msgid "Account expired"
+msgstr ""
+
+#: ../../libsmb/nterr.c:637
+msgid "Network credential conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:638
+msgid "Remote session limit"
+msgstr ""
+
+#: ../../libsmb/nterr.c:639
+msgid "No logon interdomain trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:640
+msgid "No logon workstation trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:641
+#, fuzzy
+msgid "No logon server trust account"
+msgstr "Keine Anmeldeserver verfügbar"
+
+#: ../../libsmb/nterr.c:642
+msgid "Domain trust inconsistent"
+msgstr ""
+
+#: ../../libsmb/nterr.c:643
+msgid "No user session key available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:644
+msgid "User session deleted"
+msgstr ""
+
+#: ../../libsmb/nterr.c:645
+msgid "Insufficient server resources"
+msgstr ""
+
+#: ../../libsmb/nterr.c:646
+msgid "Insufficient logon information"
+msgstr ""
+
+#: ../../libsmb/nterr.c:648
+msgid "License quota exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:649
+msgid "No more files"
+msgstr ""
diff --git a/source3/locale/pam_winbind/es.po b/source3/locale/pam_winbind/es.po
index 9127af500c0..8bc904e6022 100644
--- a/source3/locale/pam_winbind/es.po
+++ b/source3/locale/pam_winbind/es.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_winbind\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-16 15:30+0800\n"
+"POT-Creation-Date: 2010-03-06 01:55+0800\n"
 "PO-Revision-Date: 2009-02-04 14:32\n"
 "Last-Translator: Novell Language <language@novell.com>\n"
 "Language-Team: Novell Language <language@novell.com>\n"
@@ -13,141 +13,546 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../../nsswitch/pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:583 ../../libsmb/nterr.c:558
 msgid "Success"
 msgstr "Correcto"
 
-#: ../../../nsswitch/pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:585
 msgid "No primary Domain Controler available"
 msgstr "No hay un controlador de dominio principal disponible"
 
-#: ../../../nsswitch/pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:587
 msgid "No domain controllers found"
 msgstr "No se han encontrado controladores de dominio"
 
-#: ../../../nsswitch/pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:589 ../../libsmb/nterr.c:566
 msgid "No logon servers"
 msgstr "No hay servidores de inicio de sesión"
 
-#: ../../../nsswitch/pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:591
 msgid "Password too short"
 msgstr "La contraseña es demasiado corta"
 
-#: ../../../nsswitch/pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:593
 msgid "The password of this user is too recent to change"
 msgstr "La contraseña de este usuario es demasiado reciente como para cambiarla"
 
-#: ../../../nsswitch/pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:595
 msgid "Password is already in password history"
 msgstr "La contraseña ya se encuentra en el historial de contraseñas"
 
-#: ../../../nsswitch/pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:597
 msgid "Your password has expired"
 msgstr "Su contraseña ha caducado"
 
-#: ../../../nsswitch/pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:599
 msgid "You need to change your password now"
 msgstr "Debe cambiar su contraseña ahora"
 
-#: ../../../nsswitch/pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:601
 msgid "You are not allowed to logon from this workstation"
 msgstr "No dispone de la autorización necesaria para iniciar sesión desde esta estación de trabajo"
 
-#: ../../../nsswitch/pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:603
 msgid "You are not allowed to logon at this time"
 msgstr "No dispone de la autorización necesaria para iniciar sesión en este momento"
 
-#: ../../../nsswitch/pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:605
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "Su cuenta ha caducado. Póngase en contacto con el administrador del sistema."
 
-#: ../../../nsswitch/pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:608
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "Su cuenta está inhabilitada. Póngase en contacto con el administrador del sistema."
 
-#: ../../../nsswitch/pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:611
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "Su cuenta ha sido bloqueada. Póngase en contacto con el administrador del sistema."
 
-#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:614 ../../../nsswitch/pam_winbind.c:616 ../../../nsswitch/pam_winbind.c:618
 msgid "Invalid Trust Account"
 msgstr "Cuenta de confianza no válida"
 
-#: ../../../nsswitch/pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:620
 msgid "Access is denied"
 msgstr "Acceso denegado"
 
-#: ../../../nsswitch/pam_winbind.c:592
-msgid "Your password expires today"
+#: ../../../nsswitch/pam_winbind.c:818
+#, fuzzy
+msgid "Do you want to change your password now?"
+msgstr "Debe cambiar su contraseña ahora"
+
+#: ../../../nsswitch/pam_winbind.c:902
+#, fuzzy
+msgid "Your password expires today.\n"
 msgstr "La contraseña caduca hoy"
 
-#: ../../../nsswitch/pam_winbind.c:597
-#, c-format
-msgid "Your password will expire in %d %s"
+#: ../../../nsswitch/pam_winbind.c:932
+#, fuzzy, c-format
+msgid "Your password will expire in %d %s.\n"
 msgstr "La contraseña caducará en %d %s"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "days"
 msgstr "días"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "day"
 msgstr "día"
 
-#: ../../../nsswitch/pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:1169 ../../../nsswitch/pam_winbind.c:1193
+#, c-format
+msgid "Cannot convert group %s to sid, please contact your administrator to see if group %s is valid."
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1387
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "Inicio de sesión en periodo de gracia. Cambie su contraseña tan pronto como vuelva a estar en línea."
 
-#: ../../../nsswitch/pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:1397
 msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable"
 msgstr "No se encuentra el controlador de dominio, por lo que se utilizarán las credenciales del caché en su lugar. Es posible que los recursos de red no estén disponibles."
 
-#: ../../../nsswitch/pam_winbind.c:950
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1422
+msgid ""
+"Failed to establish your Kerberos Ticket cache due time differences\n"
+"with the domain controller.  Please verify the system time.\n"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1490
 msgid "Your password "
 msgstr "Su contraseña "
 
-#: ../../../nsswitch/pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:1497
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "debe tener al menos %d caracteres; "
 
-#: ../../../nsswitch/pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:1506
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "no puede repetir ninguna de sus %d contraseñas anteriores; "
 
-#: ../../../nsswitch/pam_winbind.c:977
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1516
 msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; "
 msgstr "debe contener letras en mayúscula, números o signos de puntuación y no puede contener su nombre de cuenta ni su nombre completo; "
 
-#: ../../../nsswitch/pam_winbind.c:986
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1526
 msgid "Please type a different password. Type a password which meets these requirements in both text boxes."
 msgstr "Introduzca una contraseña diferente. Escriba una contraseña que cumpla estos requisitos en ambos campos de texto."
 
-#: ../../../nsswitch/pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1553
+#, c-format
+msgid "Creating directory: %s failed: %s"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2018
 msgid "Password does not meet complexity requirements"
 msgstr "La contraseña no cumple con los requisitos de complejidad solicitados"
 
-#: ../../../nsswitch/pam_winbind.c:1564
+#.
+#. * First get the name of a user
+#.
+#: ../../../nsswitch/pam_winbind.c:2489 ../../../nsswitch/pam_winbind.c:3035
+msgid "Username: "
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2665
 msgid "Password: "
 msgstr "Contraseña:"
 
-#: ../../../nsswitch/pam_winbind.c:2013
+#. instruct user what is happening
+#: ../../../nsswitch/pam_winbind.c:3073
 msgid "Changing password for"
 msgstr "Cambiando la contraseña para"
 
-#: ../../../nsswitch/pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:3086
 msgid "(current) NT password: "
 msgstr "Contraseña de NT (actual): "
 
-#: ../../../nsswitch/pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:3156
 msgid "Enter new NT password: "
 msgstr "Introduzca la nueva contraseña de NT: "
 
-#: ../../../nsswitch/pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:3157
 msgid "Retype new NT password: "
 msgstr "Vuelva a introducir la nueva contraseña de NT: "
 
+#.
+#. * here is the string to inform the user that the new passwords they
+#. * typed were not the same.
+#.
+#: ../../../nsswitch/pam_winbind.h:128
+msgid "Sorry, passwords do not match"
+msgstr ""
+
+#: ../../libsmb/nterr.c:559
+msgid "Undetermined error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:560
+#, fuzzy
+msgid "Access denied"
+msgstr "Acceso denegado"
+
+#: ../../libsmb/nterr.c:561
+msgid "Account locked out"
+msgstr ""
+
+#: ../../libsmb/nterr.c:562
+#, fuzzy
+msgid "Must change password"
+msgstr "Debe cambiar su contraseña ahora"
+
+#: ../../libsmb/nterr.c:563
+#, fuzzy
+msgid "Password is too short"
+msgstr "La contraseña es demasiado corta"
+
+#: ../../libsmb/nterr.c:564
+#, fuzzy
+msgid "Password is too recent"
+msgstr "La contraseña es demasiado corta"
+
+#: ../../libsmb/nterr.c:565
+#, fuzzy
+msgid "Password history conflict"
+msgstr "La contraseña es demasiado corta"
+
+#: ../../libsmb/nterr.c:567
+msgid "Improperly formed account name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:568
+msgid "User exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:569
+msgid "No such user"
+msgstr ""
+
+#: ../../libsmb/nterr.c:570
+msgid "Group exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:571
+msgid "No such group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:572
+msgid "Member not in group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:573
+#, fuzzy
+msgid "Wrong Password"
+msgstr "Contraseña:"
+
+#: ../../libsmb/nterr.c:574
+#, fuzzy
+msgid "Ill formed password"
+msgstr "Su contraseña "
+
+#: ../../libsmb/nterr.c:575
+#, fuzzy
+msgid "Password restriction"
+msgstr "La contraseña es demasiado corta"
+
+#: ../../libsmb/nterr.c:576
+msgid "Logon failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:577
+msgid "Account restriction"
+msgstr ""
+
+#: ../../libsmb/nterr.c:578
+msgid "Invalid logon hours"
+msgstr ""
+
+#: ../../libsmb/nterr.c:579
+#, fuzzy
+msgid "Invalid workstation"
+msgstr "Cuenta de confianza no válida"
+
+#: ../../libsmb/nterr.c:580
+#, fuzzy
+msgid "Password expired"
+msgstr "Su contraseña ha caducado"
+
+#: ../../libsmb/nterr.c:581
+msgid "Account disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:582
+msgid "Memory allocation error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:583
+#, fuzzy
+msgid "No domain controllers located"
+msgstr "No se han encontrado controladores de dominio"
+
+#: ../../libsmb/nterr.c:584
+msgid "Named pipe not available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:585
+msgid "Not implemented"
+msgstr ""
+
+#: ../../libsmb/nterr.c:586
+msgid "Invalid information class"
+msgstr ""
+
+#: ../../libsmb/nterr.c:587
+msgid "Information length mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:588
+msgid "Access violation"
+msgstr ""
+
+#: ../../libsmb/nterr.c:589
+msgid "Invalid handle"
+msgstr ""
+
+#: ../../libsmb/nterr.c:590
+msgid "Invalid parameter"
+msgstr ""
+
+#: ../../libsmb/nterr.c:591
+msgid "No memory"
+msgstr ""
+
+#: ../../libsmb/nterr.c:592
+msgid "Buffer too small"
+msgstr ""
+
+#: ../../libsmb/nterr.c:593
+msgid "Revision mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:594
+#, fuzzy
+msgid "No such logon session"
+msgstr "No hay servidores de inicio de sesión"
+
+#: ../../libsmb/nterr.c:595
+msgid "No such privilege"
+msgstr ""
+
+#: ../../libsmb/nterr.c:596
+msgid "Procedure not found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:597
+msgid "Server disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:598
+msgid "Invalid pipe state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:599
+msgid "Named pipe busy"
+msgstr ""
+
+#: ../../libsmb/nterr.c:600
+msgid "Illegal function"
+msgstr ""
+
+#: ../../libsmb/nterr.c:601
+msgid "Named pipe dicconnected"
+msgstr ""
+
+#: ../../libsmb/nterr.c:602
+msgid "Named pipe closing"
+msgstr ""
+
+#: ../../libsmb/nterr.c:603
+msgid "Remote host not listening"
+msgstr ""
+
+#: ../../libsmb/nterr.c:604
+msgid "Duplicate name on network"
+msgstr ""
+
+#: ../../libsmb/nterr.c:605
+msgid "Print queue is full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:606
+#, fuzzy
+msgid "No print spool space available"
+msgstr "No hay un controlador de dominio principal disponible"
+
+#: ../../libsmb/nterr.c:607
+msgid "The network name cannot be found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:608
+msgid "The connection was refused"
+msgstr ""
+
+#: ../../libsmb/nterr.c:609
+msgid "Too many names"
+msgstr ""
+
+#: ../../libsmb/nterr.c:610
+msgid "Too many sessions"
+msgstr ""
+
+#: ../../libsmb/nterr.c:611
+msgid "Invalid server state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:612
+msgid "Invalid domain state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:613
+msgid "Invalid domain role"
+msgstr ""
+
+#: ../../libsmb/nterr.c:614
+msgid "No such domain"
+msgstr ""
+
+#: ../../libsmb/nterr.c:615
+msgid "Domain exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:616
+msgid "Domain limit exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:617
+msgid "Bad logon session state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:618
+msgid "Logon session collision"
+msgstr ""
+
+#: ../../libsmb/nterr.c:619
+msgid "Invalid logon type"
+msgstr ""
+
+#: ../../libsmb/nterr.c:620
+msgid "Cancelled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:621
+msgid "Invalid computer name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:622
+msgid "Logon server conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:623
+msgid "Time difference at domain controller"
+msgstr ""
+
+#: ../../libsmb/nterr.c:624
+msgid "Pipe broken"
+msgstr ""
+
+#: ../../libsmb/nterr.c:625
+msgid "Registry corrupt"
+msgstr ""
+
+#: ../../libsmb/nterr.c:626
+msgid "Too many secrets"
+msgstr ""
+
+#: ../../libsmb/nterr.c:627
+msgid "Too many SIDs"
+msgstr ""
+
+#: ../../libsmb/nterr.c:628
+msgid "Lanmanager cross encryption required"
+msgstr ""
+
+#: ../../libsmb/nterr.c:629
+msgid "Log file full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:630
+msgid "No trusted LSA secret"
+msgstr ""
+
+#: ../../libsmb/nterr.c:631
+#, fuzzy
+msgid "No trusted SAM account"
+msgstr "Cuenta de confianza no válida"
+
+#: ../../libsmb/nterr.c:632
+msgid "Trusted domain failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:633
+msgid "Trust relationship failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:634
+msgid "Trust failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:635
+msgid "Netlogon service not started"
+msgstr ""
+
+#: ../../libsmb/nterr.c:636
+msgid "Account expired"
+msgstr ""
+
+#: ../../libsmb/nterr.c:637
+msgid "Network credential conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:638
+msgid "Remote session limit"
+msgstr ""
+
+#: ../../libsmb/nterr.c:639
+msgid "No logon interdomain trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:640
+msgid "No logon workstation trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:641
+#, fuzzy
+msgid "No logon server trust account"
+msgstr "No hay servidores de inicio de sesión"
+
+#: ../../libsmb/nterr.c:642
+msgid "Domain trust inconsistent"
+msgstr ""
+
+#: ../../libsmb/nterr.c:643
+msgid "No user session key available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:644
+msgid "User session deleted"
+msgstr ""
+
+#: ../../libsmb/nterr.c:645
+msgid "Insufficient server resources"
+msgstr ""
+
+#: ../../libsmb/nterr.c:646
+msgid "Insufficient logon information"
+msgstr ""
+
+#: ../../libsmb/nterr.c:648
+msgid "License quota exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:649
+msgid "No more files"
+msgstr ""
diff --git a/source3/locale/pam_winbind/fi.po b/source3/locale/pam_winbind/fi.po
index d174183e831..d11bfeb0e27 100644
--- a/source3/locale/pam_winbind/fi.po
+++ b/source3/locale/pam_winbind/fi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_winbind.fi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-16 17:11+0800\n"
+"POT-Creation-Date: 2010-03-06 01:55+0800\n"
 "PO-Revision-Date: 2008-11-23 17:53+0200\n"
 "Last-Translator: Jyri Palokangas <jyri.palokangas@opensuse.org>\n"
 "Language-Team: suomi <fi@li.org>\n"
@@ -16,97 +16,107 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../../../nsswitch/pam_winbind.c:533
+#: ../../../nsswitch/pam_winbind.c:583 ../../libsmb/nterr.c:558
 msgid "Success"
 msgstr "Onnistui"
 
-#: ../../../nsswitch/pam_winbind.c:535
+#: ../../../nsswitch/pam_winbind.c:585
 msgid "No primary Domain Controler available"
 msgstr "Ensisijaista toimialueen ohjainta ei käytettävissä"
 
-#: ../../../nsswitch/pam_winbind.c:537
+#: ../../../nsswitch/pam_winbind.c:587
 msgid "No domain controllers found"
 msgstr "Toimialueen ohjaimia ei löytynyt"
 
-#: ../../../nsswitch/pam_winbind.c:539
+#: ../../../nsswitch/pam_winbind.c:589 ../../libsmb/nterr.c:566
 msgid "No logon servers"
 msgstr "Ei kirjautumispalvelimia"
 
-#: ../../../nsswitch/pam_winbind.c:541
+#: ../../../nsswitch/pam_winbind.c:591
 msgid "Password too short"
 msgstr "Liian lyhyt salasana"
 
-#: ../../../nsswitch/pam_winbind.c:543
+#: ../../../nsswitch/pam_winbind.c:593
 msgid "The password of this user is too recent to change"
 msgstr "Tämän käyttäjän salasana on liian uusi muutettavaksi"
 
-#: ../../../nsswitch/pam_winbind.c:545
+#: ../../../nsswitch/pam_winbind.c:595
 msgid "Password is already in password history"
 msgstr "Salasana löytyy jo salasana historiasta"
 
-#: ../../../nsswitch/pam_winbind.c:547
+#: ../../../nsswitch/pam_winbind.c:597
 msgid "Your password has expired"
 msgstr "Salasanasi on vanhentunut"
 
-#: ../../../nsswitch/pam_winbind.c:549
+#: ../../../nsswitch/pam_winbind.c:599
 msgid "You need to change your password now"
 msgstr "Salasana täytyy vaihtaa nyt"
 
-#: ../../../nsswitch/pam_winbind.c:551
+#: ../../../nsswitch/pam_winbind.c:601
 msgid "You are not allowed to logon from this workstation"
 msgstr "Sinulla ei ole oikeutta kirjautua tältä työasemalta"
 
-#: ../../../nsswitch/pam_winbind.c:553
+#: ../../../nsswitch/pam_winbind.c:603
 msgid "You are not allowed to logon at this time"
 msgstr "Sinulla ei ole oikeutta kirjautua tähän aikaan."
 
-#: ../../../nsswitch/pam_winbind.c:555
+#: ../../../nsswitch/pam_winbind.c:605
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "Tilisi on vanhentunut. Ota yhteyttä järjestelmän ylläpitäjään"
 
-#: ../../../nsswitch/pam_winbind.c:558
+#: ../../../nsswitch/pam_winbind.c:608
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "Tilisi ei ole käytössä. Ota yhteyttä järjestelmän ylläpitäjään"
 
-#: ../../../nsswitch/pam_winbind.c:561
+#: ../../../nsswitch/pam_winbind.c:611
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "Tilisi on lukittu. Ota yhteyttä järjestelmän ylläpitäjään"
 
-#: ../../../nsswitch/pam_winbind.c:564 ../../../nsswitch/pam_winbind.c:566
-#: ../../../nsswitch/pam_winbind.c:568
+#: ../../../nsswitch/pam_winbind.c:614 ../../../nsswitch/pam_winbind.c:616 ../../../nsswitch/pam_winbind.c:618
 msgid "Invalid Trust Account"
 msgstr "Virheellinen luottotili"
 
-#: ../../../nsswitch/pam_winbind.c:570
+#: ../../../nsswitch/pam_winbind.c:620
 msgid "Access is denied"
 msgstr "Pääsy estetty"
 
-#: ../../../nsswitch/pam_winbind.c:845
-msgid "Your password expires today"
+#: ../../../nsswitch/pam_winbind.c:818
+#, fuzzy
+msgid "Do you want to change your password now?"
+msgstr "Salasana täytyy vaihtaa nyt"
+
+#: ../../../nsswitch/pam_winbind.c:902
+#, fuzzy
+msgid "Your password expires today.\n"
 msgstr "Salasanasi vanhenee tänään"
 
-#: ../../../nsswitch/pam_winbind.c:851
-#, c-format
-msgid "Your password will expire in %d %s"
+#: ../../../nsswitch/pam_winbind.c:932
+#, fuzzy, c-format
+msgid "Your password will expire in %d %s.\n"
 msgstr "Salasanasi vanhenee %d %s"
 
-#: ../../../nsswitch/pam_winbind.c:852
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "days"
 msgstr "päivää"
 
-#: ../../../nsswitch/pam_winbind.c:852
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "day"
 msgstr "päivä"
 
-#: ../../../nsswitch/pam_winbind.c:1193
+#: ../../../nsswitch/pam_winbind.c:1169 ../../../nsswitch/pam_winbind.c:1193
+#, c-format
+msgid "Cannot convert group %s to sid, please contact your administrator to see if group %s is valid."
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1387
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "Ok. Mutta vain tämän kerran. Muuta salasana heti kun mahdollista."
 
-#: ../../../nsswitch/pam_winbind.c:1203
+#: ../../../nsswitch/pam_winbind.c:1397
 msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable"
 msgstr "Toimialueen ohjaimeen ei saatu yhteyttä. Käytetään välimuistin tietoja. Verkkopalveluita ei kenties voida käyttää."
 
-#: ../../../nsswitch/pam_winbind.c:1228
+#: ../../../nsswitch/pam_winbind.c:1422
 msgid ""
 "Failed to establish your Kerberos Ticket cache due time differences\n"
 "with the domain controller.  Please verify the system time.\n"
@@ -114,60 +124,62 @@ msgstr ""
 "Kerberos lippuvälimuistin todentaminen epäonnistui johtuen aika eroavaisuuksista\n"
 "toimialueohjaimen kanssa.  Tarkista jäjestelmän aika asetukset.\n"
 
-#: ../../../nsswitch/pam_winbind.c:1258
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1490
 msgid "Your password "
 msgstr "Salasanasi "
 
-#: ../../../nsswitch/pam_winbind.c:1265
+#: ../../../nsswitch/pam_winbind.c:1497
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "täytyy olla vähintään %d merkkiä; "
 
-#: ../../../nsswitch/pam_winbind.c:1275
+#: ../../../nsswitch/pam_winbind.c:1506
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "ei voi toistaa mitään edellisistä %d salasanasta; "
 
-#: ../../../nsswitch/pam_winbind.c:1287
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1516
 msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; "
 msgstr "täytyy sisältää suuraakkosia, numeroita tai välimerkkejä eikä se saa sisältää käyttäjän tilin nimeä tai koko nimeä; "
 
-#: ../../../nsswitch/pam_winbind.c:1298
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1526
 msgid "Please type a different password. Type a password which meets these requirements in both text boxes."
 msgstr "Anna erilainen salasana. Anna molempiin laatikoihin tarpeeksi monimutkainen salasana."
 
-#: ../../../nsswitch/pam_winbind.c:1600
+#: ../../../nsswitch/pam_winbind.c:1553
+#, c-format
+msgid "Creating directory: %s failed: %s"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2018
 msgid "Password does not meet complexity requirements"
 msgstr "Salasana ei ole tarpeeksi monimutkainen."
 
-#: ../../../nsswitch/pam_winbind.c:2114
-msgid "Password: "
-msgstr "Salasana: "
-
 #.
 #. * First get the name of a user
 #.
-#: ../../../nsswitch/pam_winbind.c:2403 ../../../nsswitch/pam_winbind.c:2552
+#: ../../../nsswitch/pam_winbind.c:2489 ../../../nsswitch/pam_winbind.c:3035
 msgid "Username: "
 msgstr "Käyttäjänimi: "
 
+#: ../../../nsswitch/pam_winbind.c:2665
+msgid "Password: "
+msgstr "Salasana: "
+
 #. instruct user what is happening
-#: ../../../nsswitch/pam_winbind.c:2589
+#: ../../../nsswitch/pam_winbind.c:3073
 msgid "Changing password for"
 msgstr "Vaihdetaan salasana käyttäjälle"
 
-#: ../../../nsswitch/pam_winbind.c:2604
+#: ../../../nsswitch/pam_winbind.c:3086
 msgid "(current) NT password: "
 msgstr "(nykyinen) NT-salasana: "
 
-#: ../../../nsswitch/pam_winbind.c:2672
+#: ../../../nsswitch/pam_winbind.c:3156
 msgid "Enter new NT password: "
 msgstr "Anna uusi NT-salasana: "
 
-#: ../../../nsswitch/pam_winbind.c:2673
+#: ../../../nsswitch/pam_winbind.c:3157
 msgid "Retype new NT password: "
 msgstr "Anna uusi NT-salasana uudestaan: "
 
@@ -175,7 +187,377 @@ msgstr "Anna uusi NT-salasana uudestaan: "
 #. * here is the string to inform the user that the new passwords they
 #. * typed were not the same.
 #.
-#: ../../../nsswitch/pam_winbind.h:119
+#: ../../../nsswitch/pam_winbind.h:128
 msgid "Sorry, passwords do not match"
 msgstr "Salasanat eivät täsmää"
 
+#: ../../libsmb/nterr.c:559
+msgid "Undetermined error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:560
+#, fuzzy
+msgid "Access denied"
+msgstr "Pääsy estetty"
+
+#: ../../libsmb/nterr.c:561
+msgid "Account locked out"
+msgstr ""
+
+#: ../../libsmb/nterr.c:562
+#, fuzzy
+msgid "Must change password"
+msgstr "Salasana täytyy vaihtaa nyt"
+
+#: ../../libsmb/nterr.c:563
+#, fuzzy
+msgid "Password is too short"
+msgstr "Liian lyhyt salasana"
+
+#: ../../libsmb/nterr.c:564
+#, fuzzy
+msgid "Password is too recent"
+msgstr "Liian lyhyt salasana"
+
+#: ../../libsmb/nterr.c:565
+#, fuzzy
+msgid "Password history conflict"
+msgstr "Liian lyhyt salasana"
+
+#: ../../libsmb/nterr.c:567
+msgid "Improperly formed account name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:568
+msgid "User exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:569
+msgid "No such user"
+msgstr ""
+
+#: ../../libsmb/nterr.c:570
+msgid "Group exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:571
+msgid "No such group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:572
+msgid "Member not in group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:573
+#, fuzzy
+msgid "Wrong Password"
+msgstr "Salasana: "
+
+#: ../../libsmb/nterr.c:574
+#, fuzzy
+msgid "Ill formed password"
+msgstr "Salasanasi "
+
+#: ../../libsmb/nterr.c:575
+#, fuzzy
+msgid "Password restriction"
+msgstr "Liian lyhyt salasana"
+
+#: ../../libsmb/nterr.c:576
+msgid "Logon failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:577
+msgid "Account restriction"
+msgstr ""
+
+#: ../../libsmb/nterr.c:578
+msgid "Invalid logon hours"
+msgstr ""
+
+#: ../../libsmb/nterr.c:579
+#, fuzzy
+msgid "Invalid workstation"
+msgstr "Virheellinen luottotili"
+
+#: ../../libsmb/nterr.c:580
+#, fuzzy
+msgid "Password expired"
+msgstr "Salasanasi on vanhentunut"
+
+#: ../../libsmb/nterr.c:581
+msgid "Account disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:582
+msgid "Memory allocation error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:583
+#, fuzzy
+msgid "No domain controllers located"
+msgstr "Toimialueen ohjaimia ei löytynyt"
+
+#: ../../libsmb/nterr.c:584
+msgid "Named pipe not available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:585
+msgid "Not implemented"
+msgstr ""
+
+#: ../../libsmb/nterr.c:586
+msgid "Invalid information class"
+msgstr ""
+
+#: ../../libsmb/nterr.c:587
+msgid "Information length mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:588
+msgid "Access violation"
+msgstr ""
+
+#: ../../libsmb/nterr.c:589
+msgid "Invalid handle"
+msgstr ""
+
+#: ../../libsmb/nterr.c:590
+msgid "Invalid parameter"
+msgstr ""
+
+#: ../../libsmb/nterr.c:591
+msgid "No memory"
+msgstr ""
+
+#: ../../libsmb/nterr.c:592
+msgid "Buffer too small"
+msgstr ""
+
+#: ../../libsmb/nterr.c:593
+msgid "Revision mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:594
+#, fuzzy
+msgid "No such logon session"
+msgstr "Ei kirjautumispalvelimia"
+
+#: ../../libsmb/nterr.c:595
+msgid "No such privilege"
+msgstr ""
+
+#: ../../libsmb/nterr.c:596
+msgid "Procedure not found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:597
+msgid "Server disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:598
+msgid "Invalid pipe state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:599
+msgid "Named pipe busy"
+msgstr ""
+
+#: ../../libsmb/nterr.c:600
+msgid "Illegal function"
+msgstr ""
+
+#: ../../libsmb/nterr.c:601
+msgid "Named pipe dicconnected"
+msgstr ""
+
+#: ../../libsmb/nterr.c:602
+msgid "Named pipe closing"
+msgstr ""
+
+#: ../../libsmb/nterr.c:603
+msgid "Remote host not listening"
+msgstr ""
+
+#: ../../libsmb/nterr.c:604
+msgid "Duplicate name on network"
+msgstr ""
+
+#: ../../libsmb/nterr.c:605
+msgid "Print queue is full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:606
+#, fuzzy
+msgid "No print spool space available"
+msgstr "Ensisijaista toimialueen ohjainta ei käytettävissä"
+
+#: ../../libsmb/nterr.c:607
+msgid "The network name cannot be found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:608
+msgid "The connection was refused"
+msgstr ""
+
+#: ../../libsmb/nterr.c:609
+msgid "Too many names"
+msgstr ""
+
+#: ../../libsmb/nterr.c:610
+msgid "Too many sessions"
+msgstr ""
+
+#: ../../libsmb/nterr.c:611
+msgid "Invalid server state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:612
+msgid "Invalid domain state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:613
+msgid "Invalid domain role"
+msgstr ""
+
+#: ../../libsmb/nterr.c:614
+msgid "No such domain"
+msgstr ""
+
+#: ../../libsmb/nterr.c:615
+msgid "Domain exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:616
+msgid "Domain limit exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:617
+msgid "Bad logon session state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:618
+msgid "Logon session collision"
+msgstr ""
+
+#: ../../libsmb/nterr.c:619
+msgid "Invalid logon type"
+msgstr ""
+
+#: ../../libsmb/nterr.c:620
+msgid "Cancelled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:621
+msgid "Invalid computer name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:622
+msgid "Logon server conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:623
+msgid "Time difference at domain controller"
+msgstr ""
+
+#: ../../libsmb/nterr.c:624
+msgid "Pipe broken"
+msgstr ""
+
+#: ../../libsmb/nterr.c:625
+msgid "Registry corrupt"
+msgstr ""
+
+#: ../../libsmb/nterr.c:626
+msgid "Too many secrets"
+msgstr ""
+
+#: ../../libsmb/nterr.c:627
+msgid "Too many SIDs"
+msgstr ""
+
+#: ../../libsmb/nterr.c:628
+msgid "Lanmanager cross encryption required"
+msgstr ""
+
+#: ../../libsmb/nterr.c:629
+msgid "Log file full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:630
+msgid "No trusted LSA secret"
+msgstr ""
+
+#: ../../libsmb/nterr.c:631
+#, fuzzy
+msgid "No trusted SAM account"
+msgstr "Virheellinen luottotili"
+
+#: ../../libsmb/nterr.c:632
+msgid "Trusted domain failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:633
+msgid "Trust relationship failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:634
+msgid "Trust failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:635
+msgid "Netlogon service not started"
+msgstr ""
+
+#: ../../libsmb/nterr.c:636
+msgid "Account expired"
+msgstr ""
+
+#: ../../libsmb/nterr.c:637
+msgid "Network credential conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:638
+msgid "Remote session limit"
+msgstr ""
+
+#: ../../libsmb/nterr.c:639
+msgid "No logon interdomain trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:640
+msgid "No logon workstation trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:641
+#, fuzzy
+msgid "No logon server trust account"
+msgstr "Ei kirjautumispalvelimia"
+
+#: ../../libsmb/nterr.c:642
+msgid "Domain trust inconsistent"
+msgstr ""
+
+#: ../../libsmb/nterr.c:643
+msgid "No user session key available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:644
+msgid "User session deleted"
+msgstr ""
+
+#: ../../libsmb/nterr.c:645
+msgid "Insufficient server resources"
+msgstr ""
+
+#: ../../libsmb/nterr.c:646
+msgid "Insufficient logon information"
+msgstr ""
+
+#: ../../libsmb/nterr.c:648
+msgid "License quota exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:649
+msgid "No more files"
+msgstr ""
diff --git a/source3/locale/pam_winbind/fr.po b/source3/locale/pam_winbind/fr.po
index 99018395aec..4a7d847dd69 100644
--- a/source3/locale/pam_winbind/fr.po
+++ b/source3/locale/pam_winbind/fr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_winbind\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-16 15:30+0800\n"
+"POT-Creation-Date: 2010-03-06 01:55+0800\n"
 "PO-Revision-Date: 2009-02-04 15:43\n"
 "Last-Translator: Novell Language <language@novell.com>\n"
 "Language-Team: Novell Language <language@novell.com>\n"
@@ -13,141 +13,546 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../../nsswitch/pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:583 ../../libsmb/nterr.c:558
 msgid "Success"
 msgstr "Succès"
 
-#: ../../../nsswitch/pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:585
 msgid "No primary Domain Controler available"
 msgstr "Aucun contrôleur de domaine principal disponible"
 
-#: ../../../nsswitch/pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:587
 msgid "No domain controllers found"
 msgstr "Aucun contrôleur de domaine trouvé"
 
-#: ../../../nsswitch/pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:589 ../../libsmb/nterr.c:566
 msgid "No logon servers"
 msgstr "Aucun serveur d'authentification"
 
-#: ../../../nsswitch/pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:591
 msgid "Password too short"
 msgstr "Mot de passe trop court"
 
-#: ../../../nsswitch/pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:593
 msgid "The password of this user is too recent to change"
 msgstr "Le mot de passe de cet usager est trop récent pour être modifié."
 
-#: ../../../nsswitch/pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:595
 msgid "Password is already in password history"
 msgstr "Ce mot de passe est dans l'historique des mots de passe utilisés."
 
-#: ../../../nsswitch/pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:597
 msgid "Your password has expired"
 msgstr "Votre mot de passe a expiré."
 
-#: ../../../nsswitch/pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:599
 msgid "You need to change your password now"
 msgstr "Vous devez changer votre mot de passe maintenant."
 
-#: ../../../nsswitch/pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:601
 msgid "You are not allowed to logon from this workstation"
 msgstr "Vous n'êtes pas autorisé à vous connecter depuis cet ordinateur."
 
-#: ../../../nsswitch/pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:603
 msgid "You are not allowed to logon at this time"
 msgstr "Vous n'êtes pas autorisé à vous connecter à cette heure."
 
-#: ../../../nsswitch/pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:605
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "Votre compte a expiré. Contactez votre administrateur système."
 
-#: ../../../nsswitch/pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:608
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "Votre compte a été désactivé. Contactez votre administrateur système."
 
-#: ../../../nsswitch/pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:611
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "Votre compte a été verrouillé. Contactez votre administrateur système."
 
-#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:614 ../../../nsswitch/pam_winbind.c:616 ../../../nsswitch/pam_winbind.c:618
 msgid "Invalid Trust Account"
 msgstr "Compte approuvé non valide"
 
-#: ../../../nsswitch/pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:620
 msgid "Access is denied"
 msgstr "Accès refusé"
 
-#: ../../../nsswitch/pam_winbind.c:592
-msgid "Your password expires today"
+#: ../../../nsswitch/pam_winbind.c:818
+#, fuzzy
+msgid "Do you want to change your password now?"
+msgstr "Vous devez changer votre mot de passe maintenant."
+
+#: ../../../nsswitch/pam_winbind.c:902
+#, fuzzy
+msgid "Your password expires today.\n"
 msgstr "Votre mot de passe expire aujourd'hui."
 
-#: ../../../nsswitch/pam_winbind.c:597
-#, c-format
-msgid "Your password will expire in %d %s"
+#: ../../../nsswitch/pam_winbind.c:932
+#, fuzzy, c-format
+msgid "Your password will expire in %d %s.\n"
 msgstr "Votre mot de passe expire dans %d %s."
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "days"
 msgstr "jours"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "day"
 msgstr "jour"
 
-#: ../../../nsswitch/pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:1169 ../../../nsswitch/pam_winbind.c:1193
+#, c-format
+msgid "Cannot convert group %s to sid, please contact your administrator to see if group %s is valid."
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1387
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "Délai de grâce. Veuillez changer votre mot de passe dès que vous serez à nouveau connecté."
 
-#: ../../../nsswitch/pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:1397
 msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable"
 msgstr "Le contrôleur de domaine est injoignable. Les donnés d'identification en cache seront utilisées. Certaines ressources réseaux seront indisponibles."
 
-#: ../../../nsswitch/pam_winbind.c:950
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1422
+msgid ""
+"Failed to establish your Kerberos Ticket cache due time differences\n"
+"with the domain controller.  Please verify the system time.\n"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1490
 msgid "Your password "
 msgstr "Votre mot de passe "
 
-#: ../../../nsswitch/pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:1497
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "doit contenir au moins %d caractères ; "
 
-#: ../../../nsswitch/pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:1506
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "ne peut répéter un de vos %d mots de passe ; "
 
-#: ../../../nsswitch/pam_winbind.c:977
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1516
 msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; "
 msgstr "doit contenir des majuscules, des chiffres ou de la ponctuation ; et ne doit pas contenir votre nom ou le nom de votre compte ; "
 
-#: ../../../nsswitch/pam_winbind.c:986
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1526
 msgid "Please type a different password. Type a password which meets these requirements in both text boxes."
 msgstr "Saisissez un autre mot de passe qui satisfasse les différents critères."
 
-#: ../../../nsswitch/pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1553
+#, c-format
+msgid "Creating directory: %s failed: %s"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2018
 msgid "Password does not meet complexity requirements"
 msgstr "Le mot de passe n'est pas suffisamment complexe."
 
-#: ../../../nsswitch/pam_winbind.c:1564
+#.
+#. * First get the name of a user
+#.
+#: ../../../nsswitch/pam_winbind.c:2489 ../../../nsswitch/pam_winbind.c:3035
+msgid "Username: "
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2665
 msgid "Password: "
 msgstr "Mot de passe : "
 
-#: ../../../nsswitch/pam_winbind.c:2013
+#. instruct user what is happening
+#: ../../../nsswitch/pam_winbind.c:3073
 msgid "Changing password for"
 msgstr "Changement du mot de passe pour"
 
-#: ../../../nsswitch/pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:3086
 msgid "(current) NT password: "
 msgstr "mot de passe NT actuel : "
 
-#: ../../../nsswitch/pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:3156
 msgid "Enter new NT password: "
 msgstr "Saisissez le nouveau mot de passe : "
 
-#: ../../../nsswitch/pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:3157
 msgid "Retype new NT password: "
 msgstr "Ressaisissez le nouveau mot de passe NT : "
 
+#.
+#. * here is the string to inform the user that the new passwords they
+#. * typed were not the same.
+#.
+#: ../../../nsswitch/pam_winbind.h:128
+msgid "Sorry, passwords do not match"
+msgstr ""
+
+#: ../../libsmb/nterr.c:559
+msgid "Undetermined error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:560
+#, fuzzy
+msgid "Access denied"
+msgstr "Accès refusé"
+
+#: ../../libsmb/nterr.c:561
+msgid "Account locked out"
+msgstr ""
+
+#: ../../libsmb/nterr.c:562
+#, fuzzy
+msgid "Must change password"
+msgstr "Vous devez changer votre mot de passe maintenant."
+
+#: ../../libsmb/nterr.c:563
+#, fuzzy
+msgid "Password is too short"
+msgstr "Mot de passe trop court"
+
+#: ../../libsmb/nterr.c:564
+#, fuzzy
+msgid "Password is too recent"
+msgstr "Mot de passe trop court"
+
+#: ../../libsmb/nterr.c:565
+#, fuzzy
+msgid "Password history conflict"
+msgstr "Mot de passe trop court"
+
+#: ../../libsmb/nterr.c:567
+msgid "Improperly formed account name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:568
+msgid "User exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:569
+msgid "No such user"
+msgstr ""
+
+#: ../../libsmb/nterr.c:570
+msgid "Group exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:571
+msgid "No such group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:572
+msgid "Member not in group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:573
+#, fuzzy
+msgid "Wrong Password"
+msgstr "Mot de passe : "
+
+#: ../../libsmb/nterr.c:574
+#, fuzzy
+msgid "Ill formed password"
+msgstr "Votre mot de passe "
+
+#: ../../libsmb/nterr.c:575
+#, fuzzy
+msgid "Password restriction"
+msgstr "Mot de passe trop court"
+
+#: ../../libsmb/nterr.c:576
+msgid "Logon failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:577
+msgid "Account restriction"
+msgstr ""
+
+#: ../../libsmb/nterr.c:578
+msgid "Invalid logon hours"
+msgstr ""
+
+#: ../../libsmb/nterr.c:579
+#, fuzzy
+msgid "Invalid workstation"
+msgstr "Compte approuvé non valide"
+
+#: ../../libsmb/nterr.c:580
+#, fuzzy
+msgid "Password expired"
+msgstr "Votre mot de passe a expiré."
+
+#: ../../libsmb/nterr.c:581
+msgid "Account disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:582
+msgid "Memory allocation error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:583
+#, fuzzy
+msgid "No domain controllers located"
+msgstr "Aucun contrôleur de domaine trouvé"
+
+#: ../../libsmb/nterr.c:584
+msgid "Named pipe not available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:585
+msgid "Not implemented"
+msgstr ""
+
+#: ../../libsmb/nterr.c:586
+msgid "Invalid information class"
+msgstr ""
+
+#: ../../libsmb/nterr.c:587
+msgid "Information length mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:588
+msgid "Access violation"
+msgstr ""
+
+#: ../../libsmb/nterr.c:589
+msgid "Invalid handle"
+msgstr ""
+
+#: ../../libsmb/nterr.c:590
+msgid "Invalid parameter"
+msgstr ""
+
+#: ../../libsmb/nterr.c:591
+msgid "No memory"
+msgstr ""
+
+#: ../../libsmb/nterr.c:592
+msgid "Buffer too small"
+msgstr ""
+
+#: ../../libsmb/nterr.c:593
+msgid "Revision mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:594
+#, fuzzy
+msgid "No such logon session"
+msgstr "Aucun serveur d'authentification"
+
+#: ../../libsmb/nterr.c:595
+msgid "No such privilege"
+msgstr ""
+
+#: ../../libsmb/nterr.c:596
+msgid "Procedure not found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:597
+msgid "Server disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:598
+msgid "Invalid pipe state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:599
+msgid "Named pipe busy"
+msgstr ""
+
+#: ../../libsmb/nterr.c:600
+msgid "Illegal function"
+msgstr ""
+
+#: ../../libsmb/nterr.c:601
+msgid "Named pipe dicconnected"
+msgstr ""
+
+#: ../../libsmb/nterr.c:602
+msgid "Named pipe closing"
+msgstr ""
+
+#: ../../libsmb/nterr.c:603
+msgid "Remote host not listening"
+msgstr ""
+
+#: ../../libsmb/nterr.c:604
+msgid "Duplicate name on network"
+msgstr ""
+
+#: ../../libsmb/nterr.c:605
+msgid "Print queue is full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:606
+#, fuzzy
+msgid "No print spool space available"
+msgstr "Aucun contrôleur de domaine principal disponible"
+
+#: ../../libsmb/nterr.c:607
+msgid "The network name cannot be found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:608
+msgid "The connection was refused"
+msgstr ""
+
+#: ../../libsmb/nterr.c:609
+msgid "Too many names"
+msgstr ""
+
+#: ../../libsmb/nterr.c:610
+msgid "Too many sessions"
+msgstr ""
+
+#: ../../libsmb/nterr.c:611
+msgid "Invalid server state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:612
+msgid "Invalid domain state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:613
+msgid "Invalid domain role"
+msgstr ""
+
+#: ../../libsmb/nterr.c:614
+msgid "No such domain"
+msgstr ""
+
+#: ../../libsmb/nterr.c:615
+msgid "Domain exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:616
+msgid "Domain limit exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:617
+msgid "Bad logon session state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:618
+msgid "Logon session collision"
+msgstr ""
+
+#: ../../libsmb/nterr.c:619
+msgid "Invalid logon type"
+msgstr ""
+
+#: ../../libsmb/nterr.c:620
+msgid "Cancelled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:621
+msgid "Invalid computer name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:622
+msgid "Logon server conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:623
+msgid "Time difference at domain controller"
+msgstr ""
+
+#: ../../libsmb/nterr.c:624
+msgid "Pipe broken"
+msgstr ""
+
+#: ../../libsmb/nterr.c:625
+msgid "Registry corrupt"
+msgstr ""
+
+#: ../../libsmb/nterr.c:626
+msgid "Too many secrets"
+msgstr ""
+
+#: ../../libsmb/nterr.c:627
+msgid "Too many SIDs"
+msgstr ""
+
+#: ../../libsmb/nterr.c:628
+msgid "Lanmanager cross encryption required"
+msgstr ""
+
+#: ../../libsmb/nterr.c:629
+msgid "Log file full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:630
+msgid "No trusted LSA secret"
+msgstr ""
+
+#: ../../libsmb/nterr.c:631
+#, fuzzy
+msgid "No trusted SAM account"
+msgstr "Compte approuvé non valide"
+
+#: ../../libsmb/nterr.c:632
+msgid "Trusted domain failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:633
+msgid "Trust relationship failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:634
+msgid "Trust failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:635
+msgid "Netlogon service not started"
+msgstr ""
+
+#: ../../libsmb/nterr.c:636
+msgid "Account expired"
+msgstr ""
+
+#: ../../libsmb/nterr.c:637
+msgid "Network credential conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:638
+msgid "Remote session limit"
+msgstr ""
+
+#: ../../libsmb/nterr.c:639
+msgid "No logon interdomain trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:640
+msgid "No logon workstation trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:641
+#, fuzzy
+msgid "No logon server trust account"
+msgstr "Aucun serveur d'authentification"
+
+#: ../../libsmb/nterr.c:642
+msgid "Domain trust inconsistent"
+msgstr ""
+
+#: ../../libsmb/nterr.c:643
+msgid "No user session key available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:644
+msgid "User session deleted"
+msgstr ""
+
+#: ../../libsmb/nterr.c:645
+msgid "Insufficient server resources"
+msgstr ""
+
+#: ../../libsmb/nterr.c:646
+msgid "Insufficient logon information"
+msgstr ""
+
+#: ../../libsmb/nterr.c:648
+msgid "License quota exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:649
+msgid "No more files"
+msgstr ""
diff --git a/source3/locale/pam_winbind/genmsg b/source3/locale/pam_winbind/genmsg
index 19f21dbae45..ea31b0c5d04 100755
--- a/source3/locale/pam_winbind/genmsg
+++ b/source3/locale/pam_winbind/genmsg
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-FILES="../../../nsswitch/pam_winbind.c ../../../nsswitch/pam_winbind.h"
+FILES="../../../nsswitch/pam_winbind.c ../../../nsswitch/pam_winbind.h ../../libsmb/nterr.c"
 LANGS="af ar bg bn bs ca cs cy da de el en_GB en_US es et fi fr gl gu he hi hr hu id it ja ka km ko lo lt mk mr nb nl pa pl pt_BR pt ro ru si sk sl sr sv ta th tr uk vi wa xh zh_CN zh_TW zu"
 
 XGETTEXT=xgettext
diff --git a/source3/locale/pam_winbind/hu.po b/source3/locale/pam_winbind/hu.po
index 2a75de4a8b6..16c16bc0f18 100644
--- a/source3/locale/pam_winbind/hu.po
+++ b/source3/locale/pam_winbind/hu.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_winbind.hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-16 15:30+0800\n"
+"POT-Creation-Date: 2010-03-06 01:55+0800\n"
 "PO-Revision-Date: 2008-10-26 10:27+0100\n"
 "Last-Translator: Kalman Kemenczy <kkemenczy@novell.com>\n"
 "Language-Team:  <hu@li.org>\n"
@@ -14,153 +14,546 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../../../nsswitch/pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:583 ../../libsmb/nterr.c:558
 msgid "Success"
 msgstr "Sikeres"
 
-#: ../../../nsswitch/pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:585
 msgid "No primary Domain Controler available"
 msgstr "Az elsődleges tartományvezérlő nem érhető el"
 
-#: ../../../nsswitch/pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:587
 msgid "No domain controllers found"
 msgstr "Nem található tartományvezérlő"
 
-#: ../../../nsswitch/pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:589 ../../libsmb/nterr.c:566
 msgid "No logon servers"
 msgstr "Nincsenek Logon kiszolgálók"
 
-#: ../../../nsswitch/pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:591
 msgid "Password too short"
 msgstr "Túl rövid jelszó"
 
-#: ../../../nsswitch/pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:593
 msgid "The password of this user is too recent to change"
 msgstr "A felhasználó jelszava új"
 
-#: ../../../nsswitch/pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:595
 msgid "Password is already in password history"
 msgstr "A jelszó már szerepel az előzményekben"
 
-#: ../../../nsswitch/pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:597
 msgid "Your password has expired"
 msgstr "A jelszava lejárt"
 
-#: ../../../nsswitch/pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:599
 msgid "You need to change your password now"
 msgstr "Meg kell most változtatnia a jelszavát"
 
-#: ../../../nsswitch/pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:601
 msgid "You are not allowed to logon from this workstation"
 msgstr "Nem jogosult belépni erről a munkaállomásról"
 
-#: ../../../nsswitch/pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:603
 msgid "You are not allowed to logon at this time"
 msgstr "Most nem jogosult most belépni"
 
-#: ../../../nsswitch/pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:605
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "A felhasználói fiókja lejárt. Lépjen kapcsolatba a rendszergazdával"
 
-#: ../../../nsswitch/pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:608
 msgid "Your account is disabled. Please contact your System administrator"
-msgstr ""
-"A felhasználói fiókja le van tiltva. Lépjen kapcsolatba a rendszergazdával"
+msgstr "A felhasználói fiókja le van tiltva. Lépjen kapcsolatba a rendszergazdával"
 
-#: ../../../nsswitch/pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:611
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "A felhasználói fiókja zárolt. Lépjen kapcsolatba a rendszergazdával"
 
-#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:614 ../../../nsswitch/pam_winbind.c:616 ../../../nsswitch/pam_winbind.c:618
 msgid "Invalid Trust Account"
 msgstr "Érvénytelen Trust Account"
 
-#: ../../../nsswitch/pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:620
 msgid "Access is denied"
 msgstr "Hozzáférés megtagadva"
 
-#: ../../../nsswitch/pam_winbind.c:592
-msgid "Your password expires today"
+#: ../../../nsswitch/pam_winbind.c:818
+#, fuzzy
+msgid "Do you want to change your password now?"
+msgstr "Meg kell most változtatnia a jelszavát"
+
+#: ../../../nsswitch/pam_winbind.c:902
+#, fuzzy
+msgid "Your password expires today.\n"
 msgstr "A jelszava ma jár le"
 
-#: ../../../nsswitch/pam_winbind.c:597
-#, c-format
-msgid "Your password will expire in %d %s"
+#: ../../../nsswitch/pam_winbind.c:932
+#, fuzzy, c-format
+msgid "Your password will expire in %d %s.\n"
 msgstr "Jelszava le fog járni %d %s"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "days"
 msgstr "nap múlva"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "day"
 msgstr "nap múlva"
 
-#: ../../../nsswitch/pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:1169 ../../../nsswitch/pam_winbind.c:1193
+#, c-format
+msgid "Cannot convert group %s to sid, please contact your administrator to see if group %s is valid."
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1387
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "Türelmi belépés. Cserélje le a jelszavát a következő alkalommal"
 
-#: ../../../nsswitch/pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:1397
+msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable"
+msgstr "A tartomány nem érhető el, a gyorstározott hitelesítő adat kerül felhasználásra. A hálózati erőforrások valószínűleg nem érhatők el "
+
+#: ../../../nsswitch/pam_winbind.c:1422
 msgid ""
-"Domain Controller unreachable, using cached credentials instead. Network "
-"resources may be unavailable"
+"Failed to establish your Kerberos Ticket cache due time differences\n"
+"with the domain controller.  Please verify the system time.\n"
 msgstr ""
-"A tartomány nem érhető el, a gyorstározott hitelesítő adat kerül "
-"felhasználásra. A hálózati erőforrások valószínűleg nem érhatők el "
 
-#: ../../../nsswitch/pam_winbind.c:950
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1490
 msgid "Your password "
 msgstr "A jelszavának"
 
-#: ../../../nsswitch/pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:1497
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "legalább %d karakterből kell állnia; "
 
-#: ../../../nsswitch/pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:1506
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "nem ismétlődhet az előző %d jelszó; "
 
-#: ../../../nsswitch/pam_winbind.c:977
-#, c-format
-msgid ""
-"must contain capitals, numerals or punctuation; and cannot contain your "
-"account or full name; "
-msgstr ""
-"tartalmaznia kell betűket, számokat vagy írásjeleket és nem tartalmazhatja a "
-"felhasználói vagy a teljes nevét; "
+#: ../../../nsswitch/pam_winbind.c:1516
+msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; "
+msgstr "tartalmaznia kell betűket, számokat vagy írásjeleket és nem tartalmazhatja a felhasználói vagy a teljes nevét; "
+
+#: ../../../nsswitch/pam_winbind.c:1526
+msgid "Please type a different password. Type a password which meets these requirements in both text boxes."
+msgstr "Adjon meg egy másik jelszót. Írjon be mindkét szövegmezőbe a feltételeknek megfelelő jelszót."
 
-#: ../../../nsswitch/pam_winbind.c:986
+#: ../../../nsswitch/pam_winbind.c:1553
 #, c-format
-msgid ""
-"Please type a different password. Type a password which meets these "
-"requirements in both text boxes."
+msgid "Creating directory: %s failed: %s"
 msgstr ""
-"Adjon meg egy másik jelszót. Írjon be mindkét szövegmezőbe a feltételeknek "
-"megfelelő jelszót."
 
-#: ../../../nsswitch/pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:2018
 msgid "Password does not meet complexity requirements"
 msgstr "A jelszó nem felel meg a követelményeknek"
 
-#: ../../../nsswitch/pam_winbind.c:1564
+#.
+#. * First get the name of a user
+#.
+#: ../../../nsswitch/pam_winbind.c:2489 ../../../nsswitch/pam_winbind.c:3035
+msgid "Username: "
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2665
 msgid "Password: "
 msgstr "Jelszó: "
 
-#: ../../../nsswitch/pam_winbind.c:2013
+#. instruct user what is happening
+#: ../../../nsswitch/pam_winbind.c:3073
 msgid "Changing password for"
 msgstr "Jelszómódosítás"
 
-#: ../../../nsswitch/pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:3086
 msgid "(current) NT password: "
 msgstr "(jelenlegi) NT jelszó: "
 
-#: ../../../nsswitch/pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:3156
 msgid "Enter new NT password: "
 msgstr "Új NT jelszó: "
 
-#: ../../../nsswitch/pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:3157
 msgid "Retype new NT password: "
 msgstr "Új NT jelszó ismét: "
+
+#.
+#. * here is the string to inform the user that the new passwords they
+#. * typed were not the same.
+#.
+#: ../../../nsswitch/pam_winbind.h:128
+msgid "Sorry, passwords do not match"
+msgstr ""
+
+#: ../../libsmb/nterr.c:559
+msgid "Undetermined error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:560
+#, fuzzy
+msgid "Access denied"
+msgstr "Hozzáférés megtagadva"
+
+#: ../../libsmb/nterr.c:561
+msgid "Account locked out"
+msgstr ""
+
+#: ../../libsmb/nterr.c:562
+#, fuzzy
+msgid "Must change password"
+msgstr "Meg kell most változtatnia a jelszavát"
+
+#: ../../libsmb/nterr.c:563
+#, fuzzy
+msgid "Password is too short"
+msgstr "Túl rövid jelszó"
+
+#: ../../libsmb/nterr.c:564
+#, fuzzy
+msgid "Password is too recent"
+msgstr "Túl rövid jelszó"
+
+#: ../../libsmb/nterr.c:565
+#, fuzzy
+msgid "Password history conflict"
+msgstr "Túl rövid jelszó"
+
+#: ../../libsmb/nterr.c:567
+msgid "Improperly formed account name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:568
+msgid "User exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:569
+msgid "No such user"
+msgstr ""
+
+#: ../../libsmb/nterr.c:570
+msgid "Group exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:571
+msgid "No such group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:572
+msgid "Member not in group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:573
+#, fuzzy
+msgid "Wrong Password"
+msgstr "Jelszó: "
+
+#: ../../libsmb/nterr.c:574
+#, fuzzy
+msgid "Ill formed password"
+msgstr "A jelszavának"
+
+#: ../../libsmb/nterr.c:575
+#, fuzzy
+msgid "Password restriction"
+msgstr "Túl rövid jelszó"
+
+#: ../../libsmb/nterr.c:576
+msgid "Logon failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:577
+msgid "Account restriction"
+msgstr ""
+
+#: ../../libsmb/nterr.c:578
+msgid "Invalid logon hours"
+msgstr ""
+
+#: ../../libsmb/nterr.c:579
+#, fuzzy
+msgid "Invalid workstation"
+msgstr "Érvénytelen Trust Account"
+
+#: ../../libsmb/nterr.c:580
+#, fuzzy
+msgid "Password expired"
+msgstr "A jelszava lejárt"
+
+#: ../../libsmb/nterr.c:581
+msgid "Account disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:582
+msgid "Memory allocation error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:583
+#, fuzzy
+msgid "No domain controllers located"
+msgstr "Nem található tartományvezérlő"
+
+#: ../../libsmb/nterr.c:584
+msgid "Named pipe not available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:585
+msgid "Not implemented"
+msgstr ""
+
+#: ../../libsmb/nterr.c:586
+msgid "Invalid information class"
+msgstr ""
+
+#: ../../libsmb/nterr.c:587
+msgid "Information length mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:588
+msgid "Access violation"
+msgstr ""
+
+#: ../../libsmb/nterr.c:589
+msgid "Invalid handle"
+msgstr ""
+
+#: ../../libsmb/nterr.c:590
+msgid "Invalid parameter"
+msgstr ""
+
+#: ../../libsmb/nterr.c:591
+msgid "No memory"
+msgstr ""
+
+#: ../../libsmb/nterr.c:592
+msgid "Buffer too small"
+msgstr ""
+
+#: ../../libsmb/nterr.c:593
+msgid "Revision mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:594
+#, fuzzy
+msgid "No such logon session"
+msgstr "Nincsenek Logon kiszolgálók"
+
+#: ../../libsmb/nterr.c:595
+msgid "No such privilege"
+msgstr ""
+
+#: ../../libsmb/nterr.c:596
+msgid "Procedure not found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:597
+msgid "Server disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:598
+msgid "Invalid pipe state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:599
+msgid "Named pipe busy"
+msgstr ""
+
+#: ../../libsmb/nterr.c:600
+msgid "Illegal function"
+msgstr ""
+
+#: ../../libsmb/nterr.c:601
+msgid "Named pipe dicconnected"
+msgstr ""
+
+#: ../../libsmb/nterr.c:602
+msgid "Named pipe closing"
+msgstr ""
+
+#: ../../libsmb/nterr.c:603
+msgid "Remote host not listening"
+msgstr ""
+
+#: ../../libsmb/nterr.c:604
+msgid "Duplicate name on network"
+msgstr ""
+
+#: ../../libsmb/nterr.c:605
+msgid "Print queue is full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:606
+#, fuzzy
+msgid "No print spool space available"
+msgstr "Az elsődleges tartományvezérlő nem érhető el"
+
+#: ../../libsmb/nterr.c:607
+msgid "The network name cannot be found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:608
+msgid "The connection was refused"
+msgstr ""
+
+#: ../../libsmb/nterr.c:609
+msgid "Too many names"
+msgstr ""
+
+#: ../../libsmb/nterr.c:610
+msgid "Too many sessions"
+msgstr ""
+
+#: ../../libsmb/nterr.c:611
+msgid "Invalid server state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:612
+msgid "Invalid domain state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:613
+msgid "Invalid domain role"
+msgstr ""
+
+#: ../../libsmb/nterr.c:614
+msgid "No such domain"
+msgstr ""
+
+#: ../../libsmb/nterr.c:615
+msgid "Domain exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:616
+msgid "Domain limit exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:617
+msgid "Bad logon session state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:618
+msgid "Logon session collision"
+msgstr ""
+
+#: ../../libsmb/nterr.c:619
+msgid "Invalid logon type"
+msgstr ""
+
+#: ../../libsmb/nterr.c:620
+msgid "Cancelled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:621
+msgid "Invalid computer name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:622
+msgid "Logon server conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:623
+msgid "Time difference at domain controller"
+msgstr ""
+
+#: ../../libsmb/nterr.c:624
+msgid "Pipe broken"
+msgstr ""
+
+#: ../../libsmb/nterr.c:625
+msgid "Registry corrupt"
+msgstr ""
+
+#: ../../libsmb/nterr.c:626
+msgid "Too many secrets"
+msgstr ""
+
+#: ../../libsmb/nterr.c:627
+msgid "Too many SIDs"
+msgstr ""
+
+#: ../../libsmb/nterr.c:628
+msgid "Lanmanager cross encryption required"
+msgstr ""
+
+#: ../../libsmb/nterr.c:629
+msgid "Log file full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:630
+msgid "No trusted LSA secret"
+msgstr ""
+
+#: ../../libsmb/nterr.c:631
+#, fuzzy
+msgid "No trusted SAM account"
+msgstr "Érvénytelen Trust Account"
+
+#: ../../libsmb/nterr.c:632
+msgid "Trusted domain failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:633
+msgid "Trust relationship failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:634
+msgid "Trust failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:635
+msgid "Netlogon service not started"
+msgstr ""
+
+#: ../../libsmb/nterr.c:636
+msgid "Account expired"
+msgstr ""
+
+#: ../../libsmb/nterr.c:637
+msgid "Network credential conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:638
+msgid "Remote session limit"
+msgstr ""
+
+#: ../../libsmb/nterr.c:639
+msgid "No logon interdomain trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:640
+msgid "No logon workstation trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:641
+#, fuzzy
+msgid "No logon server trust account"
+msgstr "Nincsenek Logon kiszolgálók"
+
+#: ../../libsmb/nterr.c:642
+msgid "Domain trust inconsistent"
+msgstr ""
+
+#: ../../libsmb/nterr.c:643
+msgid "No user session key available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:644
+msgid "User session deleted"
+msgstr ""
+
+#: ../../libsmb/nterr.c:645
+msgid "Insufficient server resources"
+msgstr ""
+
+#: ../../libsmb/nterr.c:646
+msgid "Insufficient logon information"
+msgstr ""
+
+#: ../../libsmb/nterr.c:648
+msgid "License quota exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:649
+msgid "No more files"
+msgstr ""
diff --git a/source3/locale/pam_winbind/it.po b/source3/locale/pam_winbind/it.po
index e5ca86e6a85..e2055cb760c 100644
--- a/source3/locale/pam_winbind/it.po
+++ b/source3/locale/pam_winbind/it.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_winbind\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-16 15:30+0800\n"
+"POT-Creation-Date: 2010-03-06 01:55+0800\n"
 "PO-Revision-Date: 2009-02-05 10:11\n"
 "Last-Translator: Novell Language <language@novell.com>\n"
 "Language-Team: Novell Language <language@novell.com>\n"
@@ -13,141 +13,546 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../../nsswitch/pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:583 ../../libsmb/nterr.c:558
 msgid "Success"
 msgstr "Successo"
 
-#: ../../../nsswitch/pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:585
 msgid "No primary Domain Controler available"
 msgstr "Nessun controller di dominio primario disponibile"
 
-#: ../../../nsswitch/pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:587
 msgid "No domain controllers found"
 msgstr "Nessun controller di dominio trovato"
 
-#: ../../../nsswitch/pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:589 ../../libsmb/nterr.c:566
 msgid "No logon servers"
 msgstr "Nessun server d'autenticazione"
 
-#: ../../../nsswitch/pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:591
 msgid "Password too short"
 msgstr "Password troppo breve"
 
-#: ../../../nsswitch/pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:593
 msgid "The password of this user is too recent to change"
 msgstr "La password per questo utente è troppo recente per essere cambiata"
 
-#: ../../../nsswitch/pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:595
 msgid "Password is already in password history"
 msgstr "La password è già presente nella cronologia delle password"
 
-#: ../../../nsswitch/pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:597
 msgid "Your password has expired"
 msgstr "La password è scaduta"
 
-#: ../../../nsswitch/pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:599
 msgid "You need to change your password now"
 msgstr "È necessario modificare la password ora"
 
-#: ../../../nsswitch/pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:601
 msgid "You are not allowed to logon from this workstation"
 msgstr "Impossibile effettuare il login da questa workstation"
 
-#: ../../../nsswitch/pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:603
 msgid "You are not allowed to logon at this time"
 msgstr "Impossibile effettuare il login in questo momento"
 
-#: ../../../nsswitch/pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:605
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "L'account è scaduto. Contattare l'amministratore di sistema"
 
-#: ../../../nsswitch/pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:608
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "L'account è disabilitato. Contattare l'amministratore di sistema"
 
-#: ../../../nsswitch/pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:611
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "L'account è stato bloccato. Contattare l'amministratore di sistema"
 
-#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:614 ../../../nsswitch/pam_winbind.c:616 ../../../nsswitch/pam_winbind.c:618
 msgid "Invalid Trust Account"
 msgstr "Account attendibile non valido"
 
-#: ../../../nsswitch/pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:620
 msgid "Access is denied"
 msgstr "Accesso negato"
 
-#: ../../../nsswitch/pam_winbind.c:592
-msgid "Your password expires today"
+#: ../../../nsswitch/pam_winbind.c:818
+#, fuzzy
+msgid "Do you want to change your password now?"
+msgstr "È necessario modificare la password ora"
+
+#: ../../../nsswitch/pam_winbind.c:902
+#, fuzzy
+msgid "Your password expires today.\n"
 msgstr "La password scade oggi"
 
-#: ../../../nsswitch/pam_winbind.c:597
-#, c-format
-msgid "Your password will expire in %d %s"
+#: ../../../nsswitch/pam_winbind.c:932
+#, fuzzy, c-format
+msgid "Your password will expire in %d %s.\n"
 msgstr "La password scadrà tra %d %s"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "days"
 msgstr "giorni"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "day"
 msgstr "giorno"
 
-#: ../../../nsswitch/pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:1169 ../../../nsswitch/pam_winbind.c:1193
+#, c-format
+msgid "Cannot convert group %s to sid, please contact your administrator to see if group %s is valid."
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1387
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "Login extra. Modificare la password poiché a breve verrà ristabilita la connessione"
 
-#: ../../../nsswitch/pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:1397
 msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable"
 msgstr "Controller del dominio non raggiungibile; uso delle credenziali memorizzate al suo posto. Le risorse di rete potrebbero non essere disponibili"
 
-#: ../../../nsswitch/pam_winbind.c:950
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1422
+msgid ""
+"Failed to establish your Kerberos Ticket cache due time differences\n"
+"with the domain controller.  Please verify the system time.\n"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1490
 msgid "Your password "
 msgstr "La tua password "
 
-#: ../../../nsswitch/pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:1497
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "deve essere composta almeno da %d caratteri; "
 
-#: ../../../nsswitch/pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:1506
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "non puoi ripetere nessuna delle tue %d password precedenti; "
 
-#: ../../../nsswitch/pam_winbind.c:977
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1516
 msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; "
 msgstr "deve contenere lettere maiuscole, cifre e punteggiatura; e non può contenere il nome del tuo account o il tuo nome completo; "
 
-#: ../../../nsswitch/pam_winbind.c:986
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1526
 msgid "Please type a different password. Type a password which meets these requirements in both text boxes."
 msgstr "Inserire una password diversa. Digita in entrambe le caselle una password che soddisfa i requisiti."
 
-#: ../../../nsswitch/pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1553
+#, c-format
+msgid "Creating directory: %s failed: %s"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2018
 msgid "Password does not meet complexity requirements"
 msgstr "La password non soddisfa i requisiti di complessità"
 
-#: ../../../nsswitch/pam_winbind.c:1564
+#.
+#. * First get the name of a user
+#.
+#: ../../../nsswitch/pam_winbind.c:2489 ../../../nsswitch/pam_winbind.c:3035
+msgid "Username: "
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2665
 msgid "Password: "
 msgstr "Password: "
 
-#: ../../../nsswitch/pam_winbind.c:2013
+#. instruct user what is happening
+#: ../../../nsswitch/pam_winbind.c:3073
 msgid "Changing password for"
 msgstr "Modifica la password per"
 
-#: ../../../nsswitch/pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:3086
 msgid "(current) NT password: "
 msgstr "Password NT (corrente): "
 
-#: ../../../nsswitch/pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:3156
 msgid "Enter new NT password: "
 msgstr "Immetti la nuova password NT: "
 
-#: ../../../nsswitch/pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:3157
 msgid "Retype new NT password: "
 msgstr "Reinserisci la nuova password NT: "
 
+#.
+#. * here is the string to inform the user that the new passwords they
+#. * typed were not the same.
+#.
+#: ../../../nsswitch/pam_winbind.h:128
+msgid "Sorry, passwords do not match"
+msgstr ""
+
+#: ../../libsmb/nterr.c:559
+msgid "Undetermined error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:560
+#, fuzzy
+msgid "Access denied"
+msgstr "Accesso negato"
+
+#: ../../libsmb/nterr.c:561
+msgid "Account locked out"
+msgstr ""
+
+#: ../../libsmb/nterr.c:562
+#, fuzzy
+msgid "Must change password"
+msgstr "È necessario modificare la password ora"
+
+#: ../../libsmb/nterr.c:563
+#, fuzzy
+msgid "Password is too short"
+msgstr "Password troppo breve"
+
+#: ../../libsmb/nterr.c:564
+#, fuzzy
+msgid "Password is too recent"
+msgstr "Password troppo breve"
+
+#: ../../libsmb/nterr.c:565
+#, fuzzy
+msgid "Password history conflict"
+msgstr "Password troppo breve"
+
+#: ../../libsmb/nterr.c:567
+msgid "Improperly formed account name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:568
+msgid "User exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:569
+msgid "No such user"
+msgstr ""
+
+#: ../../libsmb/nterr.c:570
+msgid "Group exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:571
+msgid "No such group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:572
+msgid "Member not in group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:573
+#, fuzzy
+msgid "Wrong Password"
+msgstr "Password: "
+
+#: ../../libsmb/nterr.c:574
+#, fuzzy
+msgid "Ill formed password"
+msgstr "La tua password "
+
+#: ../../libsmb/nterr.c:575
+#, fuzzy
+msgid "Password restriction"
+msgstr "Password troppo breve"
+
+#: ../../libsmb/nterr.c:576
+msgid "Logon failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:577
+msgid "Account restriction"
+msgstr ""
+
+#: ../../libsmb/nterr.c:578
+msgid "Invalid logon hours"
+msgstr ""
+
+#: ../../libsmb/nterr.c:579
+#, fuzzy
+msgid "Invalid workstation"
+msgstr "Account attendibile non valido"
+
+#: ../../libsmb/nterr.c:580
+#, fuzzy
+msgid "Password expired"
+msgstr "La password è scaduta"
+
+#: ../../libsmb/nterr.c:581
+msgid "Account disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:582
+msgid "Memory allocation error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:583
+#, fuzzy
+msgid "No domain controllers located"
+msgstr "Nessun controller di dominio trovato"
+
+#: ../../libsmb/nterr.c:584
+msgid "Named pipe not available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:585
+msgid "Not implemented"
+msgstr ""
+
+#: ../../libsmb/nterr.c:586
+msgid "Invalid information class"
+msgstr ""
+
+#: ../../libsmb/nterr.c:587
+msgid "Information length mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:588
+msgid "Access violation"
+msgstr ""
+
+#: ../../libsmb/nterr.c:589
+msgid "Invalid handle"
+msgstr ""
+
+#: ../../libsmb/nterr.c:590
+msgid "Invalid parameter"
+msgstr ""
+
+#: ../../libsmb/nterr.c:591
+msgid "No memory"
+msgstr ""
+
+#: ../../libsmb/nterr.c:592
+msgid "Buffer too small"
+msgstr ""
+
+#: ../../libsmb/nterr.c:593
+msgid "Revision mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:594
+#, fuzzy
+msgid "No such logon session"
+msgstr "Nessun server d'autenticazione"
+
+#: ../../libsmb/nterr.c:595
+msgid "No such privilege"
+msgstr ""
+
+#: ../../libsmb/nterr.c:596
+msgid "Procedure not found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:597
+msgid "Server disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:598
+msgid "Invalid pipe state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:599
+msgid "Named pipe busy"
+msgstr ""
+
+#: ../../libsmb/nterr.c:600
+msgid "Illegal function"
+msgstr ""
+
+#: ../../libsmb/nterr.c:601
+msgid "Named pipe dicconnected"
+msgstr ""
+
+#: ../../libsmb/nterr.c:602
+msgid "Named pipe closing"
+msgstr ""
+
+#: ../../libsmb/nterr.c:603
+msgid "Remote host not listening"
+msgstr ""
+
+#: ../../libsmb/nterr.c:604
+msgid "Duplicate name on network"
+msgstr ""
+
+#: ../../libsmb/nterr.c:605
+msgid "Print queue is full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:606
+#, fuzzy
+msgid "No print spool space available"
+msgstr "Nessun controller di dominio primario disponibile"
+
+#: ../../libsmb/nterr.c:607
+msgid "The network name cannot be found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:608
+msgid "The connection was refused"
+msgstr ""
+
+#: ../../libsmb/nterr.c:609
+msgid "Too many names"
+msgstr ""
+
+#: ../../libsmb/nterr.c:610
+msgid "Too many sessions"
+msgstr ""
+
+#: ../../libsmb/nterr.c:611
+msgid "Invalid server state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:612
+msgid "Invalid domain state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:613
+msgid "Invalid domain role"
+msgstr ""
+
+#: ../../libsmb/nterr.c:614
+msgid "No such domain"
+msgstr ""
+
+#: ../../libsmb/nterr.c:615
+msgid "Domain exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:616
+msgid "Domain limit exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:617
+msgid "Bad logon session state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:618
+msgid "Logon session collision"
+msgstr ""
+
+#: ../../libsmb/nterr.c:619
+msgid "Invalid logon type"
+msgstr ""
+
+#: ../../libsmb/nterr.c:620
+msgid "Cancelled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:621
+msgid "Invalid computer name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:622
+msgid "Logon server conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:623
+msgid "Time difference at domain controller"
+msgstr ""
+
+#: ../../libsmb/nterr.c:624
+msgid "Pipe broken"
+msgstr ""
+
+#: ../../libsmb/nterr.c:625
+msgid "Registry corrupt"
+msgstr ""
+
+#: ../../libsmb/nterr.c:626
+msgid "Too many secrets"
+msgstr ""
+
+#: ../../libsmb/nterr.c:627
+msgid "Too many SIDs"
+msgstr ""
+
+#: ../../libsmb/nterr.c:628
+msgid "Lanmanager cross encryption required"
+msgstr ""
+
+#: ../../libsmb/nterr.c:629
+msgid "Log file full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:630
+msgid "No trusted LSA secret"
+msgstr ""
+
+#: ../../libsmb/nterr.c:631
+#, fuzzy
+msgid "No trusted SAM account"
+msgstr "Account attendibile non valido"
+
+#: ../../libsmb/nterr.c:632
+msgid "Trusted domain failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:633
+msgid "Trust relationship failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:634
+msgid "Trust failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:635
+msgid "Netlogon service not started"
+msgstr ""
+
+#: ../../libsmb/nterr.c:636
+msgid "Account expired"
+msgstr ""
+
+#: ../../libsmb/nterr.c:637
+msgid "Network credential conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:638
+msgid "Remote session limit"
+msgstr ""
+
+#: ../../libsmb/nterr.c:639
+msgid "No logon interdomain trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:640
+msgid "No logon workstation trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:641
+#, fuzzy
+msgid "No logon server trust account"
+msgstr "Nessun server d'autenticazione"
+
+#: ../../libsmb/nterr.c:642
+msgid "Domain trust inconsistent"
+msgstr ""
+
+#: ../../libsmb/nterr.c:643
+msgid "No user session key available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:644
+msgid "User session deleted"
+msgstr ""
+
+#: ../../libsmb/nterr.c:645
+msgid "Insufficient server resources"
+msgstr ""
+
+#: ../../libsmb/nterr.c:646
+msgid "Insufficient logon information"
+msgstr ""
+
+#: ../../libsmb/nterr.c:648
+msgid "License quota exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:649
+msgid "No more files"
+msgstr ""
diff --git a/source3/locale/pam_winbind/ja.po b/source3/locale/pam_winbind/ja.po
index c6d08a58dfd..b5d6616519b 100644
--- a/source3/locale/pam_winbind/ja.po
+++ b/source3/locale/pam_winbind/ja.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_winbind\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-16 15:30+0800\n"
+"POT-Creation-Date: 2010-03-06 01:55+0800\n"
 "PO-Revision-Date: 2009-02-04 15:11\n"
 "Last-Translator: Novell Language <language@novell.com>\n"
 "Language-Team: Novell Language <language@novell.com>\n"
@@ -13,141 +13,546 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../../nsswitch/pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:583 ../../libsmb/nterr.c:558
 msgid "Success"
 msgstr "成功しました"
 
-#: ../../../nsswitch/pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:585
 msgid "No primary Domain Controler available"
 msgstr "プライマリドメインコントローラが利用できません"
 
-#: ../../../nsswitch/pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:587
 msgid "No domain controllers found"
 msgstr "ドメインコントローラが見つかりません"
 
-#: ../../../nsswitch/pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:589 ../../libsmb/nterr.c:566
 msgid "No logon servers"
 msgstr "ログオンサーバがありません"
 
-#: ../../../nsswitch/pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:591
 msgid "Password too short"
 msgstr "パスワードが短すぎます"
 
-#: ../../../nsswitch/pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:593
 msgid "The password of this user is too recent to change"
 msgstr "このユーザに対するパスワードは変更するには新しすぎます"
 
-#: ../../../nsswitch/pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:595
 msgid "Password is already in password history"
 msgstr "指定したパスワードはパスワード履歴内に存在しています"
 
-#: ../../../nsswitch/pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:597
 msgid "Your password has expired"
 msgstr "お使いのパスワードの期限が切れました"
 
-#: ../../../nsswitch/pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:599
 msgid "You need to change your password now"
 msgstr "パスワードを今すぐ変更する必要があります"
 
-#: ../../../nsswitch/pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:601
 msgid "You are not allowed to logon from this workstation"
 msgstr "このワークステーションからログオンすることが許可されていません"
 
-#: ../../../nsswitch/pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:603
 msgid "You are not allowed to logon at this time"
 msgstr "この時間にログオンすることが許可されていません"
 
-#: ../../../nsswitch/pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:605
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "お使いのアカウントの期限が切れました。システム管理者に連絡してください"
 
-#: ../../../nsswitch/pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:608
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "アカウントは無効です。システム管理者にご連絡ください。"
 
-#: ../../../nsswitch/pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:611
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "お使いのアカウントはロック (施錠) されています。システム管理者に連絡してください"
 
-#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:614 ../../../nsswitch/pam_winbind.c:616 ../../../nsswitch/pam_winbind.c:618
 msgid "Invalid Trust Account"
 msgstr "信頼アカウントが正しくありません"
 
-#: ../../../nsswitch/pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:620
 msgid "Access is denied"
 msgstr "アクセスが拒否されました"
 
-#: ../../../nsswitch/pam_winbind.c:592
-msgid "Your password expires today"
+#: ../../../nsswitch/pam_winbind.c:818
+#, fuzzy
+msgid "Do you want to change your password now?"
+msgstr "パスワードを今すぐ変更する必要があります"
+
+#: ../../../nsswitch/pam_winbind.c:902
+#, fuzzy
+msgid "Your password expires today.\n"
 msgstr "お使いのパスワードは本日期限切れになります"
 
-#: ../../../nsswitch/pam_winbind.c:597
-#, c-format
-msgid "Your password will expire in %d %s"
+#: ../../../nsswitch/pam_winbind.c:932
+#, fuzzy, c-format
+msgid "Your password will expire in %d %s.\n"
 msgstr "お使いのパスワードは、あと %d %s で有効期限が切れます。"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "days"
 msgstr "日"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "day"
 msgstr "日"
 
-#: ../../../nsswitch/pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:1169 ../../../nsswitch/pam_winbind.c:1193
+#, c-format
+msgid "Cannot convert group %s to sid, please contact your administrator to see if group %s is valid."
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1387
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "猶予ログイン中です。次回ログオン時にすぐにパスワードを変更してください"
 
-#: ../../../nsswitch/pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:1397
 msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable"
 msgstr "ドメインコントローラにアクセスできないため、記憶済みの認証を使用しました。ネットワーク資源が利用できないかもしれません"
 
-#: ../../../nsswitch/pam_winbind.c:950
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1422
+msgid ""
+"Failed to establish your Kerberos Ticket cache due time differences\n"
+"with the domain controller.  Please verify the system time.\n"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1490
 msgid "Your password "
 msgstr "お使いのパスワードは "
 
-#: ../../../nsswitch/pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:1497
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "少なくとも %d 文字以上でなければなりません; "
 
-#: ../../../nsswitch/pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:1506
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "過去 %d 個分のパスワードはいずれも再度利用することはできません; "
 
-#: ../../../nsswitch/pam_winbind.c:977
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1516
 msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; "
 msgstr "アルファベット大文字や数字、句読点 (カンマやピリオド) のいずれかを含まなければなりません; さらにアカウント名や本名 (フルネーム) を含めることはできません; "
 
-#: ../../../nsswitch/pam_winbind.c:986
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1526
 msgid "Please type a different password. Type a password which meets these requirements in both text boxes."
 msgstr "別のパスワードを入力してください。両方のテキストボックス内にこれらの要件を満たすものを入力してください。"
 
-#: ../../../nsswitch/pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1553
+#, c-format
+msgid "Creating directory: %s failed: %s"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2018
 msgid "Password does not meet complexity requirements"
 msgstr "パスワードは複雑さの要件を満たしていません"
 
-#: ../../../nsswitch/pam_winbind.c:1564
+#.
+#. * First get the name of a user
+#.
+#: ../../../nsswitch/pam_winbind.c:2489 ../../../nsswitch/pam_winbind.c:3035
+msgid "Username: "
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2665
 msgid "Password: "
 msgstr "パスワード:"
 
-#: ../../../nsswitch/pam_winbind.c:2013
+#. instruct user what is happening
+#: ../../../nsswitch/pam_winbind.c:3073
 msgid "Changing password for"
 msgstr "下記に対するパスワードを変更しています"
 
-#: ../../../nsswitch/pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:3086
 msgid "(current) NT password: "
 msgstr "現在の NT パスワード: "
 
-#: ../../../nsswitch/pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:3156
 msgid "Enter new NT password: "
 msgstr "新しい NT パスワード: "
 
-#: ../../../nsswitch/pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:3157
 msgid "Retype new NT password: "
 msgstr "新しい NT パスワードの再入力: "
 
+#.
+#. * here is the string to inform the user that the new passwords they
+#. * typed were not the same.
+#.
+#: ../../../nsswitch/pam_winbind.h:128
+msgid "Sorry, passwords do not match"
+msgstr ""
+
+#: ../../libsmb/nterr.c:559
+msgid "Undetermined error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:560
+#, fuzzy
+msgid "Access denied"
+msgstr "アクセスが拒否されました"
+
+#: ../../libsmb/nterr.c:561
+msgid "Account locked out"
+msgstr ""
+
+#: ../../libsmb/nterr.c:562
+#, fuzzy
+msgid "Must change password"
+msgstr "パスワードを今すぐ変更する必要があります"
+
+#: ../../libsmb/nterr.c:563
+#, fuzzy
+msgid "Password is too short"
+msgstr "パスワードが短すぎます"
+
+#: ../../libsmb/nterr.c:564
+#, fuzzy
+msgid "Password is too recent"
+msgstr "パスワードが短すぎます"
+
+#: ../../libsmb/nterr.c:565
+#, fuzzy
+msgid "Password history conflict"
+msgstr "パスワードが短すぎます"
+
+#: ../../libsmb/nterr.c:567
+msgid "Improperly formed account name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:568
+msgid "User exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:569
+msgid "No such user"
+msgstr ""
+
+#: ../../libsmb/nterr.c:570
+msgid "Group exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:571
+msgid "No such group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:572
+msgid "Member not in group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:573
+#, fuzzy
+msgid "Wrong Password"
+msgstr "パスワード:"
+
+#: ../../libsmb/nterr.c:574
+#, fuzzy
+msgid "Ill formed password"
+msgstr "お使いのパスワードは "
+
+#: ../../libsmb/nterr.c:575
+#, fuzzy
+msgid "Password restriction"
+msgstr "パスワードが短すぎます"
+
+#: ../../libsmb/nterr.c:576
+msgid "Logon failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:577
+msgid "Account restriction"
+msgstr ""
+
+#: ../../libsmb/nterr.c:578
+msgid "Invalid logon hours"
+msgstr ""
+
+#: ../../libsmb/nterr.c:579
+#, fuzzy
+msgid "Invalid workstation"
+msgstr "信頼アカウントが正しくありません"
+
+#: ../../libsmb/nterr.c:580
+#, fuzzy
+msgid "Password expired"
+msgstr "お使いのパスワードの期限が切れました"
+
+#: ../../libsmb/nterr.c:581
+msgid "Account disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:582
+msgid "Memory allocation error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:583
+#, fuzzy
+msgid "No domain controllers located"
+msgstr "ドメインコントローラが見つかりません"
+
+#: ../../libsmb/nterr.c:584
+msgid "Named pipe not available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:585
+msgid "Not implemented"
+msgstr ""
+
+#: ../../libsmb/nterr.c:586
+msgid "Invalid information class"
+msgstr ""
+
+#: ../../libsmb/nterr.c:587
+msgid "Information length mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:588
+msgid "Access violation"
+msgstr ""
+
+#: ../../libsmb/nterr.c:589
+msgid "Invalid handle"
+msgstr ""
+
+#: ../../libsmb/nterr.c:590
+msgid "Invalid parameter"
+msgstr ""
+
+#: ../../libsmb/nterr.c:591
+msgid "No memory"
+msgstr ""
+
+#: ../../libsmb/nterr.c:592
+msgid "Buffer too small"
+msgstr ""
+
+#: ../../libsmb/nterr.c:593
+msgid "Revision mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:594
+#, fuzzy
+msgid "No such logon session"
+msgstr "ログオンサーバがありません"
+
+#: ../../libsmb/nterr.c:595
+msgid "No such privilege"
+msgstr ""
+
+#: ../../libsmb/nterr.c:596
+msgid "Procedure not found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:597
+msgid "Server disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:598
+msgid "Invalid pipe state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:599
+msgid "Named pipe busy"
+msgstr ""
+
+#: ../../libsmb/nterr.c:600
+msgid "Illegal function"
+msgstr ""
+
+#: ../../libsmb/nterr.c:601
+msgid "Named pipe dicconnected"
+msgstr ""
+
+#: ../../libsmb/nterr.c:602
+msgid "Named pipe closing"
+msgstr ""
+
+#: ../../libsmb/nterr.c:603
+msgid "Remote host not listening"
+msgstr ""
+
+#: ../../libsmb/nterr.c:604
+msgid "Duplicate name on network"
+msgstr ""
+
+#: ../../libsmb/nterr.c:605
+msgid "Print queue is full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:606
+#, fuzzy
+msgid "No print spool space available"
+msgstr "プライマリドメインコントローラが利用できません"
+
+#: ../../libsmb/nterr.c:607
+msgid "The network name cannot be found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:608
+msgid "The connection was refused"
+msgstr ""
+
+#: ../../libsmb/nterr.c:609
+msgid "Too many names"
+msgstr ""
+
+#: ../../libsmb/nterr.c:610
+msgid "Too many sessions"
+msgstr ""
+
+#: ../../libsmb/nterr.c:611
+msgid "Invalid server state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:612
+msgid "Invalid domain state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:613
+msgid "Invalid domain role"
+msgstr ""
+
+#: ../../libsmb/nterr.c:614
+msgid "No such domain"
+msgstr ""
+
+#: ../../libsmb/nterr.c:615
+msgid "Domain exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:616
+msgid "Domain limit exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:617
+msgid "Bad logon session state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:618
+msgid "Logon session collision"
+msgstr ""
+
+#: ../../libsmb/nterr.c:619
+msgid "Invalid logon type"
+msgstr ""
+
+#: ../../libsmb/nterr.c:620
+msgid "Cancelled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:621
+msgid "Invalid computer name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:622
+msgid "Logon server conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:623
+msgid "Time difference at domain controller"
+msgstr ""
+
+#: ../../libsmb/nterr.c:624
+msgid "Pipe broken"
+msgstr ""
+
+#: ../../libsmb/nterr.c:625
+msgid "Registry corrupt"
+msgstr ""
+
+#: ../../libsmb/nterr.c:626
+msgid "Too many secrets"
+msgstr ""
+
+#: ../../libsmb/nterr.c:627
+msgid "Too many SIDs"
+msgstr ""
+
+#: ../../libsmb/nterr.c:628
+msgid "Lanmanager cross encryption required"
+msgstr ""
+
+#: ../../libsmb/nterr.c:629
+msgid "Log file full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:630
+msgid "No trusted LSA secret"
+msgstr ""
+
+#: ../../libsmb/nterr.c:631
+#, fuzzy
+msgid "No trusted SAM account"
+msgstr "信頼アカウントが正しくありません"
+
+#: ../../libsmb/nterr.c:632
+msgid "Trusted domain failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:633
+msgid "Trust relationship failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:634
+msgid "Trust failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:635
+msgid "Netlogon service not started"
+msgstr ""
+
+#: ../../libsmb/nterr.c:636
+msgid "Account expired"
+msgstr ""
+
+#: ../../libsmb/nterr.c:637
+msgid "Network credential conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:638
+msgid "Remote session limit"
+msgstr ""
+
+#: ../../libsmb/nterr.c:639
+msgid "No logon interdomain trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:640
+msgid "No logon workstation trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:641
+#, fuzzy
+msgid "No logon server trust account"
+msgstr "ログオンサーバがありません"
+
+#: ../../libsmb/nterr.c:642
+msgid "Domain trust inconsistent"
+msgstr ""
+
+#: ../../libsmb/nterr.c:643
+msgid "No user session key available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:644
+msgid "User session deleted"
+msgstr ""
+
+#: ../../libsmb/nterr.c:645
+msgid "Insufficient server resources"
+msgstr ""
+
+#: ../../libsmb/nterr.c:646
+msgid "Insufficient logon information"
+msgstr ""
+
+#: ../../libsmb/nterr.c:648
+msgid "License quota exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:649
+msgid "No more files"
+msgstr ""
diff --git a/source3/locale/pam_winbind/ko.po b/source3/locale/pam_winbind/ko.po
index f7a20564058..9469b38d98d 100644
--- a/source3/locale/pam_winbind/ko.po
+++ b/source3/locale/pam_winbind/ko.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_winbind\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-16 15:30+0800\n"
+"POT-Creation-Date: 2010-03-06 01:55+0800\n"
 "PO-Revision-Date: 2009-02-04 15:02\n"
 "Last-Translator: Novell Language <language@novell.com>\n"
 "Language-Team: Novell Language <language@novell.com>\n"
@@ -13,141 +13,546 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../../nsswitch/pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:583 ../../libsmb/nterr.c:558
 msgid "Success"
 msgstr "성공"
 
-#: ../../../nsswitch/pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:585
 msgid "No primary Domain Controler available"
 msgstr "사용할 수 있는 기본 도메인 컨트롤러가 없습니다."
 
-#: ../../../nsswitch/pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:587
 msgid "No domain controllers found"
 msgstr "도메인 컨트롤러가 없습니다."
 
-#: ../../../nsswitch/pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:589 ../../libsmb/nterr.c:566
 msgid "No logon servers"
 msgstr "서버에 로그온하지 않았습니다."
 
-#: ../../../nsswitch/pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:591
 msgid "Password too short"
 msgstr "비밀번호가 너무 짧습니다."
 
-#: ../../../nsswitch/pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:593
 msgid "The password of this user is too recent to change"
 msgstr "이 사용자의 비밀번호는 바꾼지 얼마 되지 않아 지금 바꿀 수 없습니다."
 
-#: ../../../nsswitch/pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:595
 msgid "Password is already in password history"
 msgstr "비밀번호 이력에 이미 있는 비밀번호입니다."
 
-#: ../../../nsswitch/pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:597
 msgid "Your password has expired"
 msgstr "비밀번호가 만료되었습니다."
 
-#: ../../../nsswitch/pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:599
 msgid "You need to change your password now"
 msgstr "지금 비밀번호를 변경해야 합니다."
 
-#: ../../../nsswitch/pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:601
 msgid "You are not allowed to logon from this workstation"
 msgstr "이 워크스테이션에서 로그온할 수 없습니다."
 
-#: ../../../nsswitch/pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:603
 msgid "You are not allowed to logon at this time"
 msgstr "현재 로그온이 허용되지 않습니다."
 
-#: ../../../nsswitch/pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:605
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "계정이 만료되었습니다. 시스템 관리자에게 문의하십시오."
 
-#: ../../../nsswitch/pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:608
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "계정이 비활성화되었습니다. 시스템 관리자에게 문의하십시오."
 
-#: ../../../nsswitch/pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:611
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "계정이 잠겼습니다. 시스템 관리자에게 문의하십시오."
 
-#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:614 ../../../nsswitch/pam_winbind.c:616 ../../../nsswitch/pam_winbind.c:618
 msgid "Invalid Trust Account"
 msgstr "잘못된 트러스트 계정입니다."
 
-#: ../../../nsswitch/pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:620
 msgid "Access is denied"
 msgstr "액세스가 거부되었습니다."
 
-#: ../../../nsswitch/pam_winbind.c:592
-msgid "Your password expires today"
+#: ../../../nsswitch/pam_winbind.c:818
+#, fuzzy
+msgid "Do you want to change your password now?"
+msgstr "지금 비밀번호를 변경해야 합니다."
+
+#: ../../../nsswitch/pam_winbind.c:902
+#, fuzzy
+msgid "Your password expires today.\n"
 msgstr "오늘 비밀번호가 만료됩니다."
 
-#: ../../../nsswitch/pam_winbind.c:597
-#, c-format
-msgid "Your password will expire in %d %s"
+#: ../../../nsswitch/pam_winbind.c:932
+#, fuzzy, c-format
+msgid "Your password will expire in %d %s.\n"
 msgstr "비밀번호가 %d %s일 후에 만료됩니다."
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "days"
 msgstr "일"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "day"
 msgstr "일"
 
-#: ../../../nsswitch/pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:1169 ../../../nsswitch/pam_winbind.c:1193
+#, c-format
+msgid "Cannot convert group %s to sid, please contact your administrator to see if group %s is valid."
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1387
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "정상적으로 로그온되었습니다. 다시 접속할 때 비밀번호를 변경해 주십시오. "
 
-#: ../../../nsswitch/pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:1397
 msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable"
 msgstr "캐시된 자격인증을 사용하여 도메인 컨트롤러에 연결할 수 없습니다. 네트워크 리소스를 사용할 수 없습니다. "
 
-#: ../../../nsswitch/pam_winbind.c:950
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1422
+msgid ""
+"Failed to establish your Kerberos Ticket cache due time differences\n"
+"with the domain controller.  Please verify the system time.\n"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1490
 msgid "Your password "
 msgstr "비밀번호는"
 
-#: ../../../nsswitch/pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:1497
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "최소 %d자 이상이어야 합니다."
 
-#: ../../../nsswitch/pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:1506
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "이전에 사용한 %d개의 비밀번호를 다시 사용할 수 없습니다."
 
-#: ../../../nsswitch/pam_winbind.c:977
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1516
 msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; "
 msgstr "대문자, 숫자 또는 문장 부호를 포함해야 하며, 본인의 계정이나 이름을 비밀번호에 사용할 수 없습니다."
 
-#: ../../../nsswitch/pam_winbind.c:986
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1526
 msgid "Please type a different password. Type a password which meets these requirements in both text boxes."
 msgstr "다른 비밀번호를 입력하십시오. 비밀번호 요구사항을 준수하여 두 텍스트 상자에 입력해 주십시오. "
 
-#: ../../../nsswitch/pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1553
+#, c-format
+msgid "Creating directory: %s failed: %s"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2018
 msgid "Password does not meet complexity requirements"
 msgstr "비밀번호 복잡성 요구사항에 맞지 않습니다."
 
-#: ../../../nsswitch/pam_winbind.c:1564
+#.
+#. * First get the name of a user
+#.
+#: ../../../nsswitch/pam_winbind.c:2489 ../../../nsswitch/pam_winbind.c:3035
+msgid "Username: "
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2665
 msgid "Password: "
 msgstr "비밀번호:"
 
-#: ../../../nsswitch/pam_winbind.c:2013
+#. instruct user what is happening
+#: ../../../nsswitch/pam_winbind.c:3073
 msgid "Changing password for"
 msgstr "비밀번호 변경"
 
-#: ../../../nsswitch/pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:3086
 msgid "(current) NT password: "
 msgstr "(현재) NT 비밀번호:"
 
-#: ../../../nsswitch/pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:3156
 msgid "Enter new NT password: "
 msgstr "새 NT 비밀번호 입력:"
 
-#: ../../../nsswitch/pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:3157
 msgid "Retype new NT password: "
 msgstr "새 NT 비밀번호 재입력:"
 
+#.
+#. * here is the string to inform the user that the new passwords they
+#. * typed were not the same.
+#.
+#: ../../../nsswitch/pam_winbind.h:128
+msgid "Sorry, passwords do not match"
+msgstr ""
+
+#: ../../libsmb/nterr.c:559
+msgid "Undetermined error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:560
+#, fuzzy
+msgid "Access denied"
+msgstr "액세스가 거부되었습니다."
+
+#: ../../libsmb/nterr.c:561
+msgid "Account locked out"
+msgstr ""
+
+#: ../../libsmb/nterr.c:562
+#, fuzzy
+msgid "Must change password"
+msgstr "지금 비밀번호를 변경해야 합니다."
+
+#: ../../libsmb/nterr.c:563
+#, fuzzy
+msgid "Password is too short"
+msgstr "비밀번호가 너무 짧습니다."
+
+#: ../../libsmb/nterr.c:564
+#, fuzzy
+msgid "Password is too recent"
+msgstr "비밀번호가 너무 짧습니다."
+
+#: ../../libsmb/nterr.c:565
+#, fuzzy
+msgid "Password history conflict"
+msgstr "비밀번호가 너무 짧습니다."
+
+#: ../../libsmb/nterr.c:567
+msgid "Improperly formed account name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:568
+msgid "User exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:569
+msgid "No such user"
+msgstr ""
+
+#: ../../libsmb/nterr.c:570
+msgid "Group exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:571
+msgid "No such group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:572
+msgid "Member not in group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:573
+#, fuzzy
+msgid "Wrong Password"
+msgstr "비밀번호:"
+
+#: ../../libsmb/nterr.c:574
+#, fuzzy
+msgid "Ill formed password"
+msgstr "비밀번호는"
+
+#: ../../libsmb/nterr.c:575
+#, fuzzy
+msgid "Password restriction"
+msgstr "비밀번호가 너무 짧습니다."
+
+#: ../../libsmb/nterr.c:576
+msgid "Logon failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:577
+msgid "Account restriction"
+msgstr ""
+
+#: ../../libsmb/nterr.c:578
+msgid "Invalid logon hours"
+msgstr ""
+
+#: ../../libsmb/nterr.c:579
+#, fuzzy
+msgid "Invalid workstation"
+msgstr "잘못된 트러스트 계정입니다."
+
+#: ../../libsmb/nterr.c:580
+#, fuzzy
+msgid "Password expired"
+msgstr "비밀번호가 만료되었습니다."
+
+#: ../../libsmb/nterr.c:581
+msgid "Account disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:582
+msgid "Memory allocation error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:583
+#, fuzzy
+msgid "No domain controllers located"
+msgstr "도메인 컨트롤러가 없습니다."
+
+#: ../../libsmb/nterr.c:584
+msgid "Named pipe not available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:585
+msgid "Not implemented"
+msgstr ""
+
+#: ../../libsmb/nterr.c:586
+msgid "Invalid information class"
+msgstr ""
+
+#: ../../libsmb/nterr.c:587
+msgid "Information length mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:588
+msgid "Access violation"
+msgstr ""
+
+#: ../../libsmb/nterr.c:589
+msgid "Invalid handle"
+msgstr ""
+
+#: ../../libsmb/nterr.c:590
+msgid "Invalid parameter"
+msgstr ""
+
+#: ../../libsmb/nterr.c:591
+msgid "No memory"
+msgstr ""
+
+#: ../../libsmb/nterr.c:592
+msgid "Buffer too small"
+msgstr ""
+
+#: ../../libsmb/nterr.c:593
+msgid "Revision mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:594
+#, fuzzy
+msgid "No such logon session"
+msgstr "서버에 로그온하지 않았습니다."
+
+#: ../../libsmb/nterr.c:595
+msgid "No such privilege"
+msgstr ""
+
+#: ../../libsmb/nterr.c:596
+msgid "Procedure not found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:597
+msgid "Server disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:598
+msgid "Invalid pipe state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:599
+msgid "Named pipe busy"
+msgstr ""
+
+#: ../../libsmb/nterr.c:600
+msgid "Illegal function"
+msgstr ""
+
+#: ../../libsmb/nterr.c:601
+msgid "Named pipe dicconnected"
+msgstr ""
+
+#: ../../libsmb/nterr.c:602
+msgid "Named pipe closing"
+msgstr ""
+
+#: ../../libsmb/nterr.c:603
+msgid "Remote host not listening"
+msgstr ""
+
+#: ../../libsmb/nterr.c:604
+msgid "Duplicate name on network"
+msgstr ""
+
+#: ../../libsmb/nterr.c:605
+msgid "Print queue is full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:606
+#, fuzzy
+msgid "No print spool space available"
+msgstr "사용할 수 있는 기본 도메인 컨트롤러가 없습니다."
+
+#: ../../libsmb/nterr.c:607
+msgid "The network name cannot be found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:608
+msgid "The connection was refused"
+msgstr ""
+
+#: ../../libsmb/nterr.c:609
+msgid "Too many names"
+msgstr ""
+
+#: ../../libsmb/nterr.c:610
+msgid "Too many sessions"
+msgstr ""
+
+#: ../../libsmb/nterr.c:611
+msgid "Invalid server state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:612
+msgid "Invalid domain state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:613
+msgid "Invalid domain role"
+msgstr ""
+
+#: ../../libsmb/nterr.c:614
+msgid "No such domain"
+msgstr ""
+
+#: ../../libsmb/nterr.c:615
+msgid "Domain exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:616
+msgid "Domain limit exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:617
+msgid "Bad logon session state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:618
+msgid "Logon session collision"
+msgstr ""
+
+#: ../../libsmb/nterr.c:619
+msgid "Invalid logon type"
+msgstr ""
+
+#: ../../libsmb/nterr.c:620
+msgid "Cancelled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:621
+msgid "Invalid computer name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:622
+msgid "Logon server conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:623
+msgid "Time difference at domain controller"
+msgstr ""
+
+#: ../../libsmb/nterr.c:624
+msgid "Pipe broken"
+msgstr ""
+
+#: ../../libsmb/nterr.c:625
+msgid "Registry corrupt"
+msgstr ""
+
+#: ../../libsmb/nterr.c:626
+msgid "Too many secrets"
+msgstr ""
+
+#: ../../libsmb/nterr.c:627
+msgid "Too many SIDs"
+msgstr ""
+
+#: ../../libsmb/nterr.c:628
+msgid "Lanmanager cross encryption required"
+msgstr ""
+
+#: ../../libsmb/nterr.c:629
+msgid "Log file full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:630
+msgid "No trusted LSA secret"
+msgstr ""
+
+#: ../../libsmb/nterr.c:631
+#, fuzzy
+msgid "No trusted SAM account"
+msgstr "잘못된 트러스트 계정입니다."
+
+#: ../../libsmb/nterr.c:632
+msgid "Trusted domain failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:633
+msgid "Trust relationship failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:634
+msgid "Trust failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:635
+msgid "Netlogon service not started"
+msgstr ""
+
+#: ../../libsmb/nterr.c:636
+msgid "Account expired"
+msgstr ""
+
+#: ../../libsmb/nterr.c:637
+msgid "Network credential conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:638
+msgid "Remote session limit"
+msgstr ""
+
+#: ../../libsmb/nterr.c:639
+msgid "No logon interdomain trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:640
+msgid "No logon workstation trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:641
+#, fuzzy
+msgid "No logon server trust account"
+msgstr "서버에 로그온하지 않았습니다."
+
+#: ../../libsmb/nterr.c:642
+msgid "Domain trust inconsistent"
+msgstr ""
+
+#: ../../libsmb/nterr.c:643
+msgid "No user session key available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:644
+msgid "User session deleted"
+msgstr ""
+
+#: ../../libsmb/nterr.c:645
+msgid "Insufficient server resources"
+msgstr ""
+
+#: ../../libsmb/nterr.c:646
+msgid "Insufficient logon information"
+msgstr ""
+
+#: ../../libsmb/nterr.c:648
+msgid "License quota exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:649
+msgid "No more files"
+msgstr ""
diff --git a/source3/locale/pam_winbind/nb.po b/source3/locale/pam_winbind/nb.po
index fb938c94c46..7571134a5e7 100644
--- a/source3/locale/pam_winbind/nb.po
+++ b/source3/locale/pam_winbind/nb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_winbind\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-16 17:11+0800\n"
+"POT-Creation-Date: 2010-03-06 01:55+0800\n"
 "PO-Revision-Date: 2008-11-22 22:33+0100\n"
 "Last-Translator: Olav P. <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <>\n"
@@ -18,97 +18,107 @@ msgstr ""
 "X-Generator: Lokalize 0.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../../nsswitch/pam_winbind.c:533
+#: ../../../nsswitch/pam_winbind.c:583 ../../libsmb/nterr.c:558
 msgid "Success"
 msgstr "Vellykket"
 
-#: ../../../nsswitch/pam_winbind.c:535
+#: ../../../nsswitch/pam_winbind.c:585
 msgid "No primary Domain Controler available"
 msgstr "Ingen primær domenekontroller tilgjengelig"
 
-#: ../../../nsswitch/pam_winbind.c:537
+#: ../../../nsswitch/pam_winbind.c:587
 msgid "No domain controllers found"
 msgstr "Ingen domenekontrollere funnet"
 
-#: ../../../nsswitch/pam_winbind.c:539
+#: ../../../nsswitch/pam_winbind.c:589 ../../libsmb/nterr.c:566
 msgid "No logon servers"
 msgstr "Ingen innloggingsservere"
 
-#: ../../../nsswitch/pam_winbind.c:541
+#: ../../../nsswitch/pam_winbind.c:591
 msgid "Password too short"
 msgstr "Passordet er for kort"
 
-#: ../../../nsswitch/pam_winbind.c:543
+#: ../../../nsswitch/pam_winbind.c:593
 msgid "The password of this user is too recent to change"
 msgstr "Passordet for denne brukeren er for nytt til å endre"
 
-#: ../../../nsswitch/pam_winbind.c:545
+#: ../../../nsswitch/pam_winbind.c:595
 msgid "Password is already in password history"
 msgstr "Passordet finnes allerede i passordloggen"
 
-#: ../../../nsswitch/pam_winbind.c:547
+#: ../../../nsswitch/pam_winbind.c:597
 msgid "Your password has expired"
 msgstr "Passordet er utløpt"
 
-#: ../../../nsswitch/pam_winbind.c:549
+#: ../../../nsswitch/pam_winbind.c:599
 msgid "You need to change your password now"
 msgstr "Du må endre passordet nå"
 
-#: ../../../nsswitch/pam_winbind.c:551
+#: ../../../nsswitch/pam_winbind.c:601
 msgid "You are not allowed to logon from this workstation"
 msgstr "Du er ikke autorisert for å logge inn fra denne arbeidsstasjonen"
 
-#: ../../../nsswitch/pam_winbind.c:553
+#: ../../../nsswitch/pam_winbind.c:603
 msgid "You are not allowed to logon at this time"
 msgstr "Du er ikke autorisert for å logge inn på dette tidspunktet"
 
-#: ../../../nsswitch/pam_winbind.c:555
+#: ../../../nsswitch/pam_winbind.c:605
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "Din konto er utløpt. Kontakt systemadministratoren"
 
-#: ../../../nsswitch/pam_winbind.c:558
+#: ../../../nsswitch/pam_winbind.c:608
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "Din konto er deaktivert. Kontakt systemadministratoren"
 
-#: ../../../nsswitch/pam_winbind.c:561
+#: ../../../nsswitch/pam_winbind.c:611
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "Din konto er låst. Kontakt systemadministratoren"
 
-#: ../../../nsswitch/pam_winbind.c:564 ../../../nsswitch/pam_winbind.c:566
-#: ../../../nsswitch/pam_winbind.c:568
+#: ../../../nsswitch/pam_winbind.c:614 ../../../nsswitch/pam_winbind.c:616 ../../../nsswitch/pam_winbind.c:618
 msgid "Invalid Trust Account"
 msgstr "Ugyldig pålitelig konto"
 
-#: ../../../nsswitch/pam_winbind.c:570
+#: ../../../nsswitch/pam_winbind.c:620
 msgid "Access is denied"
 msgstr "Tilgang avvist"
 
-#: ../../../nsswitch/pam_winbind.c:845
-msgid "Your password expires today"
+#: ../../../nsswitch/pam_winbind.c:818
+#, fuzzy
+msgid "Do you want to change your password now?"
+msgstr "Du må endre passordet nå"
+
+#: ../../../nsswitch/pam_winbind.c:902
+#, fuzzy
+msgid "Your password expires today.\n"
 msgstr "Passordet utløper i dag"
 
-#: ../../../nsswitch/pam_winbind.c:851
-#, c-format
-msgid "Your password will expire in %d %s"
+#: ../../../nsswitch/pam_winbind.c:932
+#, fuzzy, c-format
+msgid "Your password will expire in %d %s.\n"
 msgstr "Passordet vil utløpe om %d %s"
 
-#: ../../../nsswitch/pam_winbind.c:852
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "days"
 msgstr "dager"
 
-#: ../../../nsswitch/pam_winbind.c:852
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "day"
 msgstr "dag"
 
-#: ../../../nsswitch/pam_winbind.c:1193
+#: ../../../nsswitch/pam_winbind.c:1169 ../../../nsswitch/pam_winbind.c:1193
+#, c-format
+msgid "Cannot convert group %s to sid, please contact your administrator to see if group %s is valid."
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1387
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "Midlertidig innlogging. Du må endre passordet straks du er tilkoblet igjen"
 
-#: ../../../nsswitch/pam_winbind.c:1203
+#: ../../../nsswitch/pam_winbind.c:1397
 msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable"
 msgstr "Domenekontrolleren er utilgjengelig, bruker mellomlagrede rettigheter i stedet. Nettverksressurser Kan være utilgjengelige"
 
-#: ../../../nsswitch/pam_winbind.c:1228
+#: ../../../nsswitch/pam_winbind.c:1422
 msgid ""
 "Failed to establish your Kerberos Ticket cache due time differences\n"
 "with the domain controller.  Please verify the system time.\n"
@@ -116,60 +126,62 @@ msgstr ""
 "Kunne ikke opprette mellomlager for  Kerberos-billetter på grunn av tidsdifferanse\n"
 "i forhold til domenekontroller. Kontroller systemtiden.\n"
 
-#: ../../../nsswitch/pam_winbind.c:1258
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1490
 msgid "Your password "
 msgstr "Passordet "
 
-#: ../../../nsswitch/pam_winbind.c:1265
+#: ../../../nsswitch/pam_winbind.c:1497
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "må inneholde minst %d tegn; "
 
-#: ../../../nsswitch/pam_winbind.c:1275
+#: ../../../nsswitch/pam_winbind.c:1506
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "kan ikke være likt noen av dine %d tidligere passord; "
 
-#: ../../../nsswitch/pam_winbind.c:1287
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1516
 msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; "
 msgstr "må inneholde store bokstaver, tall eller skilletegn; og kan ikke inneholde ditt kontonavn eller fulle navn; "
 
-#: ../../../nsswitch/pam_winbind.c:1298
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1526
 msgid "Please type a different password. Type a password which meets these requirements in both text boxes."
 msgstr "Angi et annet passord. Skriv inn et passord som oppfyller kriteriene i begge tekstboksene."
 
-#: ../../../nsswitch/pam_winbind.c:1600
+#: ../../../nsswitch/pam_winbind.c:1553
+#, c-format
+msgid "Creating directory: %s failed: %s"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2018
 msgid "Password does not meet complexity requirements"
 msgstr "Passordet er for enkelt"
 
-#: ../../../nsswitch/pam_winbind.c:2114
-msgid "Password: "
-msgstr "Passord: "
-
 #.
 #. * First get the name of a user
 #.
-#: ../../../nsswitch/pam_winbind.c:2403 ../../../nsswitch/pam_winbind.c:2552
+#: ../../../nsswitch/pam_winbind.c:2489 ../../../nsswitch/pam_winbind.c:3035
 msgid "Username: "
 msgstr "Brukernavn: "
 
+#: ../../../nsswitch/pam_winbind.c:2665
+msgid "Password: "
+msgstr "Passord: "
+
 #. instruct user what is happening
-#: ../../../nsswitch/pam_winbind.c:2589
+#: ../../../nsswitch/pam_winbind.c:3073
 msgid "Changing password for"
 msgstr "Endrer passord for"
 
-#: ../../../nsswitch/pam_winbind.c:2604
+#: ../../../nsswitch/pam_winbind.c:3086
 msgid "(current) NT password: "
 msgstr "(gjeldende) NT-passord: "
 
-#: ../../../nsswitch/pam_winbind.c:2672
+#: ../../../nsswitch/pam_winbind.c:3156
 msgid "Enter new NT password: "
 msgstr "Angi nytt NT-passord: "
 
-#: ../../../nsswitch/pam_winbind.c:2673
+#: ../../../nsswitch/pam_winbind.c:3157
 msgid "Retype new NT password: "
 msgstr "Bekreft det nye NT-passordet: "
 
@@ -177,7 +189,377 @@ msgstr "Bekreft det nye NT-passordet: "
 #. * here is the string to inform the user that the new passwords they
 #. * typed were not the same.
 #.
-#: ../../../nsswitch/pam_winbind.h:119
+#: ../../../nsswitch/pam_winbind.h:128
 msgid "Sorry, passwords do not match"
 msgstr "Beklager, passordene samsvarer ikke"
 
+#: ../../libsmb/nterr.c:559
+msgid "Undetermined error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:560
+#, fuzzy
+msgid "Access denied"
+msgstr "Tilgang avvist"
+
+#: ../../libsmb/nterr.c:561
+msgid "Account locked out"
+msgstr ""
+
+#: ../../libsmb/nterr.c:562
+#, fuzzy
+msgid "Must change password"
+msgstr "Du må endre passordet nå"
+
+#: ../../libsmb/nterr.c:563
+#, fuzzy
+msgid "Password is too short"
+msgstr "Passordet er for kort"
+
+#: ../../libsmb/nterr.c:564
+#, fuzzy
+msgid "Password is too recent"
+msgstr "Passordet er for kort"
+
+#: ../../libsmb/nterr.c:565
+#, fuzzy
+msgid "Password history conflict"
+msgstr "Passordet er for kort"
+
+#: ../../libsmb/nterr.c:567
+msgid "Improperly formed account name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:568
+msgid "User exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:569
+msgid "No such user"
+msgstr ""
+
+#: ../../libsmb/nterr.c:570
+msgid "Group exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:571
+msgid "No such group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:572
+msgid "Member not in group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:573
+#, fuzzy
+msgid "Wrong Password"
+msgstr "Passord: "
+
+#: ../../libsmb/nterr.c:574
+#, fuzzy
+msgid "Ill formed password"
+msgstr "Passordet "
+
+#: ../../libsmb/nterr.c:575
+#, fuzzy
+msgid "Password restriction"
+msgstr "Passordet er for kort"
+
+#: ../../libsmb/nterr.c:576
+msgid "Logon failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:577
+msgid "Account restriction"
+msgstr ""
+
+#: ../../libsmb/nterr.c:578
+msgid "Invalid logon hours"
+msgstr ""
+
+#: ../../libsmb/nterr.c:579
+#, fuzzy
+msgid "Invalid workstation"
+msgstr "Ugyldig pålitelig konto"
+
+#: ../../libsmb/nterr.c:580
+#, fuzzy
+msgid "Password expired"
+msgstr "Passordet er utløpt"
+
+#: ../../libsmb/nterr.c:581
+msgid "Account disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:582
+msgid "Memory allocation error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:583
+#, fuzzy
+msgid "No domain controllers located"
+msgstr "Ingen domenekontrollere funnet"
+
+#: ../../libsmb/nterr.c:584
+msgid "Named pipe not available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:585
+msgid "Not implemented"
+msgstr ""
+
+#: ../../libsmb/nterr.c:586
+msgid "Invalid information class"
+msgstr ""
+
+#: ../../libsmb/nterr.c:587
+msgid "Information length mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:588
+msgid "Access violation"
+msgstr ""
+
+#: ../../libsmb/nterr.c:589
+msgid "Invalid handle"
+msgstr ""
+
+#: ../../libsmb/nterr.c:590
+msgid "Invalid parameter"
+msgstr ""
+
+#: ../../libsmb/nterr.c:591
+msgid "No memory"
+msgstr ""
+
+#: ../../libsmb/nterr.c:592
+msgid "Buffer too small"
+msgstr ""
+
+#: ../../libsmb/nterr.c:593
+msgid "Revision mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:594
+#, fuzzy
+msgid "No such logon session"
+msgstr "Ingen innloggingsservere"
+
+#: ../../libsmb/nterr.c:595
+msgid "No such privilege"
+msgstr ""
+
+#: ../../libsmb/nterr.c:596
+msgid "Procedure not found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:597
+msgid "Server disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:598
+msgid "Invalid pipe state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:599
+msgid "Named pipe busy"
+msgstr ""
+
+#: ../../libsmb/nterr.c:600
+msgid "Illegal function"
+msgstr ""
+
+#: ../../libsmb/nterr.c:601
+msgid "Named pipe dicconnected"
+msgstr ""
+
+#: ../../libsmb/nterr.c:602
+msgid "Named pipe closing"
+msgstr ""
+
+#: ../../libsmb/nterr.c:603
+msgid "Remote host not listening"
+msgstr ""
+
+#: ../../libsmb/nterr.c:604
+msgid "Duplicate name on network"
+msgstr ""
+
+#: ../../libsmb/nterr.c:605
+msgid "Print queue is full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:606
+#, fuzzy
+msgid "No print spool space available"
+msgstr "Ingen primær domenekontroller tilgjengelig"
+
+#: ../../libsmb/nterr.c:607
+msgid "The network name cannot be found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:608
+msgid "The connection was refused"
+msgstr ""
+
+#: ../../libsmb/nterr.c:609
+msgid "Too many names"
+msgstr ""
+
+#: ../../libsmb/nterr.c:610
+msgid "Too many sessions"
+msgstr ""
+
+#: ../../libsmb/nterr.c:611
+msgid "Invalid server state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:612
+msgid "Invalid domain state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:613
+msgid "Invalid domain role"
+msgstr ""
+
+#: ../../libsmb/nterr.c:614
+msgid "No such domain"
+msgstr ""
+
+#: ../../libsmb/nterr.c:615
+msgid "Domain exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:616
+msgid "Domain limit exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:617
+msgid "Bad logon session state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:618
+msgid "Logon session collision"
+msgstr ""
+
+#: ../../libsmb/nterr.c:619
+msgid "Invalid logon type"
+msgstr ""
+
+#: ../../libsmb/nterr.c:620
+msgid "Cancelled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:621
+msgid "Invalid computer name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:622
+msgid "Logon server conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:623
+msgid "Time difference at domain controller"
+msgstr ""
+
+#: ../../libsmb/nterr.c:624
+msgid "Pipe broken"
+msgstr ""
+
+#: ../../libsmb/nterr.c:625
+msgid "Registry corrupt"
+msgstr ""
+
+#: ../../libsmb/nterr.c:626
+msgid "Too many secrets"
+msgstr ""
+
+#: ../../libsmb/nterr.c:627
+msgid "Too many SIDs"
+msgstr ""
+
+#: ../../libsmb/nterr.c:628
+msgid "Lanmanager cross encryption required"
+msgstr ""
+
+#: ../../libsmb/nterr.c:629
+msgid "Log file full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:630
+msgid "No trusted LSA secret"
+msgstr ""
+
+#: ../../libsmb/nterr.c:631
+#, fuzzy
+msgid "No trusted SAM account"
+msgstr "Ugyldig pålitelig konto"
+
+#: ../../libsmb/nterr.c:632
+msgid "Trusted domain failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:633
+msgid "Trust relationship failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:634
+msgid "Trust failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:635
+msgid "Netlogon service not started"
+msgstr ""
+
+#: ../../libsmb/nterr.c:636
+msgid "Account expired"
+msgstr ""
+
+#: ../../libsmb/nterr.c:637
+msgid "Network credential conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:638
+msgid "Remote session limit"
+msgstr ""
+
+#: ../../libsmb/nterr.c:639
+msgid "No logon interdomain trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:640
+msgid "No logon workstation trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:641
+#, fuzzy
+msgid "No logon server trust account"
+msgstr "Ingen innloggingsservere"
+
+#: ../../libsmb/nterr.c:642
+msgid "Domain trust inconsistent"
+msgstr ""
+
+#: ../../libsmb/nterr.c:643
+msgid "No user session key available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:644
+msgid "User session deleted"
+msgstr ""
+
+#: ../../libsmb/nterr.c:645
+msgid "Insufficient server resources"
+msgstr ""
+
+#: ../../libsmb/nterr.c:646
+msgid "Insufficient logon information"
+msgstr ""
+
+#: ../../libsmb/nterr.c:648
+msgid "License quota exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:649
+msgid "No more files"
+msgstr ""
diff --git a/source3/locale/pam_winbind/nl.po b/source3/locale/pam_winbind/nl.po
index e771e38ad31..9b064c56fdc 100644
--- a/source3/locale/pam_winbind/nl.po
+++ b/source3/locale/pam_winbind/nl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_winbind\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-16 15:30+0800\n"
+"POT-Creation-Date: 2010-03-06 01:55+0800\n"
 "PO-Revision-Date: 2009-02-05 08:00\n"
 "Last-Translator: Novell Language <language@novell.com>\n"
 "Language-Team: Novell Language <language@novell.com>\n"
@@ -13,141 +13,546 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../../nsswitch/pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:583 ../../libsmb/nterr.c:558
 msgid "Success"
 msgstr "Succes"
 
-#: ../../../nsswitch/pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:585
 msgid "No primary Domain Controler available"
 msgstr "Geen primaire domeincontroller beschikbaar"
 
-#: ../../../nsswitch/pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:587
 msgid "No domain controllers found"
 msgstr "Geen domeincontroller gevonden"
 
-#: ../../../nsswitch/pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:589 ../../libsmb/nterr.c:566
 msgid "No logon servers"
 msgstr "Geen aanmeldservers"
 
-#: ../../../nsswitch/pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:591
 msgid "Password too short"
 msgstr "Wachtwoord te kort"
 
-#: ../../../nsswitch/pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:593
 msgid "The password of this user is too recent to change"
 msgstr "Het wachtwoord van deze gebruiker is te recent om te wijzigen"
 
-#: ../../../nsswitch/pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:595
 msgid "Password is already in password history"
 msgstr "Wachtwoord zit al in de wachtwoordgeschiedenis"
 
-#: ../../../nsswitch/pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:597
 msgid "Your password has expired"
 msgstr "Uw wachtwoord is verlopen"
 
-#: ../../../nsswitch/pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:599
 msgid "You need to change your password now"
 msgstr "U moet uw wachtwoord nu wijzigen"
 
-#: ../../../nsswitch/pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:601
 msgid "You are not allowed to logon from this workstation"
 msgstr "U mag u vanaf dit werkstation niet aanmelden"
 
-#: ../../../nsswitch/pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:603
 msgid "You are not allowed to logon at this time"
 msgstr "U mag u op dit tijdstip niet aanmelden"
 
-#: ../../../nsswitch/pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:605
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "Uw account is verlopen. Neem contact op met uw systeembeheerder"
 
-#: ../../../nsswitch/pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:608
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "Uw account is uitgeschakeld. Neem contact op met de systeembeheerder"
 
-#: ../../../nsswitch/pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:611
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "Uw account is vergrendeld. Meen contact op met uw systeembeheerder"
 
-#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:614 ../../../nsswitch/pam_winbind.c:616 ../../../nsswitch/pam_winbind.c:618
 msgid "Invalid Trust Account"
 msgstr "Ongeldige vertrouwde account"
 
-#: ../../../nsswitch/pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:620
 msgid "Access is denied"
 msgstr "Toegang geweigerd"
 
-#: ../../../nsswitch/pam_winbind.c:592
-msgid "Your password expires today"
+#: ../../../nsswitch/pam_winbind.c:818
+#, fuzzy
+msgid "Do you want to change your password now?"
+msgstr "U moet uw wachtwoord nu wijzigen"
+
+#: ../../../nsswitch/pam_winbind.c:902
+#, fuzzy
+msgid "Your password expires today.\n"
 msgstr "Uw wachtwoord verloopt vandaag"
 
-#: ../../../nsswitch/pam_winbind.c:597
-#, c-format
-msgid "Your password will expire in %d %s"
+#: ../../../nsswitch/pam_winbind.c:932
+#, fuzzy, c-format
+msgid "Your password will expire in %d %s.\n"
 msgstr "Uw wachtwoord verloopt over %d %s"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "days"
 msgstr "dagen"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "day"
 msgstr "dag"
 
-#: ../../../nsswitch/pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:1169 ../../../nsswitch/pam_winbind.c:1193
+#, c-format
+msgid "Cannot convert group %s to sid, please contact your administrator to see if group %s is valid."
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1387
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "Dispensatie-aanmelding. Wijzig uw wachtwoord zodra u weer online bent"
 
-#: ../../../nsswitch/pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:1397
 msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable"
 msgstr "Domeincontroller is onbereikbaar. Uw gegevens uit de cache worden gebruikt. Netwerkrecources kunnen onbereikbaar zijn"
 
-#: ../../../nsswitch/pam_winbind.c:950
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1422
+msgid ""
+"Failed to establish your Kerberos Ticket cache due time differences\n"
+"with the domain controller.  Please verify the system time.\n"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1490
 msgid "Your password "
 msgstr "Uw wachtwoord "
 
-#: ../../../nsswitch/pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:1497
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "moet uit minstens %d tekens bestaan; "
 
-#: ../../../nsswitch/pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:1506
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "mag niet hetzelfde zijn als een van uw voorgaande %d wachtwoorden; "
 
-#: ../../../nsswitch/pam_winbind.c:977
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1516
 msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; "
 msgstr "moet hoofdletters, cijfers of bijzondere tekens bevatten; en mag niet uw accountnaam of volledige naam bevatten; "
 
-#: ../../../nsswitch/pam_winbind.c:986
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1526
 msgid "Please type a different password. Type a password which meets these requirements in both text boxes."
 msgstr "Geef een ander wachtwoord op. Typ een wachtwoord dat voldoet aan de vereisten in beide tekstblokken."
 
-#: ../../../nsswitch/pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1553
+#, c-format
+msgid "Creating directory: %s failed: %s"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2018
 msgid "Password does not meet complexity requirements"
 msgstr "Wachtwoord voldoet niet aan de complexiteitseisen"
 
-#: ../../../nsswitch/pam_winbind.c:1564
+#.
+#. * First get the name of a user
+#.
+#: ../../../nsswitch/pam_winbind.c:2489 ../../../nsswitch/pam_winbind.c:3035
+msgid "Username: "
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2665
 msgid "Password: "
 msgstr "Wachtwoord:"
 
-#: ../../../nsswitch/pam_winbind.c:2013
+#. instruct user what is happening
+#: ../../../nsswitch/pam_winbind.c:3073
 msgid "Changing password for"
 msgstr "Wachtwoord wijzigen voor"
 
-#: ../../../nsswitch/pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:3086
 msgid "(current) NT password: "
 msgstr "(huidig) NT-wachtwoord: "
 
-#: ../../../nsswitch/pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:3156
 msgid "Enter new NT password: "
 msgstr "Geef nieuw NT-wachtwoord: "
 
-#: ../../../nsswitch/pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:3157
 msgid "Retype new NT password: "
 msgstr "Nieuw NT-wachtwoord herhalen: "
 
+#.
+#. * here is the string to inform the user that the new passwords they
+#. * typed were not the same.
+#.
+#: ../../../nsswitch/pam_winbind.h:128
+msgid "Sorry, passwords do not match"
+msgstr ""
+
+#: ../../libsmb/nterr.c:559
+msgid "Undetermined error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:560
+#, fuzzy
+msgid "Access denied"
+msgstr "Toegang geweigerd"
+
+#: ../../libsmb/nterr.c:561
+msgid "Account locked out"
+msgstr ""
+
+#: ../../libsmb/nterr.c:562
+#, fuzzy
+msgid "Must change password"
+msgstr "U moet uw wachtwoord nu wijzigen"
+
+#: ../../libsmb/nterr.c:563
+#, fuzzy
+msgid "Password is too short"
+msgstr "Wachtwoord te kort"
+
+#: ../../libsmb/nterr.c:564
+#, fuzzy
+msgid "Password is too recent"
+msgstr "Wachtwoord te kort"
+
+#: ../../libsmb/nterr.c:565
+#, fuzzy
+msgid "Password history conflict"
+msgstr "Wachtwoord te kort"
+
+#: ../../libsmb/nterr.c:567
+msgid "Improperly formed account name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:568
+msgid "User exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:569
+msgid "No such user"
+msgstr ""
+
+#: ../../libsmb/nterr.c:570
+msgid "Group exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:571
+msgid "No such group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:572
+msgid "Member not in group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:573
+#, fuzzy
+msgid "Wrong Password"
+msgstr "Wachtwoord:"
+
+#: ../../libsmb/nterr.c:574
+#, fuzzy
+msgid "Ill formed password"
+msgstr "Uw wachtwoord "
+
+#: ../../libsmb/nterr.c:575
+#, fuzzy
+msgid "Password restriction"
+msgstr "Wachtwoord te kort"
+
+#: ../../libsmb/nterr.c:576
+msgid "Logon failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:577
+msgid "Account restriction"
+msgstr ""
+
+#: ../../libsmb/nterr.c:578
+msgid "Invalid logon hours"
+msgstr ""
+
+#: ../../libsmb/nterr.c:579
+#, fuzzy
+msgid "Invalid workstation"
+msgstr "Ongeldige vertrouwde account"
+
+#: ../../libsmb/nterr.c:580
+#, fuzzy
+msgid "Password expired"
+msgstr "Uw wachtwoord is verlopen"
+
+#: ../../libsmb/nterr.c:581
+msgid "Account disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:582
+msgid "Memory allocation error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:583
+#, fuzzy
+msgid "No domain controllers located"
+msgstr "Geen domeincontroller gevonden"
+
+#: ../../libsmb/nterr.c:584
+msgid "Named pipe not available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:585
+msgid "Not implemented"
+msgstr ""
+
+#: ../../libsmb/nterr.c:586
+msgid "Invalid information class"
+msgstr ""
+
+#: ../../libsmb/nterr.c:587
+msgid "Information length mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:588
+msgid "Access violation"
+msgstr ""
+
+#: ../../libsmb/nterr.c:589
+msgid "Invalid handle"
+msgstr ""
+
+#: ../../libsmb/nterr.c:590
+msgid "Invalid parameter"
+msgstr ""
+
+#: ../../libsmb/nterr.c:591
+msgid "No memory"
+msgstr ""
+
+#: ../../libsmb/nterr.c:592
+msgid "Buffer too small"
+msgstr ""
+
+#: ../../libsmb/nterr.c:593
+msgid "Revision mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:594
+#, fuzzy
+msgid "No such logon session"
+msgstr "Geen aanmeldservers"
+
+#: ../../libsmb/nterr.c:595
+msgid "No such privilege"
+msgstr ""
+
+#: ../../libsmb/nterr.c:596
+msgid "Procedure not found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:597
+msgid "Server disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:598
+msgid "Invalid pipe state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:599
+msgid "Named pipe busy"
+msgstr ""
+
+#: ../../libsmb/nterr.c:600
+msgid "Illegal function"
+msgstr ""
+
+#: ../../libsmb/nterr.c:601
+msgid "Named pipe dicconnected"
+msgstr ""
+
+#: ../../libsmb/nterr.c:602
+msgid "Named pipe closing"
+msgstr ""
+
+#: ../../libsmb/nterr.c:603
+msgid "Remote host not listening"
+msgstr ""
+
+#: ../../libsmb/nterr.c:604
+msgid "Duplicate name on network"
+msgstr ""
+
+#: ../../libsmb/nterr.c:605
+msgid "Print queue is full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:606
+#, fuzzy
+msgid "No print spool space available"
+msgstr "Geen primaire domeincontroller beschikbaar"
+
+#: ../../libsmb/nterr.c:607
+msgid "The network name cannot be found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:608
+msgid "The connection was refused"
+msgstr ""
+
+#: ../../libsmb/nterr.c:609
+msgid "Too many names"
+msgstr ""
+
+#: ../../libsmb/nterr.c:610
+msgid "Too many sessions"
+msgstr ""
+
+#: ../../libsmb/nterr.c:611
+msgid "Invalid server state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:612
+msgid "Invalid domain state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:613
+msgid "Invalid domain role"
+msgstr ""
+
+#: ../../libsmb/nterr.c:614
+msgid "No such domain"
+msgstr ""
+
+#: ../../libsmb/nterr.c:615
+msgid "Domain exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:616
+msgid "Domain limit exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:617
+msgid "Bad logon session state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:618
+msgid "Logon session collision"
+msgstr ""
+
+#: ../../libsmb/nterr.c:619
+msgid "Invalid logon type"
+msgstr ""
+
+#: ../../libsmb/nterr.c:620
+msgid "Cancelled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:621
+msgid "Invalid computer name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:622
+msgid "Logon server conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:623
+msgid "Time difference at domain controller"
+msgstr ""
+
+#: ../../libsmb/nterr.c:624
+msgid "Pipe broken"
+msgstr ""
+
+#: ../../libsmb/nterr.c:625
+msgid "Registry corrupt"
+msgstr ""
+
+#: ../../libsmb/nterr.c:626
+msgid "Too many secrets"
+msgstr ""
+
+#: ../../libsmb/nterr.c:627
+msgid "Too many SIDs"
+msgstr ""
+
+#: ../../libsmb/nterr.c:628
+msgid "Lanmanager cross encryption required"
+msgstr ""
+
+#: ../../libsmb/nterr.c:629
+msgid "Log file full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:630
+msgid "No trusted LSA secret"
+msgstr ""
+
+#: ../../libsmb/nterr.c:631
+#, fuzzy
+msgid "No trusted SAM account"
+msgstr "Ongeldige vertrouwde account"
+
+#: ../../libsmb/nterr.c:632
+msgid "Trusted domain failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:633
+msgid "Trust relationship failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:634
+msgid "Trust failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:635
+msgid "Netlogon service not started"
+msgstr ""
+
+#: ../../libsmb/nterr.c:636
+msgid "Account expired"
+msgstr ""
+
+#: ../../libsmb/nterr.c:637
+msgid "Network credential conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:638
+msgid "Remote session limit"
+msgstr ""
+
+#: ../../libsmb/nterr.c:639
+msgid "No logon interdomain trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:640
+msgid "No logon workstation trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:641
+#, fuzzy
+msgid "No logon server trust account"
+msgstr "Geen aanmeldservers"
+
+#: ../../libsmb/nterr.c:642
+msgid "Domain trust inconsistent"
+msgstr ""
+
+#: ../../libsmb/nterr.c:643
+msgid "No user session key available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:644
+msgid "User session deleted"
+msgstr ""
+
+#: ../../libsmb/nterr.c:645
+msgid "Insufficient server resources"
+msgstr ""
+
+#: ../../libsmb/nterr.c:646
+msgid "Insufficient logon information"
+msgstr ""
+
+#: ../../libsmb/nterr.c:648
+msgid "License quota exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:649
+msgid "No more files"
+msgstr ""
diff --git a/source3/locale/pam_winbind/pl.po b/source3/locale/pam_winbind/pl.po
index f3c08d86981..487c4d8113f 100644
--- a/source3/locale/pam_winbind/pl.po
+++ b/source3/locale/pam_winbind/pl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_winbind\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-16 15:30+0800\n"
+"POT-Creation-Date: 2010-03-06 01:55+0800\n"
 "PO-Revision-Date: 2009-02-13 18:27\n"
 "Last-Translator: Novell Language <language@novell.com>\n"
 "Language-Team: Novell Language <language@novell.com>\n"
@@ -13,141 +13,546 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../../nsswitch/pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:583 ../../libsmb/nterr.c:558
 msgid "Success"
 msgstr "Sukces"
 
-#: ../../../nsswitch/pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:585
 msgid "No primary Domain Controler available"
 msgstr "Brak podstawowego kontolera domeny"
 
-#: ../../../nsswitch/pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:587
 msgid "No domain controllers found"
 msgstr "Nie odnaleziono kontrolerów domen"
 
-#: ../../../nsswitch/pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:589 ../../libsmb/nterr.c:566
 msgid "No logon servers"
 msgstr "Brak serwerów logowania"
 
-#: ../../../nsswitch/pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:591
 msgid "Password too short"
 msgstr "Zbyt krótkie hasło"
 
-#: ../../../nsswitch/pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:593
 msgid "The password of this user is too recent to change"
 msgstr "Hasło tego użytkownika jest zbyt nowe, aby je zmienić"
 
-#: ../../../nsswitch/pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:595
 msgid "Password is already in password history"
 msgstr "Hasło znajduje się już w historii haseł."
 
-#: ../../../nsswitch/pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:597
 msgid "Your password has expired"
 msgstr "Hasło użytkownika wygasło"
 
-#: ../../../nsswitch/pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:599
 msgid "You need to change your password now"
 msgstr "Zmiana hasła jest wymagana w tej chwili"
 
-#: ../../../nsswitch/pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:601
 msgid "You are not allowed to logon from this workstation"
 msgstr "Brak zezwolenia na logowanie się z tej stacji roboczej"
 
-#: ../../../nsswitch/pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:603
 msgid "You are not allowed to logon at this time"
 msgstr "Brak zezwolenia na logowanie się w tej chwili"
 
-#: ../../../nsswitch/pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:605
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "To konto wygasło. Proszę skontaktować się z administratorem systemu."
 
-#: ../../../nsswitch/pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:608
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "To konto zostało wyłączone. Proszę skontaktować się z administratorem systemu."
 
-#: ../../../nsswitch/pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:611
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "To konto zostało zablokowane. Proszę skontaktować się z administratorem systemu."
 
-#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:614 ../../../nsswitch/pam_winbind.c:616 ../../../nsswitch/pam_winbind.c:618
 msgid "Invalid Trust Account"
 msgstr "Nieprawidłowe zaufane konto"
 
-#: ../../../nsswitch/pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:620
 msgid "Access is denied"
 msgstr "Brak dostępu"
 
-#: ../../../nsswitch/pam_winbind.c:592
-msgid "Your password expires today"
+#: ../../../nsswitch/pam_winbind.c:818
+#, fuzzy
+msgid "Do you want to change your password now?"
+msgstr "Zmiana hasła jest wymagana w tej chwili"
+
+#: ../../../nsswitch/pam_winbind.c:902
+#, fuzzy
+msgid "Your password expires today.\n"
 msgstr "Hasło użytkownika wygasa dzisiaj"
 
-#: ../../../nsswitch/pam_winbind.c:597
-#, c-format
-msgid "Your password will expire in %d %s"
+#: ../../../nsswitch/pam_winbind.c:932
+#, fuzzy, c-format
+msgid "Your password will expire in %d %s.\n"
 msgstr "Hasło użytkownika wygaśnie za %d %s."
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "days"
 msgstr "dni"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "day"
 msgstr "dzień"
 
-#: ../../../nsswitch/pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:1169 ../../../nsswitch/pam_winbind.c:1193
+#, c-format
+msgid "Cannot convert group %s to sid, please contact your administrator to see if group %s is valid."
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1387
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "Logowanie dodatkowe. Proszę zmienić swoje hasło przy następnym wejściu w tryb online."
 
-#: ../../../nsswitch/pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:1397
 msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable"
 msgstr "Kontroler domeny jest nieosiągalny, zamiast tego używane są zapisane wcześniej dane. Zasoby sieciowe mogą być niedostępne."
 
-#: ../../../nsswitch/pam_winbind.c:950
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1422
+msgid ""
+"Failed to establish your Kerberos Ticket cache due time differences\n"
+"with the domain controller.  Please verify the system time.\n"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1490
 msgid "Your password "
 msgstr "Hasło użytkownika "
 
-#: ../../../nsswitch/pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:1497
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "musi mieć co najmniej %d znaków; "
 
-#: ../../../nsswitch/pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:1506
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "nie można powtarzać żadnego z poprzednich %d haseł, "
 
-#: ../../../nsswitch/pam_winbind.c:977
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1516
 msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; "
 msgstr "musi zawierać litery, cyfry lub znaki interpunkcyjne i nie może zawierać nazwy konta lub nazwiska; "
 
-#: ../../../nsswitch/pam_winbind.c:986
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1526
 msgid "Please type a different password. Type a password which meets these requirements in both text boxes."
 msgstr "Proszę wprowadzić inne hasło. Proszę wpisać w oba pola tekstowe hasło, które spełnia te wymagania."
 
-#: ../../../nsswitch/pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1553
+#, c-format
+msgid "Creating directory: %s failed: %s"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2018
 msgid "Password does not meet complexity requirements"
 msgstr "Hasło nie spełnia wymagań złożoności"
 
-#: ../../../nsswitch/pam_winbind.c:1564
+#.
+#. * First get the name of a user
+#.
+#: ../../../nsswitch/pam_winbind.c:2489 ../../../nsswitch/pam_winbind.c:3035
+msgid "Username: "
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2665
 msgid "Password: "
 msgstr "Hasło: "
 
-#: ../../../nsswitch/pam_winbind.c:2013
+#. instruct user what is happening
+#: ../../../nsswitch/pam_winbind.c:3073
 msgid "Changing password for"
 msgstr "Zmiana hasła dla"
 
-#: ../../../nsswitch/pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:3086
 msgid "(current) NT password: "
 msgstr "(aktualne) hasło NT: "
 
-#: ../../../nsswitch/pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:3156
 msgid "Enter new NT password: "
 msgstr "Prosze podać nowe hasło NT: "
 
-#: ../../../nsswitch/pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:3157
 msgid "Retype new NT password: "
 msgstr "Powtórzenie nowego hasła NT: "
 
+#.
+#. * here is the string to inform the user that the new passwords they
+#. * typed were not the same.
+#.
+#: ../../../nsswitch/pam_winbind.h:128
+msgid "Sorry, passwords do not match"
+msgstr ""
+
+#: ../../libsmb/nterr.c:559
+msgid "Undetermined error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:560
+#, fuzzy
+msgid "Access denied"
+msgstr "Brak dostępu"
+
+#: ../../libsmb/nterr.c:561
+msgid "Account locked out"
+msgstr ""
+
+#: ../../libsmb/nterr.c:562
+#, fuzzy
+msgid "Must change password"
+msgstr "Zmiana hasła jest wymagana w tej chwili"
+
+#: ../../libsmb/nterr.c:563
+#, fuzzy
+msgid "Password is too short"
+msgstr "Zbyt krótkie hasło"
+
+#: ../../libsmb/nterr.c:564
+#, fuzzy
+msgid "Password is too recent"
+msgstr "Zbyt krótkie hasło"
+
+#: ../../libsmb/nterr.c:565
+#, fuzzy
+msgid "Password history conflict"
+msgstr "Zbyt krótkie hasło"
+
+#: ../../libsmb/nterr.c:567
+msgid "Improperly formed account name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:568
+msgid "User exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:569
+msgid "No such user"
+msgstr ""
+
+#: ../../libsmb/nterr.c:570
+msgid "Group exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:571
+msgid "No such group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:572
+msgid "Member not in group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:573
+#, fuzzy
+msgid "Wrong Password"
+msgstr "Hasło: "
+
+#: ../../libsmb/nterr.c:574
+#, fuzzy
+msgid "Ill formed password"
+msgstr "Hasło użytkownika "
+
+#: ../../libsmb/nterr.c:575
+#, fuzzy
+msgid "Password restriction"
+msgstr "Zbyt krótkie hasło"
+
+#: ../../libsmb/nterr.c:576
+msgid "Logon failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:577
+msgid "Account restriction"
+msgstr ""
+
+#: ../../libsmb/nterr.c:578
+msgid "Invalid logon hours"
+msgstr ""
+
+#: ../../libsmb/nterr.c:579
+#, fuzzy
+msgid "Invalid workstation"
+msgstr "Nieprawidłowe zaufane konto"
+
+#: ../../libsmb/nterr.c:580
+#, fuzzy
+msgid "Password expired"
+msgstr "Hasło użytkownika wygasło"
+
+#: ../../libsmb/nterr.c:581
+msgid "Account disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:582
+msgid "Memory allocation error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:583
+#, fuzzy
+msgid "No domain controllers located"
+msgstr "Nie odnaleziono kontrolerów domen"
+
+#: ../../libsmb/nterr.c:584
+msgid "Named pipe not available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:585
+msgid "Not implemented"
+msgstr ""
+
+#: ../../libsmb/nterr.c:586
+msgid "Invalid information class"
+msgstr ""
+
+#: ../../libsmb/nterr.c:587
+msgid "Information length mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:588
+msgid "Access violation"
+msgstr ""
+
+#: ../../libsmb/nterr.c:589
+msgid "Invalid handle"
+msgstr ""
+
+#: ../../libsmb/nterr.c:590
+msgid "Invalid parameter"
+msgstr ""
+
+#: ../../libsmb/nterr.c:591
+msgid "No memory"
+msgstr ""
+
+#: ../../libsmb/nterr.c:592
+msgid "Buffer too small"
+msgstr ""
+
+#: ../../libsmb/nterr.c:593
+msgid "Revision mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:594
+#, fuzzy
+msgid "No such logon session"
+msgstr "Brak serwerów logowania"
+
+#: ../../libsmb/nterr.c:595
+msgid "No such privilege"
+msgstr ""
+
+#: ../../libsmb/nterr.c:596
+msgid "Procedure not found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:597
+msgid "Server disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:598
+msgid "Invalid pipe state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:599
+msgid "Named pipe busy"
+msgstr ""
+
+#: ../../libsmb/nterr.c:600
+msgid "Illegal function"
+msgstr ""
+
+#: ../../libsmb/nterr.c:601
+msgid "Named pipe dicconnected"
+msgstr ""
+
+#: ../../libsmb/nterr.c:602
+msgid "Named pipe closing"
+msgstr ""
+
+#: ../../libsmb/nterr.c:603
+msgid "Remote host not listening"
+msgstr ""
+
+#: ../../libsmb/nterr.c:604
+msgid "Duplicate name on network"
+msgstr ""
+
+#: ../../libsmb/nterr.c:605
+msgid "Print queue is full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:606
+#, fuzzy
+msgid "No print spool space available"
+msgstr "Brak podstawowego kontolera domeny"
+
+#: ../../libsmb/nterr.c:607
+msgid "The network name cannot be found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:608
+msgid "The connection was refused"
+msgstr ""
+
+#: ../../libsmb/nterr.c:609
+msgid "Too many names"
+msgstr ""
+
+#: ../../libsmb/nterr.c:610
+msgid "Too many sessions"
+msgstr ""
+
+#: ../../libsmb/nterr.c:611
+msgid "Invalid server state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:612
+msgid "Invalid domain state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:613
+msgid "Invalid domain role"
+msgstr ""
+
+#: ../../libsmb/nterr.c:614
+msgid "No such domain"
+msgstr ""
+
+#: ../../libsmb/nterr.c:615
+msgid "Domain exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:616
+msgid "Domain limit exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:617
+msgid "Bad logon session state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:618
+msgid "Logon session collision"
+msgstr ""
+
+#: ../../libsmb/nterr.c:619
+msgid "Invalid logon type"
+msgstr ""
+
+#: ../../libsmb/nterr.c:620
+msgid "Cancelled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:621
+msgid "Invalid computer name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:622
+msgid "Logon server conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:623
+msgid "Time difference at domain controller"
+msgstr ""
+
+#: ../../libsmb/nterr.c:624
+msgid "Pipe broken"
+msgstr ""
+
+#: ../../libsmb/nterr.c:625
+msgid "Registry corrupt"
+msgstr ""
+
+#: ../../libsmb/nterr.c:626
+msgid "Too many secrets"
+msgstr ""
+
+#: ../../libsmb/nterr.c:627
+msgid "Too many SIDs"
+msgstr ""
+
+#: ../../libsmb/nterr.c:628
+msgid "Lanmanager cross encryption required"
+msgstr ""
+
+#: ../../libsmb/nterr.c:629
+msgid "Log file full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:630
+msgid "No trusted LSA secret"
+msgstr ""
+
+#: ../../libsmb/nterr.c:631
+#, fuzzy
+msgid "No trusted SAM account"
+msgstr "Nieprawidłowe zaufane konto"
+
+#: ../../libsmb/nterr.c:632
+msgid "Trusted domain failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:633
+msgid "Trust relationship failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:634
+msgid "Trust failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:635
+msgid "Netlogon service not started"
+msgstr ""
+
+#: ../../libsmb/nterr.c:636
+msgid "Account expired"
+msgstr ""
+
+#: ../../libsmb/nterr.c:637
+msgid "Network credential conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:638
+msgid "Remote session limit"
+msgstr ""
+
+#: ../../libsmb/nterr.c:639
+msgid "No logon interdomain trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:640
+msgid "No logon workstation trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:641
+#, fuzzy
+msgid "No logon server trust account"
+msgstr "Brak serwerów logowania"
+
+#: ../../libsmb/nterr.c:642
+msgid "Domain trust inconsistent"
+msgstr ""
+
+#: ../../libsmb/nterr.c:643
+msgid "No user session key available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:644
+msgid "User session deleted"
+msgstr ""
+
+#: ../../libsmb/nterr.c:645
+msgid "Insufficient server resources"
+msgstr ""
+
+#: ../../libsmb/nterr.c:646
+msgid "Insufficient logon information"
+msgstr ""
+
+#: ../../libsmb/nterr.c:648
+msgid "License quota exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:649
+msgid "No more files"
+msgstr ""
diff --git a/source3/locale/pam_winbind/pt_BR.po b/source3/locale/pam_winbind/pt_BR.po
index 456f6fbe62b..436db056c5d 100644
--- a/source3/locale/pam_winbind/pt_BR.po
+++ b/source3/locale/pam_winbind/pt_BR.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_winbind\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-16 15:30+0800\n"
+"POT-Creation-Date: 2010-03-06 01:55+0800\n"
 "PO-Revision-Date: 2009-02-05 09:28\n"
 "Last-Translator: Novell Language <language@novell.com>\n"
 "Language-Team: Novell Language <language@novell.com>\n"
@@ -13,141 +13,546 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../../nsswitch/pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:583 ../../libsmb/nterr.c:558
 msgid "Success"
 msgstr "Sucesso"
 
-#: ../../../nsswitch/pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:585
 msgid "No primary Domain Controler available"
 msgstr "Nenhum Controlador de Domínio primário disponível"
 
-#: ../../../nsswitch/pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:587
 msgid "No domain controllers found"
 msgstr "Nenhum controlador de domínio encontrado"
 
-#: ../../../nsswitch/pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:589 ../../libsmb/nterr.c:566
 msgid "No logon servers"
 msgstr "Nenhum servidor de logon"
 
-#: ../../../nsswitch/pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:591
 msgid "Password too short"
 msgstr "Senha muito curta"
 
-#: ../../../nsswitch/pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:593
 msgid "The password of this user is too recent to change"
 msgstr "A senha deste usuário é muito recente para ser alterada"
 
-#: ../../../nsswitch/pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:595
 msgid "Password is already in password history"
 msgstr "A senha já está no histórico de senhas"
 
-#: ../../../nsswitch/pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:597
 msgid "Your password has expired"
 msgstr "Sua senha expirou"
 
-#: ../../../nsswitch/pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:599
 msgid "You need to change your password now"
 msgstr "Você precisa alterar sua senha agora"
 
-#: ../../../nsswitch/pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:601
 msgid "You are not allowed to logon from this workstation"
 msgstr "Você não tem autorização para efetuar login a partir desta estação de trabalho"
 
-#: ../../../nsswitch/pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:603
 msgid "You are not allowed to logon at this time"
 msgstr "Você não tem autorização para efetuar login agora"
 
-#: ../../../nsswitch/pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:605
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "Sua conta expirou. Entre em contato com o administrador do sistema"
 
-#: ../../../nsswitch/pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:608
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "Sua conta está desabilitada. Entre em contato com o administrador do sistema"
 
-#: ../../../nsswitch/pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:611
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "Sua conta foi bloqueada. Entre em contato com o administrador do sistema"
 
-#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:614 ../../../nsswitch/pam_winbind.c:616 ../../../nsswitch/pam_winbind.c:618
 msgid "Invalid Trust Account"
 msgstr "Conta Confiável Inválida"
 
-#: ../../../nsswitch/pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:620
 msgid "Access is denied"
 msgstr "O acesso foi negado"
 
-#: ../../../nsswitch/pam_winbind.c:592
-msgid "Your password expires today"
+#: ../../../nsswitch/pam_winbind.c:818
+#, fuzzy
+msgid "Do you want to change your password now?"
+msgstr "Você precisa alterar sua senha agora"
+
+#: ../../../nsswitch/pam_winbind.c:902
+#, fuzzy
+msgid "Your password expires today.\n"
 msgstr "Sua senha expira hoje"
 
-#: ../../../nsswitch/pam_winbind.c:597
-#, c-format
-msgid "Your password will expire in %d %s"
+#: ../../../nsswitch/pam_winbind.c:932
+#, fuzzy, c-format
+msgid "Your password will expire in %d %s.\n"
 msgstr "Sua senha expirará em %d %s."
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "days"
 msgstr "dias"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "day"
 msgstr "dia"
 
-#: ../../../nsswitch/pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:1169 ../../../nsswitch/pam_winbind.c:1193
+#, c-format
+msgid "Cannot convert group %s to sid, please contact your administrator to see if group %s is valid."
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1387
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "Login extra. Altere sua senha assim que você ficar online novamente"
 
-#: ../../../nsswitch/pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:1397
 msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable"
 msgstr "Controlador de domínio inacessível, usando no lugar dele credencias em cache. Os recursos de rede podem estar indisponíveis"
 
-#: ../../../nsswitch/pam_winbind.c:950
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1422
+msgid ""
+"Failed to establish your Kerberos Ticket cache due time differences\n"
+"with the domain controller.  Please verify the system time.\n"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1490
 msgid "Your password "
 msgstr "Sua senha"
 
-#: ../../../nsswitch/pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:1497
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "deve ter no mínimo %d caracteres;"
 
-#: ../../../nsswitch/pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:1506
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "não é permitido repetir quaisquer das suas %d senhas anteriores;"
 
-#: ../../../nsswitch/pam_winbind.c:977
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1516
 msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; "
 msgstr "deve conter maiúsculas, números ou pontuação e não pode conter o nome de sua conta nem seu nome completo;"
 
-#: ../../../nsswitch/pam_winbind.c:986
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1526
 msgid "Please type a different password. Type a password which meets these requirements in both text boxes."
 msgstr "Digite uma senha diferente. Digite uma senha que atenda a estes requisitos em ambas as caixas de texto."
 
-#: ../../../nsswitch/pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1553
+#, c-format
+msgid "Creating directory: %s failed: %s"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2018
 msgid "Password does not meet complexity requirements"
 msgstr "A senha não atende aos requisitos de complexidade"
 
-#: ../../../nsswitch/pam_winbind.c:1564
+#.
+#. * First get the name of a user
+#.
+#: ../../../nsswitch/pam_winbind.c:2489 ../../../nsswitch/pam_winbind.c:3035
+msgid "Username: "
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2665
 msgid "Password: "
 msgstr "Senha:"
 
-#: ../../../nsswitch/pam_winbind.c:2013
+#. instruct user what is happening
+#: ../../../nsswitch/pam_winbind.c:3073
 msgid "Changing password for"
 msgstr "Alterando a senha para"
 
-#: ../../../nsswitch/pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:3086
 msgid "(current) NT password: "
 msgstr "(atual) senha NT:"
 
-#: ../../../nsswitch/pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:3156
 msgid "Enter new NT password: "
 msgstr "Digite a nova senha NT:"
 
-#: ../../../nsswitch/pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:3157
 msgid "Retype new NT password: "
 msgstr "Redigite a nova senha NT:"
 
+#.
+#. * here is the string to inform the user that the new passwords they
+#. * typed were not the same.
+#.
+#: ../../../nsswitch/pam_winbind.h:128
+msgid "Sorry, passwords do not match"
+msgstr ""
+
+#: ../../libsmb/nterr.c:559
+msgid "Undetermined error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:560
+#, fuzzy
+msgid "Access denied"
+msgstr "O acesso foi negado"
+
+#: ../../libsmb/nterr.c:561
+msgid "Account locked out"
+msgstr ""
+
+#: ../../libsmb/nterr.c:562
+#, fuzzy
+msgid "Must change password"
+msgstr "Você precisa alterar sua senha agora"
+
+#: ../../libsmb/nterr.c:563
+#, fuzzy
+msgid "Password is too short"
+msgstr "Senha muito curta"
+
+#: ../../libsmb/nterr.c:564
+#, fuzzy
+msgid "Password is too recent"
+msgstr "Senha muito curta"
+
+#: ../../libsmb/nterr.c:565
+#, fuzzy
+msgid "Password history conflict"
+msgstr "Senha muito curta"
+
+#: ../../libsmb/nterr.c:567
+msgid "Improperly formed account name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:568
+msgid "User exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:569
+msgid "No such user"
+msgstr ""
+
+#: ../../libsmb/nterr.c:570
+msgid "Group exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:571
+msgid "No such group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:572
+msgid "Member not in group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:573
+#, fuzzy
+msgid "Wrong Password"
+msgstr "Senha:"
+
+#: ../../libsmb/nterr.c:574
+#, fuzzy
+msgid "Ill formed password"
+msgstr "Sua senha"
+
+#: ../../libsmb/nterr.c:575
+#, fuzzy
+msgid "Password restriction"
+msgstr "Senha muito curta"
+
+#: ../../libsmb/nterr.c:576
+msgid "Logon failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:577
+msgid "Account restriction"
+msgstr ""
+
+#: ../../libsmb/nterr.c:578
+msgid "Invalid logon hours"
+msgstr ""
+
+#: ../../libsmb/nterr.c:579
+#, fuzzy
+msgid "Invalid workstation"
+msgstr "Conta Confiável Inválida"
+
+#: ../../libsmb/nterr.c:580
+#, fuzzy
+msgid "Password expired"
+msgstr "Sua senha expirou"
+
+#: ../../libsmb/nterr.c:581
+msgid "Account disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:582
+msgid "Memory allocation error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:583
+#, fuzzy
+msgid "No domain controllers located"
+msgstr "Nenhum controlador de domínio encontrado"
+
+#: ../../libsmb/nterr.c:584
+msgid "Named pipe not available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:585
+msgid "Not implemented"
+msgstr ""
+
+#: ../../libsmb/nterr.c:586
+msgid "Invalid information class"
+msgstr ""
+
+#: ../../libsmb/nterr.c:587
+msgid "Information length mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:588
+msgid "Access violation"
+msgstr ""
+
+#: ../../libsmb/nterr.c:589
+msgid "Invalid handle"
+msgstr ""
+
+#: ../../libsmb/nterr.c:590
+msgid "Invalid parameter"
+msgstr ""
+
+#: ../../libsmb/nterr.c:591
+msgid "No memory"
+msgstr ""
+
+#: ../../libsmb/nterr.c:592
+msgid "Buffer too small"
+msgstr ""
+
+#: ../../libsmb/nterr.c:593
+msgid "Revision mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:594
+#, fuzzy
+msgid "No such logon session"
+msgstr "Nenhum servidor de logon"
+
+#: ../../libsmb/nterr.c:595
+msgid "No such privilege"
+msgstr ""
+
+#: ../../libsmb/nterr.c:596
+msgid "Procedure not found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:597
+msgid "Server disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:598
+msgid "Invalid pipe state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:599
+msgid "Named pipe busy"
+msgstr ""
+
+#: ../../libsmb/nterr.c:600
+msgid "Illegal function"
+msgstr ""
+
+#: ../../libsmb/nterr.c:601
+msgid "Named pipe dicconnected"
+msgstr ""
+
+#: ../../libsmb/nterr.c:602
+msgid "Named pipe closing"
+msgstr ""
+
+#: ../../libsmb/nterr.c:603
+msgid "Remote host not listening"
+msgstr ""
+
+#: ../../libsmb/nterr.c:604
+msgid "Duplicate name on network"
+msgstr ""
+
+#: ../../libsmb/nterr.c:605
+msgid "Print queue is full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:606
+#, fuzzy
+msgid "No print spool space available"
+msgstr "Nenhum Controlador de Domínio primário disponível"
+
+#: ../../libsmb/nterr.c:607
+msgid "The network name cannot be found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:608
+msgid "The connection was refused"
+msgstr ""
+
+#: ../../libsmb/nterr.c:609
+msgid "Too many names"
+msgstr ""
+
+#: ../../libsmb/nterr.c:610
+msgid "Too many sessions"
+msgstr ""
+
+#: ../../libsmb/nterr.c:611
+msgid "Invalid server state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:612
+msgid "Invalid domain state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:613
+msgid "Invalid domain role"
+msgstr ""
+
+#: ../../libsmb/nterr.c:614
+msgid "No such domain"
+msgstr ""
+
+#: ../../libsmb/nterr.c:615
+msgid "Domain exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:616
+msgid "Domain limit exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:617
+msgid "Bad logon session state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:618
+msgid "Logon session collision"
+msgstr ""
+
+#: ../../libsmb/nterr.c:619
+msgid "Invalid logon type"
+msgstr ""
+
+#: ../../libsmb/nterr.c:620
+msgid "Cancelled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:621
+msgid "Invalid computer name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:622
+msgid "Logon server conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:623
+msgid "Time difference at domain controller"
+msgstr ""
+
+#: ../../libsmb/nterr.c:624
+msgid "Pipe broken"
+msgstr ""
+
+#: ../../libsmb/nterr.c:625
+msgid "Registry corrupt"
+msgstr ""
+
+#: ../../libsmb/nterr.c:626
+msgid "Too many secrets"
+msgstr ""
+
+#: ../../libsmb/nterr.c:627
+msgid "Too many SIDs"
+msgstr ""
+
+#: ../../libsmb/nterr.c:628
+msgid "Lanmanager cross encryption required"
+msgstr ""
+
+#: ../../libsmb/nterr.c:629
+msgid "Log file full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:630
+msgid "No trusted LSA secret"
+msgstr ""
+
+#: ../../libsmb/nterr.c:631
+#, fuzzy
+msgid "No trusted SAM account"
+msgstr "Conta Confiável Inválida"
+
+#: ../../libsmb/nterr.c:632
+msgid "Trusted domain failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:633
+msgid "Trust relationship failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:634
+msgid "Trust failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:635
+msgid "Netlogon service not started"
+msgstr ""
+
+#: ../../libsmb/nterr.c:636
+msgid "Account expired"
+msgstr ""
+
+#: ../../libsmb/nterr.c:637
+msgid "Network credential conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:638
+msgid "Remote session limit"
+msgstr ""
+
+#: ../../libsmb/nterr.c:639
+msgid "No logon interdomain trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:640
+msgid "No logon workstation trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:641
+#, fuzzy
+msgid "No logon server trust account"
+msgstr "Nenhum servidor de logon"
+
+#: ../../libsmb/nterr.c:642
+msgid "Domain trust inconsistent"
+msgstr ""
+
+#: ../../libsmb/nterr.c:643
+msgid "No user session key available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:644
+msgid "User session deleted"
+msgstr ""
+
+#: ../../libsmb/nterr.c:645
+msgid "Insufficient server resources"
+msgstr ""
+
+#: ../../libsmb/nterr.c:646
+msgid "Insufficient logon information"
+msgstr ""
+
+#: ../../libsmb/nterr.c:648
+msgid "License quota exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:649
+msgid "No more files"
+msgstr ""
diff --git a/source3/locale/pam_winbind/ru.po b/source3/locale/pam_winbind/ru.po
index 73b91e414f8..117ac6c1609 100644
--- a/source3/locale/pam_winbind/ru.po
+++ b/source3/locale/pam_winbind/ru.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_winbind\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-16 15:30+0800\n"
+"POT-Creation-Date: 2010-03-06 01:55+0800\n"
 "PO-Revision-Date: 2009-02-05 08:14\n"
 "Last-Translator: Novell Language <language@novell.com>\n"
 "Language-Team: Novell Language <language@novell.com>\n"
@@ -13,141 +13,546 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../../nsswitch/pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:583 ../../libsmb/nterr.c:558
 msgid "Success"
 msgstr "успешно"
 
-#: ../../../nsswitch/pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:585
 msgid "No primary Domain Controler available"
 msgstr "Нет доступных основных контроллеров домена"
 
-#: ../../../nsswitch/pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:587
 msgid "No domain controllers found"
 msgstr "Контроллеры домена не найдены"
 
-#: ../../../nsswitch/pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:589 ../../libsmb/nterr.c:566
 msgid "No logon servers"
 msgstr "Нет серверов входа"
 
-#: ../../../nsswitch/pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:591
 msgid "Password too short"
 msgstr "Пароль слишком короткий"
 
-#: ../../../nsswitch/pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:593
 msgid "The password of this user is too recent to change"
 msgstr "Пароль этого пользователя слишком новый, чтобы его менять"
 
-#: ../../../nsswitch/pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:595
 msgid "Password is already in password history"
 msgstr "Пароль уже в истории паролей"
 
-#: ../../../nsswitch/pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:597
 msgid "Your password has expired"
 msgstr "Срок действия Вашего пароля истёк"
 
-#: ../../../nsswitch/pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:599
 msgid "You need to change your password now"
 msgstr "Вам необходимо изменить Ваш пароль сейчас"
 
-#: ../../../nsswitch/pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:601
 msgid "You are not allowed to logon from this workstation"
 msgstr "Вам не разрешается входить с этой рабочей станции"
 
-#: ../../../nsswitch/pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:603
 msgid "You are not allowed to logon at this time"
 msgstr "Вам не разрешается входить в это время"
 
-#: ../../../nsswitch/pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:605
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "Срок действия Вашей учетной записи истёк. Пожалуйста, обратитесь к системному администратору"
 
-#: ../../../nsswitch/pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:608
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "Ваша учетная запись заблокирована. Обратитесь к системному администратору"
 
-#: ../../../nsswitch/pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:611
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "Ваша учётная запись заблокирована. Пожалуйста, обратитесь к системному администратору"
 
-#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:614 ../../../nsswitch/pam_winbind.c:616 ../../../nsswitch/pam_winbind.c:618
 msgid "Invalid Trust Account"
 msgstr "Неверная доверенная учётная запись"
 
-#: ../../../nsswitch/pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:620
 msgid "Access is denied"
 msgstr "Доступ запрещён"
 
-#: ../../../nsswitch/pam_winbind.c:592
-msgid "Your password expires today"
+#: ../../../nsswitch/pam_winbind.c:818
+#, fuzzy
+msgid "Do you want to change your password now?"
+msgstr "Вам необходимо изменить Ваш пароль сейчас"
+
+#: ../../../nsswitch/pam_winbind.c:902
+#, fuzzy
+msgid "Your password expires today.\n"
 msgstr "Срок действия Вашего пароля истекает сегодня"
 
-#: ../../../nsswitch/pam_winbind.c:597
-#, c-format
-msgid "Your password will expire in %d %s"
+#: ../../../nsswitch/pam_winbind.c:932
+#, fuzzy, c-format
+msgid "Your password will expire in %d %s.\n"
 msgstr "Срок действия Вашего пароля истечёт через %d %s"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "days"
 msgstr "Дней"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "day"
 msgstr "День"
 
-#: ../../../nsswitch/pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:1169 ../../../nsswitch/pam_winbind.c:1193
+#, c-format
+msgid "Cannot convert group %s to sid, please contact your administrator to see if group %s is valid."
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1387
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "Вход разрешён. Пожалуйста, измените Ваш пароль, как только Вы снова будете в сети"
 
-#: ../../../nsswitch/pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:1397
 msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable"
 msgstr "Контроллер домена недоступен, используются кэшированные учетные данные входа. Сетевые ресурсы могут быть недоступны"
 
-#: ../../../nsswitch/pam_winbind.c:950
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1422
+msgid ""
+"Failed to establish your Kerberos Ticket cache due time differences\n"
+"with the domain controller.  Please verify the system time.\n"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1490
 msgid "Your password "
 msgstr "Ваш пароль "
 
-#: ../../../nsswitch/pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:1497
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "должен иметь хотя бы %d символов;"
 
-#: ../../../nsswitch/pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:1506
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "не может повторять любой из ваших предыдущих %d паролей;"
 
-#: ../../../nsswitch/pam_winbind.c:977
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1516
 msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; "
 msgstr "должен содержать заглавные буквы, цифры или знаки препинания; и не может содержать Вашу учётную запись или полное имя; "
 
-#: ../../../nsswitch/pam_winbind.c:986
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1526
 msgid "Please type a different password. Type a password which meets these requirements in both text boxes."
 msgstr "Пожалуйста, введите другой пароль. Введите пароль, соответствующий этим требованиям, в оба текстовых поля."
 
-#: ../../../nsswitch/pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1553
+#, c-format
+msgid "Creating directory: %s failed: %s"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2018
 msgid "Password does not meet complexity requirements"
 msgstr "Пароль не соответствует требованиям сложности"
 
-#: ../../../nsswitch/pam_winbind.c:1564
+#.
+#. * First get the name of a user
+#.
+#: ../../../nsswitch/pam_winbind.c:2489 ../../../nsswitch/pam_winbind.c:3035
+msgid "Username: "
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2665
 msgid "Password: "
 msgstr "Пароль:"
 
-#: ../../../nsswitch/pam_winbind.c:2013
+#. instruct user what is happening
+#: ../../../nsswitch/pam_winbind.c:3073
 msgid "Changing password for"
 msgstr "Изменение пароля для"
 
-#: ../../../nsswitch/pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:3086
 msgid "(current) NT password: "
 msgstr "(текущий) пароль NT: "
 
-#: ../../../nsswitch/pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:3156
 msgid "Enter new NT password: "
 msgstr "Введите новый пароль NT: "
 
-#: ../../../nsswitch/pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:3157
 msgid "Retype new NT password: "
 msgstr "Повторите новый пароль NT: "
 
+#.
+#. * here is the string to inform the user that the new passwords they
+#. * typed were not the same.
+#.
+#: ../../../nsswitch/pam_winbind.h:128
+msgid "Sorry, passwords do not match"
+msgstr ""
+
+#: ../../libsmb/nterr.c:559
+msgid "Undetermined error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:560
+#, fuzzy
+msgid "Access denied"
+msgstr "Доступ запрещён"
+
+#: ../../libsmb/nterr.c:561
+msgid "Account locked out"
+msgstr ""
+
+#: ../../libsmb/nterr.c:562
+#, fuzzy
+msgid "Must change password"
+msgstr "Вам необходимо изменить Ваш пароль сейчас"
+
+#: ../../libsmb/nterr.c:563
+#, fuzzy
+msgid "Password is too short"
+msgstr "Пароль слишком короткий"
+
+#: ../../libsmb/nterr.c:564
+#, fuzzy
+msgid "Password is too recent"
+msgstr "Пароль слишком короткий"
+
+#: ../../libsmb/nterr.c:565
+#, fuzzy
+msgid "Password history conflict"
+msgstr "Пароль слишком короткий"
+
+#: ../../libsmb/nterr.c:567
+msgid "Improperly formed account name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:568
+msgid "User exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:569
+msgid "No such user"
+msgstr ""
+
+#: ../../libsmb/nterr.c:570
+msgid "Group exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:571
+msgid "No such group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:572
+msgid "Member not in group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:573
+#, fuzzy
+msgid "Wrong Password"
+msgstr "Пароль:"
+
+#: ../../libsmb/nterr.c:574
+#, fuzzy
+msgid "Ill formed password"
+msgstr "Ваш пароль "
+
+#: ../../libsmb/nterr.c:575
+#, fuzzy
+msgid "Password restriction"
+msgstr "Пароль слишком короткий"
+
+#: ../../libsmb/nterr.c:576
+msgid "Logon failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:577
+msgid "Account restriction"
+msgstr ""
+
+#: ../../libsmb/nterr.c:578
+msgid "Invalid logon hours"
+msgstr ""
+
+#: ../../libsmb/nterr.c:579
+#, fuzzy
+msgid "Invalid workstation"
+msgstr "Неверная доверенная учётная запись"
+
+#: ../../libsmb/nterr.c:580
+#, fuzzy
+msgid "Password expired"
+msgstr "Срок действия Вашего пароля истёк"
+
+#: ../../libsmb/nterr.c:581
+msgid "Account disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:582
+msgid "Memory allocation error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:583
+#, fuzzy
+msgid "No domain controllers located"
+msgstr "Контроллеры домена не найдены"
+
+#: ../../libsmb/nterr.c:584
+msgid "Named pipe not available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:585
+msgid "Not implemented"
+msgstr ""
+
+#: ../../libsmb/nterr.c:586
+msgid "Invalid information class"
+msgstr ""
+
+#: ../../libsmb/nterr.c:587
+msgid "Information length mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:588
+msgid "Access violation"
+msgstr ""
+
+#: ../../libsmb/nterr.c:589
+msgid "Invalid handle"
+msgstr ""
+
+#: ../../libsmb/nterr.c:590
+msgid "Invalid parameter"
+msgstr ""
+
+#: ../../libsmb/nterr.c:591
+msgid "No memory"
+msgstr ""
+
+#: ../../libsmb/nterr.c:592
+msgid "Buffer too small"
+msgstr ""
+
+#: ../../libsmb/nterr.c:593
+msgid "Revision mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:594
+#, fuzzy
+msgid "No such logon session"
+msgstr "Нет серверов входа"
+
+#: ../../libsmb/nterr.c:595
+msgid "No such privilege"
+msgstr ""
+
+#: ../../libsmb/nterr.c:596
+msgid "Procedure not found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:597
+msgid "Server disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:598
+msgid "Invalid pipe state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:599
+msgid "Named pipe busy"
+msgstr ""
+
+#: ../../libsmb/nterr.c:600
+msgid "Illegal function"
+msgstr ""
+
+#: ../../libsmb/nterr.c:601
+msgid "Named pipe dicconnected"
+msgstr ""
+
+#: ../../libsmb/nterr.c:602
+msgid "Named pipe closing"
+msgstr ""
+
+#: ../../libsmb/nterr.c:603
+msgid "Remote host not listening"
+msgstr ""
+
+#: ../../libsmb/nterr.c:604
+msgid "Duplicate name on network"
+msgstr ""
+
+#: ../../libsmb/nterr.c:605
+msgid "Print queue is full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:606
+#, fuzzy
+msgid "No print spool space available"
+msgstr "Нет доступных основных контроллеров домена"
+
+#: ../../libsmb/nterr.c:607
+msgid "The network name cannot be found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:608
+msgid "The connection was refused"
+msgstr ""
+
+#: ../../libsmb/nterr.c:609
+msgid "Too many names"
+msgstr ""
+
+#: ../../libsmb/nterr.c:610
+msgid "Too many sessions"
+msgstr ""
+
+#: ../../libsmb/nterr.c:611
+msgid "Invalid server state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:612
+msgid "Invalid domain state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:613
+msgid "Invalid domain role"
+msgstr ""
+
+#: ../../libsmb/nterr.c:614
+msgid "No such domain"
+msgstr ""
+
+#: ../../libsmb/nterr.c:615
+msgid "Domain exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:616
+msgid "Domain limit exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:617
+msgid "Bad logon session state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:618
+msgid "Logon session collision"
+msgstr ""
+
+#: ../../libsmb/nterr.c:619
+msgid "Invalid logon type"
+msgstr ""
+
+#: ../../libsmb/nterr.c:620
+msgid "Cancelled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:621
+msgid "Invalid computer name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:622
+msgid "Logon server conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:623
+msgid "Time difference at domain controller"
+msgstr ""
+
+#: ../../libsmb/nterr.c:624
+msgid "Pipe broken"
+msgstr ""
+
+#: ../../libsmb/nterr.c:625
+msgid "Registry corrupt"
+msgstr ""
+
+#: ../../libsmb/nterr.c:626
+msgid "Too many secrets"
+msgstr ""
+
+#: ../../libsmb/nterr.c:627
+msgid "Too many SIDs"
+msgstr ""
+
+#: ../../libsmb/nterr.c:628
+msgid "Lanmanager cross encryption required"
+msgstr ""
+
+#: ../../libsmb/nterr.c:629
+msgid "Log file full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:630
+msgid "No trusted LSA secret"
+msgstr ""
+
+#: ../../libsmb/nterr.c:631
+#, fuzzy
+msgid "No trusted SAM account"
+msgstr "Неверная доверенная учётная запись"
+
+#: ../../libsmb/nterr.c:632
+msgid "Trusted domain failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:633
+msgid "Trust relationship failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:634
+msgid "Trust failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:635
+msgid "Netlogon service not started"
+msgstr ""
+
+#: ../../libsmb/nterr.c:636
+msgid "Account expired"
+msgstr ""
+
+#: ../../libsmb/nterr.c:637
+msgid "Network credential conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:638
+msgid "Remote session limit"
+msgstr ""
+
+#: ../../libsmb/nterr.c:639
+msgid "No logon interdomain trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:640
+msgid "No logon workstation trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:641
+#, fuzzy
+msgid "No logon server trust account"
+msgstr "Нет серверов входа"
+
+#: ../../libsmb/nterr.c:642
+msgid "Domain trust inconsistent"
+msgstr ""
+
+#: ../../libsmb/nterr.c:643
+msgid "No user session key available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:644
+msgid "User session deleted"
+msgstr ""
+
+#: ../../libsmb/nterr.c:645
+msgid "Insufficient server resources"
+msgstr ""
+
+#: ../../libsmb/nterr.c:646
+msgid "Insufficient logon information"
+msgstr ""
+
+#: ../../libsmb/nterr.c:648
+msgid "License quota exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:649
+msgid "No more files"
+msgstr ""
diff --git a/source3/locale/pam_winbind/sv.po b/source3/locale/pam_winbind/sv.po
index a783f58eb18..ab14509625a 100644
--- a/source3/locale/pam_winbind/sv.po
+++ b/source3/locale/pam_winbind/sv.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_winbind\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-16 15:30+0800\n"
+"POT-Creation-Date: 2010-03-06 01:55+0800\n"
 "PO-Revision-Date: 2009-02-05 07:23\n"
 "Last-Translator: Novell Language <language@novell.com>\n"
 "Language-Team: Novell Language <language@novell.com>\n"
@@ -13,141 +13,546 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../../nsswitch/pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:583 ../../libsmb/nterr.c:558
 msgid "Success"
 msgstr "Lyckades"
 
-#: ../../../nsswitch/pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:585
 msgid "No primary Domain Controler available"
 msgstr "Det finns ingen tillgänglig primär domänkontrollant"
 
-#: ../../../nsswitch/pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:587
 msgid "No domain controllers found"
 msgstr "Inga domänkontrollanter hittades"
 
-#: ../../../nsswitch/pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:589 ../../libsmb/nterr.c:566
 msgid "No logon servers"
 msgstr "Inga inloggningsservrar"
 
-#: ../../../nsswitch/pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:591
 msgid "Password too short"
 msgstr "Lösenordet är för kort"
 
-#: ../../../nsswitch/pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:593
 msgid "The password of this user is too recent to change"
 msgstr "Lösenordet för den här användaren är för nytt för att kunna ändras"
 
-#: ../../../nsswitch/pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:595
 msgid "Password is already in password history"
 msgstr "Lösenordet finns redan i lösenordshistoriken"
 
-#: ../../../nsswitch/pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:597
 msgid "Your password has expired"
 msgstr "Ditt lösenord gäller inte längre"
 
-#: ../../../nsswitch/pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:599
 msgid "You need to change your password now"
 msgstr "Du måste ändra ditt lösenord nu"
 
-#: ../../../nsswitch/pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:601
 msgid "You are not allowed to logon from this workstation"
 msgstr "Du kan inte logga in från den här arbetsstationen"
 
-#: ../../../nsswitch/pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:603
 msgid "You are not allowed to logon at this time"
 msgstr "Du kan inte logga in just nu"
 
-#: ../../../nsswitch/pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:605
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "Ditt konto gäller inte längre. Kontakta systemadministratören"
 
-#: ../../../nsswitch/pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:608
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "Ditt konto har inaktiverats. Kontakta systemadministratören."
 
-#: ../../../nsswitch/pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:611
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "Ditt konto har låsts. Kontakta systemadministratören"
 
-#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:614 ../../../nsswitch/pam_winbind.c:616 ../../../nsswitch/pam_winbind.c:618
 msgid "Invalid Trust Account"
 msgstr "Ogiltigt förtroendekonto"
 
-#: ../../../nsswitch/pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:620
 msgid "Access is denied"
 msgstr "Åtkomst nekades"
 
-#: ../../../nsswitch/pam_winbind.c:592
-msgid "Your password expires today"
+#: ../../../nsswitch/pam_winbind.c:818
+#, fuzzy
+msgid "Do you want to change your password now?"
+msgstr "Du måste ändra ditt lösenord nu"
+
+#: ../../../nsswitch/pam_winbind.c:902
+#, fuzzy
+msgid "Your password expires today.\n"
 msgstr "Ditt lösenord upphör att gälla i dag"
 
-#: ../../../nsswitch/pam_winbind.c:597
-#, c-format
-msgid "Your password will expire in %d %s"
+#: ../../../nsswitch/pam_winbind.c:932
+#, fuzzy, c-format
+msgid "Your password will expire in %d %s.\n"
 msgstr "Ditt lösenord slutar gälla om %d %s"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "days"
 msgstr "dagar"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "day"
 msgstr "dag"
 
-#: ../../../nsswitch/pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:1169 ../../../nsswitch/pam_winbind.c:1193
+#, c-format
+msgid "Cannot convert group %s to sid, please contact your administrator to see if group %s is valid."
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1387
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "Inloggningsräknaren har aktiverats. Ändra ditt lösenord så fort du ansluter igen"
 
-#: ../../../nsswitch/pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:1397
 msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable"
 msgstr "Det gick inte att ansluta till domänkontrollanten. Cachelagrade inloggningsuppgifter används i stället. Nätverksresurserna kanske inte är tillgängliga"
 
-#: ../../../nsswitch/pam_winbind.c:950
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1422
+msgid ""
+"Failed to establish your Kerberos Ticket cache due time differences\n"
+"with the domain controller.  Please verify the system time.\n"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1490
 msgid "Your password "
 msgstr "Ditt lösenord"
 
-#: ../../../nsswitch/pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:1497
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "måste vara minst %d tecken långt, "
 
-#: ../../../nsswitch/pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:1506
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "får inte vara identiskt med något av dina %d senaste lösenord "
 
-#: ../../../nsswitch/pam_winbind.c:977
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1516
 msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; "
 msgstr "måste innehålla versaler, siffror eller skiljetecken och får inte innehålla ditt kontonamn eller ditt fullständiga namn,"
 
-#: ../../../nsswitch/pam_winbind.c:986
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1526
 msgid "Please type a different password. Type a password which meets these requirements in both text boxes."
 msgstr "Skriv ett annat lösenord. Skriv ett lösenord som uppfyller kraven i båda textrutorna."
 
-#: ../../../nsswitch/pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1553
+#, c-format
+msgid "Creating directory: %s failed: %s"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2018
 msgid "Password does not meet complexity requirements"
 msgstr "Lösenordet uppfyller inte kraven på komplexitet"
 
-#: ../../../nsswitch/pam_winbind.c:1564
+#.
+#. * First get the name of a user
+#.
+#: ../../../nsswitch/pam_winbind.c:2489 ../../../nsswitch/pam_winbind.c:3035
+msgid "Username: "
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2665
 msgid "Password: "
 msgstr "Lösenord:"
 
-#: ../../../nsswitch/pam_winbind.c:2013
+#. instruct user what is happening
+#: ../../../nsswitch/pam_winbind.c:3073
 msgid "Changing password for"
 msgstr "Ändrar lösenord för"
 
-#: ../../../nsswitch/pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:3086
 msgid "(current) NT password: "
 msgstr "(aktuellt) NT-lösenord:"
 
-#: ../../../nsswitch/pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:3156
 msgid "Enter new NT password: "
 msgstr "Ange det nya NT-lösenordet: "
 
-#: ../../../nsswitch/pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:3157
 msgid "Retype new NT password: "
 msgstr "Skriv det nya NT-lösenordet igen: "
 
+#.
+#. * here is the string to inform the user that the new passwords they
+#. * typed were not the same.
+#.
+#: ../../../nsswitch/pam_winbind.h:128
+msgid "Sorry, passwords do not match"
+msgstr ""
+
+#: ../../libsmb/nterr.c:559
+msgid "Undetermined error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:560
+#, fuzzy
+msgid "Access denied"
+msgstr "Åtkomst nekades"
+
+#: ../../libsmb/nterr.c:561
+msgid "Account locked out"
+msgstr ""
+
+#: ../../libsmb/nterr.c:562
+#, fuzzy
+msgid "Must change password"
+msgstr "Du måste ändra ditt lösenord nu"
+
+#: ../../libsmb/nterr.c:563
+#, fuzzy
+msgid "Password is too short"
+msgstr "Lösenordet är för kort"
+
+#: ../../libsmb/nterr.c:564
+#, fuzzy
+msgid "Password is too recent"
+msgstr "Lösenordet är för kort"
+
+#: ../../libsmb/nterr.c:565
+#, fuzzy
+msgid "Password history conflict"
+msgstr "Lösenordet är för kort"
+
+#: ../../libsmb/nterr.c:567
+msgid "Improperly formed account name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:568
+msgid "User exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:569
+msgid "No such user"
+msgstr ""
+
+#: ../../libsmb/nterr.c:570
+msgid "Group exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:571
+msgid "No such group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:572
+msgid "Member not in group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:573
+#, fuzzy
+msgid "Wrong Password"
+msgstr "Lösenord:"
+
+#: ../../libsmb/nterr.c:574
+#, fuzzy
+msgid "Ill formed password"
+msgstr "Ditt lösenord"
+
+#: ../../libsmb/nterr.c:575
+#, fuzzy
+msgid "Password restriction"
+msgstr "Lösenordet är för kort"
+
+#: ../../libsmb/nterr.c:576
+msgid "Logon failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:577
+msgid "Account restriction"
+msgstr ""
+
+#: ../../libsmb/nterr.c:578
+msgid "Invalid logon hours"
+msgstr ""
+
+#: ../../libsmb/nterr.c:579
+#, fuzzy
+msgid "Invalid workstation"
+msgstr "Ogiltigt förtroendekonto"
+
+#: ../../libsmb/nterr.c:580
+#, fuzzy
+msgid "Password expired"
+msgstr "Ditt lösenord gäller inte längre"
+
+#: ../../libsmb/nterr.c:581
+msgid "Account disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:582
+msgid "Memory allocation error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:583
+#, fuzzy
+msgid "No domain controllers located"
+msgstr "Inga domänkontrollanter hittades"
+
+#: ../../libsmb/nterr.c:584
+msgid "Named pipe not available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:585
+msgid "Not implemented"
+msgstr ""
+
+#: ../../libsmb/nterr.c:586
+msgid "Invalid information class"
+msgstr ""
+
+#: ../../libsmb/nterr.c:587
+msgid "Information length mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:588
+msgid "Access violation"
+msgstr ""
+
+#: ../../libsmb/nterr.c:589
+msgid "Invalid handle"
+msgstr ""
+
+#: ../../libsmb/nterr.c:590
+msgid "Invalid parameter"
+msgstr ""
+
+#: ../../libsmb/nterr.c:591
+msgid "No memory"
+msgstr ""
+
+#: ../../libsmb/nterr.c:592
+msgid "Buffer too small"
+msgstr ""
+
+#: ../../libsmb/nterr.c:593
+msgid "Revision mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:594
+#, fuzzy
+msgid "No such logon session"
+msgstr "Inga inloggningsservrar"
+
+#: ../../libsmb/nterr.c:595
+msgid "No such privilege"
+msgstr ""
+
+#: ../../libsmb/nterr.c:596
+msgid "Procedure not found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:597
+msgid "Server disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:598
+msgid "Invalid pipe state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:599
+msgid "Named pipe busy"
+msgstr ""
+
+#: ../../libsmb/nterr.c:600
+msgid "Illegal function"
+msgstr ""
+
+#: ../../libsmb/nterr.c:601
+msgid "Named pipe dicconnected"
+msgstr ""
+
+#: ../../libsmb/nterr.c:602
+msgid "Named pipe closing"
+msgstr ""
+
+#: ../../libsmb/nterr.c:603
+msgid "Remote host not listening"
+msgstr ""
+
+#: ../../libsmb/nterr.c:604
+msgid "Duplicate name on network"
+msgstr ""
+
+#: ../../libsmb/nterr.c:605
+msgid "Print queue is full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:606
+#, fuzzy
+msgid "No print spool space available"
+msgstr "Det finns ingen tillgänglig primär domänkontrollant"
+
+#: ../../libsmb/nterr.c:607
+msgid "The network name cannot be found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:608
+msgid "The connection was refused"
+msgstr ""
+
+#: ../../libsmb/nterr.c:609
+msgid "Too many names"
+msgstr ""
+
+#: ../../libsmb/nterr.c:610
+msgid "Too many sessions"
+msgstr ""
+
+#: ../../libsmb/nterr.c:611
+msgid "Invalid server state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:612
+msgid "Invalid domain state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:613
+msgid "Invalid domain role"
+msgstr ""
+
+#: ../../libsmb/nterr.c:614
+msgid "No such domain"
+msgstr ""
+
+#: ../../libsmb/nterr.c:615
+msgid "Domain exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:616
+msgid "Domain limit exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:617
+msgid "Bad logon session state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:618
+msgid "Logon session collision"
+msgstr ""
+
+#: ../../libsmb/nterr.c:619
+msgid "Invalid logon type"
+msgstr ""
+
+#: ../../libsmb/nterr.c:620
+msgid "Cancelled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:621
+msgid "Invalid computer name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:622
+msgid "Logon server conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:623
+msgid "Time difference at domain controller"
+msgstr ""
+
+#: ../../libsmb/nterr.c:624
+msgid "Pipe broken"
+msgstr ""
+
+#: ../../libsmb/nterr.c:625
+msgid "Registry corrupt"
+msgstr ""
+
+#: ../../libsmb/nterr.c:626
+msgid "Too many secrets"
+msgstr ""
+
+#: ../../libsmb/nterr.c:627
+msgid "Too many SIDs"
+msgstr ""
+
+#: ../../libsmb/nterr.c:628
+msgid "Lanmanager cross encryption required"
+msgstr ""
+
+#: ../../libsmb/nterr.c:629
+msgid "Log file full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:630
+msgid "No trusted LSA secret"
+msgstr ""
+
+#: ../../libsmb/nterr.c:631
+#, fuzzy
+msgid "No trusted SAM account"
+msgstr "Ogiltigt förtroendekonto"
+
+#: ../../libsmb/nterr.c:632
+msgid "Trusted domain failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:633
+msgid "Trust relationship failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:634
+msgid "Trust failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:635
+msgid "Netlogon service not started"
+msgstr ""
+
+#: ../../libsmb/nterr.c:636
+msgid "Account expired"
+msgstr ""
+
+#: ../../libsmb/nterr.c:637
+msgid "Network credential conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:638
+msgid "Remote session limit"
+msgstr ""
+
+#: ../../libsmb/nterr.c:639
+msgid "No logon interdomain trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:640
+msgid "No logon workstation trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:641
+#, fuzzy
+msgid "No logon server trust account"
+msgstr "Inga inloggningsservrar"
+
+#: ../../libsmb/nterr.c:642
+msgid "Domain trust inconsistent"
+msgstr ""
+
+#: ../../libsmb/nterr.c:643
+msgid "No user session key available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:644
+msgid "User session deleted"
+msgstr ""
+
+#: ../../libsmb/nterr.c:645
+msgid "Insufficient server resources"
+msgstr ""
+
+#: ../../libsmb/nterr.c:646
+msgid "Insufficient logon information"
+msgstr ""
+
+#: ../../libsmb/nterr.c:648
+msgid "License quota exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:649
+msgid "No more files"
+msgstr ""
diff --git a/source3/locale/pam_winbind/zh_CN.po b/source3/locale/pam_winbind/zh_CN.po
index d1eeb9a38ac..4994c0b1f5d 100644
--- a/source3/locale/pam_winbind/zh_CN.po
+++ b/source3/locale/pam_winbind/zh_CN.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_winbind\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-16 15:30+0800\n"
+"POT-Creation-Date: 2010-03-06 01:55+0800\n"
 "PO-Revision-Date: 2009-02-05 09:53\n"
 "Last-Translator: Novell Language <language@novell.com>\n"
 "Language-Team: Novell Language <language@novell.com>\n"
@@ -13,141 +13,546 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../../nsswitch/pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:583 ../../libsmb/nterr.c:558
 msgid "Success"
 msgstr "成功"
 
-#: ../../../nsswitch/pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:585
 msgid "No primary Domain Controler available"
 msgstr "没有可用的主域控制器"
 
-#: ../../../nsswitch/pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:587
 msgid "No domain controllers found"
 msgstr "未发现任何域控制器"
 
-#: ../../../nsswitch/pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:589 ../../libsmb/nterr.c:566
 msgid "No logon servers"
 msgstr "无登录服务器"
 
-#: ../../../nsswitch/pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:591
 msgid "Password too short"
 msgstr "密码太短"
 
-#: ../../../nsswitch/pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:593
 msgid "The password of this user is too recent to change"
 msgstr "此用户的密码很新，无法更改"
 
-#: ../../../nsswitch/pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:595
 msgid "Password is already in password history"
 msgstr "密码已在密码历史记录中"
 
-#: ../../../nsswitch/pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:597
 msgid "Your password has expired"
 msgstr "您的密码已失效"
 
-#: ../../../nsswitch/pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:599
 msgid "You need to change your password now"
 msgstr "您需要立即更改密码"
 
-#: ../../../nsswitch/pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:601
 msgid "You are not allowed to logon from this workstation"
 msgstr "不允许您从此工作站登录"
 
-#: ../../../nsswitch/pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:603
 msgid "You are not allowed to logon at this time"
 msgstr "此时不允许您登录"
 
-#: ../../../nsswitch/pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:605
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "您的帐户已失效。请与系统管理员联系"
 
-#: ../../../nsswitch/pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:608
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "您的帐户已禁用。请与系统管理员联系"
 
-#: ../../../nsswitch/pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:611
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "您的帐户已锁定。请与系统管理员联系"
 
-#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:614 ../../../nsswitch/pam_winbind.c:616 ../../../nsswitch/pam_winbind.c:618
 msgid "Invalid Trust Account"
 msgstr "无效的信任帐户"
 
-#: ../../../nsswitch/pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:620
 msgid "Access is denied"
 msgstr "访问被拒绝"
 
-#: ../../../nsswitch/pam_winbind.c:592
-msgid "Your password expires today"
+#: ../../../nsswitch/pam_winbind.c:818
+#, fuzzy
+msgid "Do you want to change your password now?"
+msgstr "您需要立即更改密码"
+
+#: ../../../nsswitch/pam_winbind.c:902
+#, fuzzy
+msgid "Your password expires today.\n"
 msgstr "您的密码将于今天失效"
 
-#: ../../../nsswitch/pam_winbind.c:597
-#, c-format
-msgid "Your password will expire in %d %s"
+#: ../../../nsswitch/pam_winbind.c:932
+#, fuzzy, c-format
+msgid "Your password will expire in %d %s.\n"
 msgstr "您的密码将在 %d %s 后失效"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "days"
 msgstr "天"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "day"
 msgstr "天"
 
-#: ../../../nsswitch/pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:1169 ../../../nsswitch/pam_winbind.c:1193
+#, c-format
+msgid "Cannot convert group %s to sid, please contact your administrator to see if group %s is valid."
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1387
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "宽限登录。请在您再次联机时立即更改密码"
 
-#: ../../../nsswitch/pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:1397
 msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable"
 msgstr "域控制器无法访问，改为使用超速缓存的身份凭证。网络资源可能不可用"
 
-#: ../../../nsswitch/pam_winbind.c:950
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1422
+msgid ""
+"Failed to establish your Kerberos Ticket cache due time differences\n"
+"with the domain controller.  Please verify the system time.\n"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1490
 msgid "Your password "
 msgstr "您的密码 "
 
-#: ../../../nsswitch/pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:1497
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "必须至少为 %d 个字符； "
 
-#: ../../../nsswitch/pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:1506
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "不能重复先前 %d 个密码中的任何一个； "
 
-#: ../../../nsswitch/pam_winbind.c:977
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1516
 msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; "
 msgstr "必须包含大写字母、数字或标点；且不得包含您的帐户或全名； "
 
-#: ../../../nsswitch/pam_winbind.c:986
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1526
 msgid "Please type a different password. Type a password which meets these requirements in both text boxes."
 msgstr "请键入其他密码。在两个文本框中键入符合这些要求的密码。"
 
-#: ../../../nsswitch/pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1553
+#, c-format
+msgid "Creating directory: %s failed: %s"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2018
 msgid "Password does not meet complexity requirements"
 msgstr "密码不符合复杂度要求"
 
-#: ../../../nsswitch/pam_winbind.c:1564
+#.
+#. * First get the name of a user
+#.
+#: ../../../nsswitch/pam_winbind.c:2489 ../../../nsswitch/pam_winbind.c:3035
+msgid "Username: "
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2665
 msgid "Password: "
 msgstr "密码："
 
-#: ../../../nsswitch/pam_winbind.c:2013
+#. instruct user what is happening
+#: ../../../nsswitch/pam_winbind.c:3073
 msgid "Changing password for"
 msgstr "更改密码"
 
-#: ../../../nsswitch/pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:3086
 msgid "(current) NT password: "
 msgstr "（当前）NT 密码： "
 
-#: ../../../nsswitch/pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:3156
 msgid "Enter new NT password: "
 msgstr "输入新 NT 密码： "
 
-#: ../../../nsswitch/pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:3157
 msgid "Retype new NT password: "
 msgstr "重键入新 NT 密码： "
 
+#.
+#. * here is the string to inform the user that the new passwords they
+#. * typed were not the same.
+#.
+#: ../../../nsswitch/pam_winbind.h:128
+msgid "Sorry, passwords do not match"
+msgstr ""
+
+#: ../../libsmb/nterr.c:559
+msgid "Undetermined error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:560
+#, fuzzy
+msgid "Access denied"
+msgstr "访问被拒绝"
+
+#: ../../libsmb/nterr.c:561
+msgid "Account locked out"
+msgstr ""
+
+#: ../../libsmb/nterr.c:562
+#, fuzzy
+msgid "Must change password"
+msgstr "您需要立即更改密码"
+
+#: ../../libsmb/nterr.c:563
+#, fuzzy
+msgid "Password is too short"
+msgstr "密码太短"
+
+#: ../../libsmb/nterr.c:564
+#, fuzzy
+msgid "Password is too recent"
+msgstr "密码太短"
+
+#: ../../libsmb/nterr.c:565
+#, fuzzy
+msgid "Password history conflict"
+msgstr "密码太短"
+
+#: ../../libsmb/nterr.c:567
+msgid "Improperly formed account name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:568
+msgid "User exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:569
+msgid "No such user"
+msgstr ""
+
+#: ../../libsmb/nterr.c:570
+msgid "Group exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:571
+msgid "No such group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:572
+msgid "Member not in group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:573
+#, fuzzy
+msgid "Wrong Password"
+msgstr "密码："
+
+#: ../../libsmb/nterr.c:574
+#, fuzzy
+msgid "Ill formed password"
+msgstr "您的密码 "
+
+#: ../../libsmb/nterr.c:575
+#, fuzzy
+msgid "Password restriction"
+msgstr "密码太短"
+
+#: ../../libsmb/nterr.c:576
+msgid "Logon failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:577
+msgid "Account restriction"
+msgstr ""
+
+#: ../../libsmb/nterr.c:578
+msgid "Invalid logon hours"
+msgstr ""
+
+#: ../../libsmb/nterr.c:579
+#, fuzzy
+msgid "Invalid workstation"
+msgstr "无效的信任帐户"
+
+#: ../../libsmb/nterr.c:580
+#, fuzzy
+msgid "Password expired"
+msgstr "您的密码已失效"
+
+#: ../../libsmb/nterr.c:581
+msgid "Account disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:582
+msgid "Memory allocation error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:583
+#, fuzzy
+msgid "No domain controllers located"
+msgstr "未发现任何域控制器"
+
+#: ../../libsmb/nterr.c:584
+msgid "Named pipe not available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:585
+msgid "Not implemented"
+msgstr ""
+
+#: ../../libsmb/nterr.c:586
+msgid "Invalid information class"
+msgstr ""
+
+#: ../../libsmb/nterr.c:587
+msgid "Information length mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:588
+msgid "Access violation"
+msgstr ""
+
+#: ../../libsmb/nterr.c:589
+msgid "Invalid handle"
+msgstr ""
+
+#: ../../libsmb/nterr.c:590
+msgid "Invalid parameter"
+msgstr ""
+
+#: ../../libsmb/nterr.c:591
+msgid "No memory"
+msgstr ""
+
+#: ../../libsmb/nterr.c:592
+msgid "Buffer too small"
+msgstr ""
+
+#: ../../libsmb/nterr.c:593
+msgid "Revision mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:594
+#, fuzzy
+msgid "No such logon session"
+msgstr "无登录服务器"
+
+#: ../../libsmb/nterr.c:595
+msgid "No such privilege"
+msgstr ""
+
+#: ../../libsmb/nterr.c:596
+msgid "Procedure not found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:597
+msgid "Server disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:598
+msgid "Invalid pipe state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:599
+msgid "Named pipe busy"
+msgstr ""
+
+#: ../../libsmb/nterr.c:600
+msgid "Illegal function"
+msgstr ""
+
+#: ../../libsmb/nterr.c:601
+msgid "Named pipe dicconnected"
+msgstr ""
+
+#: ../../libsmb/nterr.c:602
+msgid "Named pipe closing"
+msgstr ""
+
+#: ../../libsmb/nterr.c:603
+msgid "Remote host not listening"
+msgstr ""
+
+#: ../../libsmb/nterr.c:604
+msgid "Duplicate name on network"
+msgstr ""
+
+#: ../../libsmb/nterr.c:605
+msgid "Print queue is full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:606
+#, fuzzy
+msgid "No print spool space available"
+msgstr "没有可用的主域控制器"
+
+#: ../../libsmb/nterr.c:607
+msgid "The network name cannot be found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:608
+msgid "The connection was refused"
+msgstr ""
+
+#: ../../libsmb/nterr.c:609
+msgid "Too many names"
+msgstr ""
+
+#: ../../libsmb/nterr.c:610
+msgid "Too many sessions"
+msgstr ""
+
+#: ../../libsmb/nterr.c:611
+msgid "Invalid server state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:612
+msgid "Invalid domain state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:613
+msgid "Invalid domain role"
+msgstr ""
+
+#: ../../libsmb/nterr.c:614
+msgid "No such domain"
+msgstr ""
+
+#: ../../libsmb/nterr.c:615
+msgid "Domain exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:616
+msgid "Domain limit exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:617
+msgid "Bad logon session state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:618
+msgid "Logon session collision"
+msgstr ""
+
+#: ../../libsmb/nterr.c:619
+msgid "Invalid logon type"
+msgstr ""
+
+#: ../../libsmb/nterr.c:620
+msgid "Cancelled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:621
+msgid "Invalid computer name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:622
+msgid "Logon server conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:623
+msgid "Time difference at domain controller"
+msgstr ""
+
+#: ../../libsmb/nterr.c:624
+msgid "Pipe broken"
+msgstr ""
+
+#: ../../libsmb/nterr.c:625
+msgid "Registry corrupt"
+msgstr ""
+
+#: ../../libsmb/nterr.c:626
+msgid "Too many secrets"
+msgstr ""
+
+#: ../../libsmb/nterr.c:627
+msgid "Too many SIDs"
+msgstr ""
+
+#: ../../libsmb/nterr.c:628
+msgid "Lanmanager cross encryption required"
+msgstr ""
+
+#: ../../libsmb/nterr.c:629
+msgid "Log file full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:630
+msgid "No trusted LSA secret"
+msgstr ""
+
+#: ../../libsmb/nterr.c:631
+#, fuzzy
+msgid "No trusted SAM account"
+msgstr "无效的信任帐户"
+
+#: ../../libsmb/nterr.c:632
+msgid "Trusted domain failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:633
+msgid "Trust relationship failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:634
+msgid "Trust failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:635
+msgid "Netlogon service not started"
+msgstr ""
+
+#: ../../libsmb/nterr.c:636
+msgid "Account expired"
+msgstr ""
+
+#: ../../libsmb/nterr.c:637
+msgid "Network credential conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:638
+msgid "Remote session limit"
+msgstr ""
+
+#: ../../libsmb/nterr.c:639
+msgid "No logon interdomain trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:640
+msgid "No logon workstation trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:641
+#, fuzzy
+msgid "No logon server trust account"
+msgstr "无登录服务器"
+
+#: ../../libsmb/nterr.c:642
+msgid "Domain trust inconsistent"
+msgstr ""
+
+#: ../../libsmb/nterr.c:643
+msgid "No user session key available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:644
+msgid "User session deleted"
+msgstr ""
+
+#: ../../libsmb/nterr.c:645
+msgid "Insufficient server resources"
+msgstr ""
+
+#: ../../libsmb/nterr.c:646
+msgid "Insufficient logon information"
+msgstr ""
+
+#: ../../libsmb/nterr.c:648
+msgid "License quota exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:649
+msgid "No more files"
+msgstr ""
diff --git a/source3/locale/pam_winbind/zh_TW.po b/source3/locale/pam_winbind/zh_TW.po
index a8460fe3545..f32122f5563 100644
--- a/source3/locale/pam_winbind/zh_TW.po
+++ b/source3/locale/pam_winbind/zh_TW.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_winbind\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-16 15:30+0800\n"
+"POT-Creation-Date: 2010-03-06 01:55+0800\n"
 "PO-Revision-Date: 2009-02-04 15:44\n"
 "Last-Translator: Novell Language <language@novell.com>\n"
 "Language-Team: Novell Language <language@novell.com>\n"
@@ -13,141 +13,546 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../../nsswitch/pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:583 ../../libsmb/nterr.c:558
 msgid "Success"
 msgstr "成功"
 
-#: ../../../nsswitch/pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:585
 msgid "No primary Domain Controler available"
 msgstr "無可用的主要領域控制器"
 
-#: ../../../nsswitch/pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:587
 msgid "No domain controllers found"
 msgstr "找不到領域控制器"
 
-#: ../../../nsswitch/pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:589 ../../libsmb/nterr.c:566
 msgid "No logon servers"
 msgstr "沒有登入伺服器"
 
-#: ../../../nsswitch/pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:591
 msgid "Password too short"
 msgstr "密碼太短"
 
-#: ../../../nsswitch/pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:593
 msgid "The password of this user is too recent to change"
 msgstr "此使用者的密碼太新，無法變更"
 
-#: ../../../nsswitch/pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:595
 msgid "Password is already in password history"
 msgstr "密碼歷程記錄中已存在此密碼"
 
-#: ../../../nsswitch/pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:597
 msgid "Your password has expired"
 msgstr "您的密碼已過期"
 
-#: ../../../nsswitch/pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:599
 msgid "You need to change your password now"
 msgstr "您需要立即變更密碼"
 
-#: ../../../nsswitch/pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:601
 msgid "You are not allowed to logon from this workstation"
 msgstr "您不允許從此工作站登入"
 
-#: ../../../nsswitch/pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:603
 msgid "You are not allowed to logon at this time"
 msgstr "目前您不允許登入"
 
-#: ../../../nsswitch/pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:605
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "您的帳戶已經過期，請聯絡您的系統管理員"
 
-#: ../../../nsswitch/pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:608
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "您的帳戶已經停用，請聯絡您的系統管理員"
 
-#: ../../../nsswitch/pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:611
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "您的帳戶已經鎖定，請聯絡您的系統管理員"
 
-#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:614 ../../../nsswitch/pam_winbind.c:616 ../../../nsswitch/pam_winbind.c:618
 msgid "Invalid Trust Account"
 msgstr "無效的信任帳戶"
 
-#: ../../../nsswitch/pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:620
 msgid "Access is denied"
 msgstr "存取遭拒"
 
-#: ../../../nsswitch/pam_winbind.c:592
-msgid "Your password expires today"
+#: ../../../nsswitch/pam_winbind.c:818
+#, fuzzy
+msgid "Do you want to change your password now?"
+msgstr "您需要立即變更密碼"
+
+#: ../../../nsswitch/pam_winbind.c:902
+#, fuzzy
+msgid "Your password expires today.\n"
 msgstr "您的密碼今天到期"
 
-#: ../../../nsswitch/pam_winbind.c:597
-#, c-format
-msgid "Your password will expire in %d %s"
+#: ../../../nsswitch/pam_winbind.c:932
+#, fuzzy, c-format
+msgid "Your password will expire in %d %s.\n"
 msgstr "您的密碼將在  %d %s 之後過期"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "days"
 msgstr "日"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "day"
 msgstr "日"
 
-#: ../../../nsswitch/pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:1169 ../../../nsswitch/pam_winbind.c:1193
+#, c-format
+msgid "Cannot convert group %s to sid, please contact your administrator to see if group %s is valid."
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1387
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "寬限登入。請於您再次上線時立即變更密碼"
 
-#: ../../../nsswitch/pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:1397
 msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable"
 msgstr "領域控制器無法連線，改用快取的身份證明。網路資源可能不可用"
 
-#: ../../../nsswitch/pam_winbind.c:950
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1422
+msgid ""
+"Failed to establish your Kerberos Ticket cache due time differences\n"
+"with the domain controller.  Please verify the system time.\n"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1490
 msgid "Your password "
 msgstr "您的密碼"
 
-#: ../../../nsswitch/pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:1497
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "必須至少包含 %d 個字元；"
 
-#: ../../../nsswitch/pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:1506
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "不能重複使用前 %d 個密碼；"
 
-#: ../../../nsswitch/pam_winbind.c:977
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1516
 msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; "
 msgstr "必須包含大寫字母、數字或標點符號；並且不能包含您的帳戶或全名；"
 
-#: ../../../nsswitch/pam_winbind.c:986
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1526
 msgid "Please type a different password. Type a password which meets these requirements in both text boxes."
 msgstr "請輸入另一個密碼。請在兩個文字方塊中輸入符合這些要求的密碼。"
 
-#: ../../../nsswitch/pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1553
+#, c-format
+msgid "Creating directory: %s failed: %s"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2018
 msgid "Password does not meet complexity requirements"
 msgstr "密碼不符合複雜性要求"
 
-#: ../../../nsswitch/pam_winbind.c:1564
+#.
+#. * First get the name of a user
+#.
+#: ../../../nsswitch/pam_winbind.c:2489 ../../../nsswitch/pam_winbind.c:3035
+msgid "Username: "
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2665
 msgid "Password: "
 msgstr "密碼："
 
-#: ../../../nsswitch/pam_winbind.c:2013
+#. instruct user what is happening
+#: ../../../nsswitch/pam_winbind.c:3073
 msgid "Changing password for"
 msgstr "變更密碼 -"
 
-#: ../../../nsswitch/pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:3086
 msgid "(current) NT password: "
 msgstr "(目前) NT 密碼："
 
-#: ../../../nsswitch/pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:3156
 msgid "Enter new NT password: "
 msgstr "輸入新 NT 密碼︰"
 
-#: ../../../nsswitch/pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:3157
 msgid "Retype new NT password: "
 msgstr "重新輸入新 NT 密碼："
 
+#.
+#. * here is the string to inform the user that the new passwords they
+#. * typed were not the same.
+#.
+#: ../../../nsswitch/pam_winbind.h:128
+msgid "Sorry, passwords do not match"
+msgstr ""
+
+#: ../../libsmb/nterr.c:559
+msgid "Undetermined error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:560
+#, fuzzy
+msgid "Access denied"
+msgstr "存取遭拒"
+
+#: ../../libsmb/nterr.c:561
+msgid "Account locked out"
+msgstr ""
+
+#: ../../libsmb/nterr.c:562
+#, fuzzy
+msgid "Must change password"
+msgstr "您需要立即變更密碼"
+
+#: ../../libsmb/nterr.c:563
+#, fuzzy
+msgid "Password is too short"
+msgstr "密碼太短"
+
+#: ../../libsmb/nterr.c:564
+#, fuzzy
+msgid "Password is too recent"
+msgstr "密碼太短"
+
+#: ../../libsmb/nterr.c:565
+#, fuzzy
+msgid "Password history conflict"
+msgstr "密碼太短"
+
+#: ../../libsmb/nterr.c:567
+msgid "Improperly formed account name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:568
+msgid "User exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:569
+msgid "No such user"
+msgstr ""
+
+#: ../../libsmb/nterr.c:570
+msgid "Group exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:571
+msgid "No such group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:572
+msgid "Member not in group"
+msgstr ""
+
+#: ../../libsmb/nterr.c:573
+#, fuzzy
+msgid "Wrong Password"
+msgstr "密碼："
+
+#: ../../libsmb/nterr.c:574
+#, fuzzy
+msgid "Ill formed password"
+msgstr "您的密碼"
+
+#: ../../libsmb/nterr.c:575
+#, fuzzy
+msgid "Password restriction"
+msgstr "密碼太短"
+
+#: ../../libsmb/nterr.c:576
+msgid "Logon failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:577
+msgid "Account restriction"
+msgstr ""
+
+#: ../../libsmb/nterr.c:578
+msgid "Invalid logon hours"
+msgstr ""
+
+#: ../../libsmb/nterr.c:579
+#, fuzzy
+msgid "Invalid workstation"
+msgstr "無效的信任帳戶"
+
+#: ../../libsmb/nterr.c:580
+#, fuzzy
+msgid "Password expired"
+msgstr "您的密碼已過期"
+
+#: ../../libsmb/nterr.c:581
+msgid "Account disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:582
+msgid "Memory allocation error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:583
+#, fuzzy
+msgid "No domain controllers located"
+msgstr "找不到領域控制器"
+
+#: ../../libsmb/nterr.c:584
+msgid "Named pipe not available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:585
+msgid "Not implemented"
+msgstr ""
+
+#: ../../libsmb/nterr.c:586
+msgid "Invalid information class"
+msgstr ""
+
+#: ../../libsmb/nterr.c:587
+msgid "Information length mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:588
+msgid "Access violation"
+msgstr ""
+
+#: ../../libsmb/nterr.c:589
+msgid "Invalid handle"
+msgstr ""
+
+#: ../../libsmb/nterr.c:590
+msgid "Invalid parameter"
+msgstr ""
+
+#: ../../libsmb/nterr.c:591
+msgid "No memory"
+msgstr ""
+
+#: ../../libsmb/nterr.c:592
+msgid "Buffer too small"
+msgstr ""
+
+#: ../../libsmb/nterr.c:593
+msgid "Revision mismatch"
+msgstr ""
+
+#: ../../libsmb/nterr.c:594
+#, fuzzy
+msgid "No such logon session"
+msgstr "沒有登入伺服器"
+
+#: ../../libsmb/nterr.c:595
+msgid "No such privilege"
+msgstr ""
+
+#: ../../libsmb/nterr.c:596
+msgid "Procedure not found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:597
+msgid "Server disabled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:598
+msgid "Invalid pipe state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:599
+msgid "Named pipe busy"
+msgstr ""
+
+#: ../../libsmb/nterr.c:600
+msgid "Illegal function"
+msgstr ""
+
+#: ../../libsmb/nterr.c:601
+msgid "Named pipe dicconnected"
+msgstr ""
+
+#: ../../libsmb/nterr.c:602
+msgid "Named pipe closing"
+msgstr ""
+
+#: ../../libsmb/nterr.c:603
+msgid "Remote host not listening"
+msgstr ""
+
+#: ../../libsmb/nterr.c:604
+msgid "Duplicate name on network"
+msgstr ""
+
+#: ../../libsmb/nterr.c:605
+msgid "Print queue is full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:606
+#, fuzzy
+msgid "No print spool space available"
+msgstr "無可用的主要領域控制器"
+
+#: ../../libsmb/nterr.c:607
+msgid "The network name cannot be found"
+msgstr ""
+
+#: ../../libsmb/nterr.c:608
+msgid "The connection was refused"
+msgstr ""
+
+#: ../../libsmb/nterr.c:609
+msgid "Too many names"
+msgstr ""
+
+#: ../../libsmb/nterr.c:610
+msgid "Too many sessions"
+msgstr ""
+
+#: ../../libsmb/nterr.c:611
+msgid "Invalid server state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:612
+msgid "Invalid domain state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:613
+msgid "Invalid domain role"
+msgstr ""
+
+#: ../../libsmb/nterr.c:614
+msgid "No such domain"
+msgstr ""
+
+#: ../../libsmb/nterr.c:615
+msgid "Domain exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:616
+msgid "Domain limit exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:617
+msgid "Bad logon session state"
+msgstr ""
+
+#: ../../libsmb/nterr.c:618
+msgid "Logon session collision"
+msgstr ""
+
+#: ../../libsmb/nterr.c:619
+msgid "Invalid logon type"
+msgstr ""
+
+#: ../../libsmb/nterr.c:620
+msgid "Cancelled"
+msgstr ""
+
+#: ../../libsmb/nterr.c:621
+msgid "Invalid computer name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:622
+msgid "Logon server conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:623
+msgid "Time difference at domain controller"
+msgstr ""
+
+#: ../../libsmb/nterr.c:624
+msgid "Pipe broken"
+msgstr ""
+
+#: ../../libsmb/nterr.c:625
+msgid "Registry corrupt"
+msgstr ""
+
+#: ../../libsmb/nterr.c:626
+msgid "Too many secrets"
+msgstr ""
+
+#: ../../libsmb/nterr.c:627
+msgid "Too many SIDs"
+msgstr ""
+
+#: ../../libsmb/nterr.c:628
+msgid "Lanmanager cross encryption required"
+msgstr ""
+
+#: ../../libsmb/nterr.c:629
+msgid "Log file full"
+msgstr ""
+
+#: ../../libsmb/nterr.c:630
+msgid "No trusted LSA secret"
+msgstr ""
+
+#: ../../libsmb/nterr.c:631
+#, fuzzy
+msgid "No trusted SAM account"
+msgstr "無效的信任帳戶"
+
+#: ../../libsmb/nterr.c:632
+msgid "Trusted domain failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:633
+msgid "Trust relationship failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:634
+msgid "Trust failure"
+msgstr ""
+
+#: ../../libsmb/nterr.c:635
+msgid "Netlogon service not started"
+msgstr ""
+
+#: ../../libsmb/nterr.c:636
+msgid "Account expired"
+msgstr ""
+
+#: ../../libsmb/nterr.c:637
+msgid "Network credential conflict"
+msgstr ""
+
+#: ../../libsmb/nterr.c:638
+msgid "Remote session limit"
+msgstr ""
+
+#: ../../libsmb/nterr.c:639
+msgid "No logon interdomain trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:640
+msgid "No logon workstation trust account"
+msgstr ""
+
+#: ../../libsmb/nterr.c:641
+#, fuzzy
+msgid "No logon server trust account"
+msgstr "沒有登入伺服器"
+
+#: ../../libsmb/nterr.c:642
+msgid "Domain trust inconsistent"
+msgstr ""
+
+#: ../../libsmb/nterr.c:643
+msgid "No user session key available"
+msgstr ""
+
+#: ../../libsmb/nterr.c:644
+msgid "User session deleted"
+msgstr ""
+
+#: ../../libsmb/nterr.c:645
+msgid "Insufficient server resources"
+msgstr ""
+
+#: ../../libsmb/nterr.c:646
+msgid "Insufficient logon information"
+msgstr ""
+
+#: ../../libsmb/nterr.c:648
+msgid "License quota exceeded"
+msgstr ""
+
+#: ../../libsmb/nterr.c:649
+msgid "No more files"
+msgstr ""