s3: let the pam_winbind po files reference the correct location

20 files changed, 644 insertions, 644 deletions

diff --git a/source3/locale/pam_winbind/ar.po b/source3/locale/pam_winbind/ar.po
index d50aae3d1d1..43e8a8720da 100644
--- a/source3/locale/pam_winbind/ar.po
+++ b/source3/locale/pam_winbind/ar.po
@@ -13,141 +13,141 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:326
 msgid "Success"
 msgstr "نجاح"
 
-#: pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:327
 msgid "No primary Domain Controler available"
 msgstr "جهاز التحكم في المجال الرئيسي غير متوفر"
 
-#: pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:328
 msgid "No domain controllers found"
 msgstr "لم يتم العثور على أجهزة تحكم في المجال"
 
-#: pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:329
 msgid "No logon servers"
 msgstr "لا توجد خوادم تسجيل الدخول"
 
-#: pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:330
 msgid "Password too short"
 msgstr "كلمة السر قصيرة جدًا"
 
-#: pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:331
 msgid "The password of this user is too recent to change"
 msgstr "كلمة سر هذا المستخدم حديثة جدًا على التغيير"
 
-#: pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:332
 msgid "Password is already in password history"
 msgstr "كلمة السر موجودة بالفعل في سجل كلمات السر"
 
-#: pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:333
 msgid "Your password has expired"
 msgstr "انتهت صلاحية كلمة السر الخاصة بك"
 
-#: pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:334
 msgid "You need to change your password now"
 msgstr "يلزم تغيير كلمة السر الآن"
 
-#: pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:335
 msgid "You are not allowed to logon from this workstation"
 msgstr "غير مسموح لك بتسجيل الدخول من محطة العمل هذه"
 
-#: pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:336
 msgid "You are not allowed to logon at this time"
 msgstr "غير مسموح لك بتسجيل الدخول في هذا الوقت"
 
-#: pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:337
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "انتهت صلاحية حسابك. الرجاء الاتصال بمسؤول النظام"
 
-#: pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:338
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "تم تعطيل حسابك. الرجاء الاتصال بمسؤول النظام"
 
-#: pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:339
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "تم قفل حسابك. الرجاء الاتصال بمسؤول النظام"
 
-#: pam_winbind.c:340 pam_winbind.c:341 pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
 msgid "Invalid Trust Account"
 msgstr "حساب ثقة غير صالح"
 
-#: pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:343
 msgid "Access is denied"
 msgstr "الوصول مرفوض"
 
-#: pam_winbind.c:592
+#: ../../../nsswitch/pam_winbind.c:592
 msgid "Your password expires today"
 msgstr "انتهت صلاحية كلمة السر الخاصة بك اليوم"
 
-#: pam_winbind.c:597
+#: ../../../nsswitch/pam_winbind.c:597
 #, c-format
 msgid "Your password will expire in %d %s"
 msgstr "ستنتهي صلاحية كلمة السر الخاصة بك خلال %d %s"
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "days"
 msgstr "أيام"
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "day"
 msgstr "اليوم"
 
-#: pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:917
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "تسجيل الدخول في فترة السماح. الرجاء تغيير كلمة السر الخاصة بك عند الاتصال بالإنترنت مرة أخرى."
 
-#: pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:924
 msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable"
 msgstr "تعذر الوصول إلى جهاز التحكم في المجال، قم باستخدام بيانات تعريف مؤقتة بدلاً من ذلك. ربما لا تتوفر مصادر الشبكة"
 
-#: pam_winbind.c:950
+#: ../../../nsswitch/pam_winbind.c:950
 #, c-format
 msgid "Your password "
 msgstr "كلمة السر الخاصة بك "
 
-#: pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:957
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "يجب أن تكون %d من الأحرف على الأقل؛ "
 
-#: pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:967
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "لا يمكنك تكرار أي من كلمات السر %dالسابقة الخاصة بك؛"
 
-#: pam_winbind.c:977
+#: ../../../nsswitch/pam_winbind.c:977
 #, c-format
 msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; "
 msgstr "يجب أن تحتوي على حروف كبيرة أو أرقام أو علامات ترقيم؛ وألا تحتوي على اسم الحساب الخاص بك أو الاسم الكامل؛"
 
-#: pam_winbind.c:986
+#: ../../../nsswitch/pam_winbind.c:986
 #, c-format
 msgid "Please type a different password. Type a password which meets these requirements in both text boxes."
 msgstr "الرجاء كتابة كلمة سر مختلفة. قم بكتابة كلمة سر تتوافق مع هذه المتطلبات الموجودة في مربعي النص."
 
-#: pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1223
 msgid "Password does not meet complexity requirements"
 msgstr "كلمة السر لا تتوافق مع المتطلبات المعقدة"
 
-#: pam_winbind.c:1564
+#: ../../../nsswitch/pam_winbind.c:1564
 msgid "Password: "
 msgstr "كلمة السر: "
 
-#: pam_winbind.c:2013
+#: ../../../nsswitch/pam_winbind.c:2013
 msgid "Changing password for"
 msgstr "تغيير كلمة السر لـ"
 
-#: pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:2027
 msgid "(current) NT password: "
 msgstr "كلمة سر NT (الحالية) "
 
-#: pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:2089
 msgid "Enter new NT password: "
 msgstr "إدخال كلمة سر NT: "
 
-#: pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:2090
 msgid "Retype new NT password: "
 msgstr "إعادة كتابة كلمة سر NT الجديدة: "
 
diff --git a/source3/locale/pam_winbind/cs.po b/source3/locale/pam_winbind/cs.po
index 3fe4d61a82d..d927ceb248a 100644
--- a/source3/locale/pam_winbind/cs.po
+++ b/source3/locale/pam_winbind/cs.po
@@ -13,141 +13,141 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:326
 msgid "Success"
 msgstr "úspěch"
 
-#: pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:327
 msgid "No primary Domain Controler available"
 msgstr "Žádný primární doménový kontrolér není dostupný."
 
-#: pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:328
 msgid "No domain controllers found"
 msgstr "Nenalezeny žádné doménové kontroléry"
 
-#: pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:329
 msgid "No logon servers"
 msgstr "Žádné přihlašovací servery"
 
-#: pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:330
 msgid "Password too short"
 msgstr "Heslo je příliš krátké"
 
-#: pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:331
 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é"
 
-#: pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:332
 msgid "Password is already in password history"
 msgstr "Heslo je již v historii hesel"
 
-#: pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:333
 msgid "Your password has expired"
 msgstr "Vaše heslo vypršelo"
 
-#: pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:334
 msgid "You need to change your password now"
 msgstr "Je potřeba změnit Vaše heslo"
 
-#: pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:335
 msgid "You are not allowed to logon from this workstation"
 msgstr "Nemáte práva pro přihlášení z této stanice."
 
-#: pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:336
 msgid "You are not allowed to logon at this time"
 msgstr "Nyní nemáte povolení k přihlášení."
 
-#: pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:337
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "Platnost vašeho účtu vypršela. Kontaktujte svého správce systému."
 
-#: pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:338
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "Váš účet je zablokován. Kontaktujte svého správce systému"
 
-#: pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:339
 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."
 
-#: pam_winbind.c:340 pam_winbind.c:341 pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
 msgid "Invalid Trust Account"
 msgstr "Neplatný účet vztahu důvěryhodnosti"
 
-#: pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:343
 msgid "Access is denied"
 msgstr "Přístup zamítnut"
 
-#: pam_winbind.c:592
+#: ../../../nsswitch/pam_winbind.c:592
 msgid "Your password expires today"
 msgstr "Vaše heslo vyprší dnes."
 
-#: pam_winbind.c:597
+#: ../../../nsswitch/pam_winbind.c:597
 #, c-format
 msgid "Your password will expire in %d %s"
 msgstr "Vaše heslo vyprší %d %s"
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "days"
 msgstr "Dní"
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "day"
 msgstr "Den"
 
-#: pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:917
 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"
 
-#: pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:924
 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é"
 
-#: pam_winbind.c:950
+#: ../../../nsswitch/pam_winbind.c:950
 #, c-format
 msgid "Your password "
 msgstr "Vaše heslo:"
 
-#: pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:957
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "musí mít nejméně %d znaků;"
 
-#: pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:967
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "nelze zopakovat žádné z vašich %d hesel;"
 
-#: pam_winbind.c:977
+#: ../../../nsswitch/pam_winbind.c:977
 #, c-format
 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;"
 
-#: pam_winbind.c:986
+#: ../../../nsswitch/pam_winbind.c:986
 #, c-format
 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."
 
-#: pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1223
 msgid "Password does not meet complexity requirements"
 msgstr "Heslo nesplňuje požadavky na složitost."
 
-#: pam_winbind.c:1564
+#: ../../../nsswitch/pam_winbind.c:1564
 msgid "Password: "
 msgstr "Heslo:"
 
-#: pam_winbind.c:2013
+#: ../../../nsswitch/pam_winbind.c:2013
 msgid "Changing password for"
 msgstr "Měním heslo pro"
 
-#: pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:2027
 msgid "(current) NT password: "
 msgstr "NT heslo (aktuální):"
 
-#: pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:2089
 msgid "Enter new NT password: "
 msgstr "Zadejte nové NT heslo:"
 
-#: pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:2090
 msgid "Retype new NT password: "
 msgstr "Zopakujte nové NT heslo: "
 
diff --git a/source3/locale/pam_winbind/da.po b/source3/locale/pam_winbind/da.po
index ddd46a6113d..dc3fc8a0680 100644
--- a/source3/locale/pam_winbind/da.po
+++ b/source3/locale/pam_winbind/da.po
@@ -13,97 +13,97 @@ msgstr ""
 "X-Generator: Lokalize 0.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../nsswitch/pam_winbind.c:533
+#: ../../../nsswitch/pam_winbind.c:533
 msgid "Success"
 msgstr "Gennemført"
 
-#: ../../nsswitch/pam_winbind.c:535
+#: ../../../nsswitch/pam_winbind.c:535
 msgid "No primary Domain Controler available"
 msgstr "Ingen primær domæne-controller tilgængelig"
 
-#: ../../nsswitch/pam_winbind.c:537
+#: ../../../nsswitch/pam_winbind.c:537
 msgid "No domain controllers found"
 msgstr "Ingen domæne-controllere fundet"
 
-#: ../../nsswitch/pam_winbind.c:539
+#: ../../../nsswitch/pam_winbind.c:539
 msgid "No logon servers"
 msgstr "Ingen log på-servere"
 
-#: ../../nsswitch/pam_winbind.c:541
+#: ../../../nsswitch/pam_winbind.c:541
 msgid "Password too short"
 msgstr "For kort adgangskode"
 
-#: ../../nsswitch/pam_winbind.c:543
+#: ../../../nsswitch/pam_winbind.c:543
 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:545
 msgid "Password is already in password history"
 msgstr "Adgangskoden er allerede i adgangskode-historikken"
 
-#: ../../nsswitch/pam_winbind.c:547
+#: ../../../nsswitch/pam_winbind.c:547
 msgid "Your password has expired"
 msgstr "Din adgangskode er udløbet"
 
-#: ../../nsswitch/pam_winbind.c:549
+#: ../../../nsswitch/pam_winbind.c:549
 msgid "You need to change your password now"
 msgstr "Du skal ændre din adgangskode nu"
 
-#: ../../nsswitch/pam_winbind.c:551
+#: ../../../nsswitch/pam_winbind.c:551
 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:553
 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:555
 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:558
 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:561
 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:564 ../../../nsswitch/pam_winbind.c:566
+#: ../../../nsswitch/pam_winbind.c:568
 msgid "Invalid Trust Account"
 msgstr "Ugyldig tillidskonto"
 
-#: ../../nsswitch/pam_winbind.c:570
+#: ../../../nsswitch/pam_winbind.c:570
 msgid "Access is denied"
 msgstr "Adgang nægtet"
 
-#: ../../nsswitch/pam_winbind.c:845
+#: ../../../nsswitch/pam_winbind.c:845
 msgid "Your password expires today"
 msgstr "Din adgangskode udløber i dag"
 
-#: ../../nsswitch/pam_winbind.c:851
+#: ../../../nsswitch/pam_winbind.c:851
 #, c-format
 msgid "Your password will expire in %d %s"
 msgstr "Din adgangskode udløber om %d %s"
 
-#: ../../nsswitch/pam_winbind.c:852
+#: ../../../nsswitch/pam_winbind.c:852
 msgid "days"
 msgstr "dage"
 
-#: ../../nsswitch/pam_winbind.c:852
+#: ../../../nsswitch/pam_winbind.c:852
 msgid "day"
 msgstr "dag"
 
-#: ../../nsswitch/pam_winbind.c:1193
+#: ../../../nsswitch/pam_winbind.c:1193
 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:1203
 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:1228
 msgid ""
 "Failed to establish your Kerberos Ticket cache due time differences\n"
 "with the domain controller.  Please verify the system time.\n"
@@ -111,60 +111,60 @@ 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
+#: ../../../nsswitch/pam_winbind.c:1258
 #, c-format
 msgid "Your password "
 msgstr "Din adgangskode"
 
-#: ../../nsswitch/pam_winbind.c:1265
+#: ../../../nsswitch/pam_winbind.c:1265
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "skal have mindst %d tegn;"
 
-#: ../../nsswitch/pam_winbind.c:1275
+#: ../../../nsswitch/pam_winbind.c:1275
 #, 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
+#: ../../../nsswitch/pam_winbind.c:1287
 #, c-format
 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
+#: ../../../nsswitch/pam_winbind.c:1298
 #, c-format
 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:1600
 msgid "Password does not meet complexity requirements"
 msgstr "Adgangskoden opfylder ikke kravene til kompleksitet"
 
-#: ../../nsswitch/pam_winbind.c:2114
+#: ../../../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:2403 ../../../nsswitch/pam_winbind.c:2552
 msgid "Username: "
 msgstr "Brugernavn: "
 
 #. instruct user what is happening
-#: ../../nsswitch/pam_winbind.c:2589
+#: ../../../nsswitch/pam_winbind.c:2589
 msgid "Changing password for"
 msgstr "Ændrer adgangskode for"
 
-#: ../../nsswitch/pam_winbind.c:2604
+#: ../../../nsswitch/pam_winbind.c:2604
 msgid "(current) NT password: "
 msgstr "(nuværende) NT-adgangskode: "
 
-#: ../../nsswitch/pam_winbind.c:2672
+#: ../../../nsswitch/pam_winbind.c:2672
 msgid "Enter new NT password: "
 msgstr "Indtast ny NT-adgangskode: "
 
-#: ../../nsswitch/pam_winbind.c:2673
+#: ../../../nsswitch/pam_winbind.c:2673
 msgid "Retype new NT password: "
 msgstr "Indtast ny NT-adgangskode igen: "
 
@@ -172,7 +172,7 @@ 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:119
 msgid "Sorry, passwords do not match"
 msgstr "Beklager, adgangskoderne stemmer ikke overens"
 
diff --git a/source3/locale/pam_winbind/de.po b/source3/locale/pam_winbind/de.po
index da93166bdc5..1e7b0bc983a 100644
--- a/source3/locale/pam_winbind/de.po
+++ b/source3/locale/pam_winbind/de.po
@@ -15,96 +15,96 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../nsswitch/pam_winbind.c:579
+#: ../../../nsswitch/pam_winbind.c:579
 msgid "Success"
 msgstr "Erfolgreich"
 
-#: ../../nsswitch/pam_winbind.c:581
+#: ../../../nsswitch/pam_winbind.c:581
 msgid "No primary Domain Controler available"
 msgstr "Kein primärer Domänen-Controller verfügbar"
 
-#: ../../nsswitch/pam_winbind.c:583
+#: ../../../nsswitch/pam_winbind.c:583
 msgid "No domain controllers found"
 msgstr "Keine Domänen-Controller gefunden"
 
-#: ../../nsswitch/pam_winbind.c:585
+#: ../../../nsswitch/pam_winbind.c:585
 msgid "No logon servers"
 msgstr "Keine Anmeldeserver verfügbar"
 
-#: ../../nsswitch/pam_winbind.c:587
+#: ../../../nsswitch/pam_winbind.c:587
 msgid "Password too short"
 msgstr "Passwort ist zu kurz"
 
-#: ../../nsswitch/pam_winbind.c:589
+#: ../../../nsswitch/pam_winbind.c:589
 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:591
 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:593
 msgid "Your password has expired"
 msgstr "Ihr Passwort ist abgelaufen"
 
-#: ../../nsswitch/pam_winbind.c:595
+#: ../../../nsswitch/pam_winbind.c:595
 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:597
 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:599
 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:601
 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:604
 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:607
 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:610 ../../../nsswitch/pam_winbind.c:612 ../../../nsswitch/pam_winbind.c:614
 msgid "Invalid Trust Account"
 msgstr "Ungültiges Maschinen-Konto"
 
-#: ../../nsswitch/pam_winbind.c:616
+#: ../../../nsswitch/pam_winbind.c:616
 msgid "Access is denied"
 msgstr "Zugriff verweigert"
 
-#: ../../nsswitch/pam_winbind.c:854
+#: ../../../nsswitch/pam_winbind.c:854
 msgid "Your password expires today"
 msgstr "Ihr Passwort läuft heute ab"
 
-#: ../../nsswitch/pam_winbind.c:860
+#: ../../../nsswitch/pam_winbind.c:860
 #, c-format
 msgid "Your password will expire in %d %s"
 msgstr "Ihr Passwort wird in %d %s ungültig"
 
-#: ../../nsswitch/pam_winbind.c:861
+#: ../../../nsswitch/pam_winbind.c:861
 msgid "days"
 msgstr "Tagen"
 
-#: ../../nsswitch/pam_winbind.c:861
+#: ../../../nsswitch/pam_winbind.c:861
 msgid "day"
 msgstr "Tag"
 
-#: ../../nsswitch/pam_winbind.c:1253
+#: ../../../nsswitch/pam_winbind.c:1253
 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:1263
 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:1288
 msgid ""
 "Failed to establish your Kerberos Ticket cache due time differences\n"
 "with the domain controller.  Please verify the system time.\n"
@@ -112,63 +112,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:1356
 msgid "Your password "
 msgstr "Ihr Passwort "
 
-#: ../../nsswitch/pam_winbind.c:1363
+#: ../../../nsswitch/pam_winbind.c:1363
 #, 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:1372
 #, 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:1382
 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:1392
 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:1419
 #, c-format
 msgid "Creating directory: %s failed: %s"
 msgstr "Anlegen des Verzeichnisses: %s fehlgeschlagen: %s"
 
-#: ../../nsswitch/pam_winbind.c:1877
+#: ../../../nsswitch/pam_winbind.c:1877
 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:2336 ../../../nsswitch/pam_winbind.c:2883
 msgid "Username: "
 msgstr "Benuzername: "
 
-#: ../../nsswitch/pam_winbind.c:2513
+#: ../../../nsswitch/pam_winbind.c:2513
 msgid "Password: "
 msgstr "Passwort: "
 
 #. instruct user what is happening
-#: ../../nsswitch/pam_winbind.c:2921
+#: ../../../nsswitch/pam_winbind.c:2921
 #, fuzzy
 msgid "Changing password for"
 msgstr "Ändere Passwort für"
 
-#: ../../nsswitch/pam_winbind.c:2934
+#: ../../../nsswitch/pam_winbind.c:2934
 msgid "(current) NT password: "
 msgstr "(aktuelles) NT Passwort: "
 
-#: ../../nsswitch/pam_winbind.c:3004
+#: ../../../nsswitch/pam_winbind.c:3004
 msgid "Enter new NT password: "
 msgstr "Neues NT Passwort eingeben: "
 
-#: ../../nsswitch/pam_winbind.c:3005
+#: ../../../nsswitch/pam_winbind.c:3005
 msgid "Retype new NT password: "
 msgstr "Neues NT Passwort wiederholen: "
 
@@ -176,6 +176,6 @@ 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:122
 msgid "Sorry, passwords do not match"
 msgstr "Passwörter stimmen leider nicht überein"
diff --git a/source3/locale/pam_winbind/es.po b/source3/locale/pam_winbind/es.po
index f0ce376b3a1..9127af500c0 100644
--- a/source3/locale/pam_winbind/es.po
+++ b/source3/locale/pam_winbind/es.po
@@ -13,141 +13,141 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:326
 msgid "Success"
 msgstr "Correcto"
 
-#: pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:327
 msgid "No primary Domain Controler available"
 msgstr "No hay un controlador de dominio principal disponible"
 
-#: pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:328
 msgid "No domain controllers found"
 msgstr "No se han encontrado controladores de dominio"
 
-#: pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:329
 msgid "No logon servers"
 msgstr "No hay servidores de inicio de sesión"
 
-#: pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:330
 msgid "Password too short"
 msgstr "La contraseña es demasiado corta"
 
-#: pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:331
 msgid "The password of this user is too recent to change"
 msgstr "La contraseña de este usuario es demasiado reciente como para cambiarla"
 
-#: pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:332
 msgid "Password is already in password history"
 msgstr "La contraseña ya se encuentra en el historial de contraseñas"
 
-#: pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:333
 msgid "Your password has expired"
 msgstr "Su contraseña ha caducado"
 
-#: pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:334
 msgid "You need to change your password now"
 msgstr "Debe cambiar su contraseña ahora"
 
-#: pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:335
 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"
 
-#: pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:336
 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"
 
-#: pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:337
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "Su cuenta ha caducado. Póngase en contacto con el administrador del sistema."
 
-#: pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:338
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "Su cuenta está inhabilitada. Póngase en contacto con el administrador del sistema."
 
-#: pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:339
 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."
 
-#: pam_winbind.c:340 pam_winbind.c:341 pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
 msgid "Invalid Trust Account"
 msgstr "Cuenta de confianza no válida"
 
-#: pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:343
 msgid "Access is denied"
 msgstr "Acceso denegado"
 
-#: pam_winbind.c:592
+#: ../../../nsswitch/pam_winbind.c:592
 msgid "Your password expires today"
 msgstr "La contraseña caduca hoy"
 
-#: pam_winbind.c:597
+#: ../../../nsswitch/pam_winbind.c:597
 #, c-format
 msgid "Your password will expire in %d %s"
 msgstr "La contraseña caducará en %d %s"
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "days"
 msgstr "días"
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "day"
 msgstr "día"
 
-#: pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:917
 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."
 
-#: pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:924
 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."
 
-#: pam_winbind.c:950
+#: ../../../nsswitch/pam_winbind.c:950
 #, c-format
 msgid "Your password "
 msgstr "Su contraseña "
 
-#: pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:957
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "debe tener al menos %d caracteres; "
 
-#: pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:967
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "no puede repetir ninguna de sus %d contraseñas anteriores; "
 
-#: pam_winbind.c:977
+#: ../../../nsswitch/pam_winbind.c:977
 #, c-format
 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; "
 
-#: pam_winbind.c:986
+#: ../../../nsswitch/pam_winbind.c:986
 #, c-format
 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."
 
-#: pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1223
 msgid "Password does not meet complexity requirements"
 msgstr "La contraseña no cumple con los requisitos de complejidad solicitados"
 
-#: pam_winbind.c:1564
+#: ../../../nsswitch/pam_winbind.c:1564
 msgid "Password: "
 msgstr "Contraseña:"
 
-#: pam_winbind.c:2013
+#: ../../../nsswitch/pam_winbind.c:2013
 msgid "Changing password for"
 msgstr "Cambiando la contraseña para"
 
-#: pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:2027
 msgid "(current) NT password: "
 msgstr "Contraseña de NT (actual): "
 
-#: pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:2089
 msgid "Enter new NT password: "
 msgstr "Introduzca la nueva contraseña de NT: "
 
-#: pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:2090
 msgid "Retype new NT password: "
 msgstr "Vuelva a introducir la nueva contraseña de NT: "
 
diff --git a/source3/locale/pam_winbind/fi.po b/source3/locale/pam_winbind/fi.po
index 3ba7a3be30b..d174183e831 100644
--- a/source3/locale/pam_winbind/fi.po
+++ b/source3/locale/pam_winbind/fi.po
@@ -16,97 +16,97 @@ 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:533
 msgid "Success"
 msgstr "Onnistui"
 
-#: ../../nsswitch/pam_winbind.c:535
+#: ../../../nsswitch/pam_winbind.c:535
 msgid "No primary Domain Controler available"
 msgstr "Ensisijaista toimialueen ohjainta ei käytettävissä"
 
-#: ../../nsswitch/pam_winbind.c:537
+#: ../../../nsswitch/pam_winbind.c:537
 msgid "No domain controllers found"
 msgstr "Toimialueen ohjaimia ei löytynyt"
 
-#: ../../nsswitch/pam_winbind.c:539
+#: ../../../nsswitch/pam_winbind.c:539
 msgid "No logon servers"
 msgstr "Ei kirjautumispalvelimia"
 
-#: ../../nsswitch/pam_winbind.c:541
+#: ../../../nsswitch/pam_winbind.c:541
 msgid "Password too short"
 msgstr "Liian lyhyt salasana"
 
-#: ../../nsswitch/pam_winbind.c:543
+#: ../../../nsswitch/pam_winbind.c:543
 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:545
 msgid "Password is already in password history"
 msgstr "Salasana löytyy jo salasana historiasta"
 
-#: ../../nsswitch/pam_winbind.c:547
+#: ../../../nsswitch/pam_winbind.c:547
 msgid "Your password has expired"
 msgstr "Salasanasi on vanhentunut"
 
-#: ../../nsswitch/pam_winbind.c:549
+#: ../../../nsswitch/pam_winbind.c:549
 msgid "You need to change your password now"
 msgstr "Salasana täytyy vaihtaa nyt"
 
-#: ../../nsswitch/pam_winbind.c:551
+#: ../../../nsswitch/pam_winbind.c:551
 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:553
 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:555
 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:558
 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:561
 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:564 ../../../nsswitch/pam_winbind.c:566
+#: ../../../nsswitch/pam_winbind.c:568
 msgid "Invalid Trust Account"
 msgstr "Virheellinen luottotili"
 
-#: ../../nsswitch/pam_winbind.c:570
+#: ../../../nsswitch/pam_winbind.c:570
 msgid "Access is denied"
 msgstr "Pääsy estetty"
 
-#: ../../nsswitch/pam_winbind.c:845
+#: ../../../nsswitch/pam_winbind.c:845
 msgid "Your password expires today"
 msgstr "Salasanasi vanhenee tänään"
 
-#: ../../nsswitch/pam_winbind.c:851
+#: ../../../nsswitch/pam_winbind.c:851
 #, c-format
 msgid "Your password will expire in %d %s"
 msgstr "Salasanasi vanhenee %d %s"
 
-#: ../../nsswitch/pam_winbind.c:852
+#: ../../../nsswitch/pam_winbind.c:852
 msgid "days"
 msgstr "päivää"
 
-#: ../../nsswitch/pam_winbind.c:852
+#: ../../../nsswitch/pam_winbind.c:852
 msgid "day"
 msgstr "päivä"
 
-#: ../../nsswitch/pam_winbind.c:1193
+#: ../../../nsswitch/pam_winbind.c:1193
 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:1203
 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:1228
 msgid ""
 "Failed to establish your Kerberos Ticket cache due time differences\n"
 "with the domain controller.  Please verify the system time.\n"
@@ -114,60 +114,60 @@ 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
+#: ../../../nsswitch/pam_winbind.c:1258
 #, c-format
 msgid "Your password "
 msgstr "Salasanasi "
 
-#: ../../nsswitch/pam_winbind.c:1265
+#: ../../../nsswitch/pam_winbind.c:1265
 #, 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:1275
 #, 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
+#: ../../../nsswitch/pam_winbind.c:1287
 #, c-format
 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
+#: ../../../nsswitch/pam_winbind.c:1298
 #, c-format
 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:1600
 msgid "Password does not meet complexity requirements"
 msgstr "Salasana ei ole tarpeeksi monimutkainen."
 
-#: ../../nsswitch/pam_winbind.c:2114
+#: ../../../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:2403 ../../../nsswitch/pam_winbind.c:2552
 msgid "Username: "
 msgstr "Käyttäjänimi: "
 
 #. instruct user what is happening
-#: ../../nsswitch/pam_winbind.c:2589
+#: ../../../nsswitch/pam_winbind.c:2589
 msgid "Changing password for"
 msgstr "Vaihdetaan salasana käyttäjälle"
 
-#: ../../nsswitch/pam_winbind.c:2604
+#: ../../../nsswitch/pam_winbind.c:2604
 msgid "(current) NT password: "
 msgstr "(nykyinen) NT-salasana: "
 
-#: ../../nsswitch/pam_winbind.c:2672
+#: ../../../nsswitch/pam_winbind.c:2672
 msgid "Enter new NT password: "
 msgstr "Anna uusi NT-salasana: "
 
-#: ../../nsswitch/pam_winbind.c:2673
+#: ../../../nsswitch/pam_winbind.c:2673
 msgid "Retype new NT password: "
 msgstr "Anna uusi NT-salasana uudestaan: "
 
@@ -175,7 +175,7 @@ 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:119
 msgid "Sorry, passwords do not match"
 msgstr "Salasanat eivät täsmää"
 
diff --git a/source3/locale/pam_winbind/fr.po b/source3/locale/pam_winbind/fr.po
index 6f81c37e595..99018395aec 100644
--- a/source3/locale/pam_winbind/fr.po
+++ b/source3/locale/pam_winbind/fr.po
@@ -13,141 +13,141 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:326
 msgid "Success"
 msgstr "Succès"
 
-#: pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:327
 msgid "No primary Domain Controler available"
 msgstr "Aucun contrôleur de domaine principal disponible"
 
-#: pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:328
 msgid "No domain controllers found"
 msgstr "Aucun contrôleur de domaine trouvé"
 
-#: pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:329
 msgid "No logon servers"
 msgstr "Aucun serveur d'authentification"
 
-#: pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:330
 msgid "Password too short"
 msgstr "Mot de passe trop court"
 
-#: pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:331
 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é."
 
-#: pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:332
 msgid "Password is already in password history"
 msgstr "Ce mot de passe est dans l'historique des mots de passe utilisés."
 
-#: pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:333
 msgid "Your password has expired"
 msgstr "Votre mot de passe a expiré."
 
-#: pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:334
 msgid "You need to change your password now"
 msgstr "Vous devez changer votre mot de passe maintenant."
 
-#: pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:335
 msgid "You are not allowed to logon from this workstation"
 msgstr "Vous n'êtes pas autorisé à vous connecter depuis cet ordinateur."
 
-#: pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:336
 msgid "You are not allowed to logon at this time"
 msgstr "Vous n'êtes pas autorisé à vous connecter à cette heure."
 
-#: pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:337
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "Votre compte a expiré. Contactez votre administrateur système."
 
-#: pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:338
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "Votre compte a été désactivé. Contactez votre administrateur système."
 
-#: pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:339
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "Votre compte a été verrouillé. Contactez votre administrateur système."
 
-#: pam_winbind.c:340 pam_winbind.c:341 pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
 msgid "Invalid Trust Account"
 msgstr "Compte approuvé non valide"
 
-#: pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:343
 msgid "Access is denied"
 msgstr "Accès refusé"
 
-#: pam_winbind.c:592
+#: ../../../nsswitch/pam_winbind.c:592
 msgid "Your password expires today"
 msgstr "Votre mot de passe expire aujourd'hui."
 
-#: pam_winbind.c:597
+#: ../../../nsswitch/pam_winbind.c:597
 #, c-format
 msgid "Your password will expire in %d %s"
 msgstr "Votre mot de passe expire dans %d %s."
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "days"
 msgstr "jours"
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "day"
 msgstr "jour"
 
-#: pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:917
 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é."
 
-#: pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:924
 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."
 
-#: pam_winbind.c:950
+#: ../../../nsswitch/pam_winbind.c:950
 #, c-format
 msgid "Your password "
 msgstr "Votre mot de passe "
 
-#: pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:957
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "doit contenir au moins %d caractères ; "
 
-#: pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:967
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "ne peut répéter un de vos %d mots de passe ; "
 
-#: pam_winbind.c:977
+#: ../../../nsswitch/pam_winbind.c:977
 #, c-format
 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 ; "
 
-#: pam_winbind.c:986
+#: ../../../nsswitch/pam_winbind.c:986
 #, c-format
 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."
 
-#: pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1223
 msgid "Password does not meet complexity requirements"
 msgstr "Le mot de passe n'est pas suffisamment complexe."
 
-#: pam_winbind.c:1564
+#: ../../../nsswitch/pam_winbind.c:1564
 msgid "Password: "
 msgstr "Mot de passe : "
 
-#: pam_winbind.c:2013
+#: ../../../nsswitch/pam_winbind.c:2013
 msgid "Changing password for"
 msgstr "Changement du mot de passe pour"
 
-#: pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:2027
 msgid "(current) NT password: "
 msgstr "mot de passe NT actuel : "
 
-#: pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:2089
 msgid "Enter new NT password: "
 msgstr "Saisissez le nouveau mot de passe : "
 
-#: pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:2090
 msgid "Retype new NT password: "
 msgstr "Ressaisissez le nouveau mot de passe NT : "
 
diff --git a/source3/locale/pam_winbind/genmsg b/source3/locale/pam_winbind/genmsg
index 5aa258aa85d..19f21dbae45 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"
 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 b09d5f3653a..2a75de4a8b6 100644
--- a/source3/locale/pam_winbind/hu.po
+++ b/source3/locale/pam_winbind/hu.po
@@ -14,93 +14,93 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:326
 msgid "Success"
 msgstr "Sikeres"
 
-#: pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:327
 msgid "No primary Domain Controler available"
 msgstr "Az elsődleges tartományvezérlő nem érhető el"
 
-#: pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:328
 msgid "No domain controllers found"
 msgstr "Nem található tartományvezérlő"
 
-#: pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:329
 msgid "No logon servers"
 msgstr "Nincsenek Logon kiszolgálók"
 
-#: pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:330
 msgid "Password too short"
 msgstr "Túl rövid jelszó"
 
-#: pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:331
 msgid "The password of this user is too recent to change"
 msgstr "A felhasználó jelszava új"
 
-#: pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:332
 msgid "Password is already in password history"
 msgstr "A jelszó már szerepel az előzményekben"
 
-#: pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:333
 msgid "Your password has expired"
 msgstr "A jelszava lejárt"
 
-#: pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:334
 msgid "You need to change your password now"
 msgstr "Meg kell most változtatnia a jelszavát"
 
-#: pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:335
 msgid "You are not allowed to logon from this workstation"
 msgstr "Nem jogosult belépni erről a munkaállomásról"
 
-#: pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:336
 msgid "You are not allowed to logon at this time"
 msgstr "Most nem jogosult most belépni"
 
-#: pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:337
 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"
 
-#: pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:338
 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"
 
-#: pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:339
 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"
 
-#: pam_winbind.c:340 pam_winbind.c:341 pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
 msgid "Invalid Trust Account"
 msgstr "Érvénytelen Trust Account"
 
-#: pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:343
 msgid "Access is denied"
 msgstr "Hozzáférés megtagadva"
 
-#: pam_winbind.c:592
+#: ../../../nsswitch/pam_winbind.c:592
 msgid "Your password expires today"
 msgstr "A jelszava ma jár le"
 
-#: pam_winbind.c:597
+#: ../../../nsswitch/pam_winbind.c:597
 #, c-format
 msgid "Your password will expire in %d %s"
 msgstr "Jelszava le fog járni %d %s"
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "days"
 msgstr "nap múlva"
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "day"
 msgstr "nap múlva"
 
-#: pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:917
 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"
 
-#: pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:924
 msgid ""
 "Domain Controller unreachable, using cached credentials instead. Network "
 "resources may be unavailable"
@@ -108,22 +108,22 @@ 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 "
 
-#: pam_winbind.c:950
+#: ../../../nsswitch/pam_winbind.c:950
 #, c-format
 msgid "Your password "
 msgstr "A jelszavának"
 
-#: pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:957
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "legalább %d karakterből kell állnia; "
 
-#: pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:967
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "nem ismétlődhet az előző %d jelszó; "
 
-#: pam_winbind.c:977
+#: ../../../nsswitch/pam_winbind.c:977
 #, c-format
 msgid ""
 "must contain capitals, numerals or punctuation; and cannot contain your "
@@ -132,7 +132,7 @@ msgstr ""
 "tartalmaznia kell betűket, számokat vagy írásjeleket és nem tartalmazhatja a "
 "felhasználói vagy a teljes nevét; "
 
-#: pam_winbind.c:986
+#: ../../../nsswitch/pam_winbind.c:986
 #, c-format
 msgid ""
 "Please type a different password. Type a password which meets these "
@@ -141,26 +141,26 @@ msgstr ""
 "Adjon meg egy másik jelszót. Írjon be mindkét szövegmezőbe a feltételeknek "
 "megfelelő jelszót."
 
-#: pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1223
 msgid "Password does not meet complexity requirements"
 msgstr "A jelszó nem felel meg a követelményeknek"
 
-#: pam_winbind.c:1564
+#: ../../../nsswitch/pam_winbind.c:1564
 msgid "Password: "
 msgstr "Jelszó: "
 
-#: pam_winbind.c:2013
+#: ../../../nsswitch/pam_winbind.c:2013
 msgid "Changing password for"
 msgstr "Jelszómódosítás"
 
-#: pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:2027
 msgid "(current) NT password: "
 msgstr "(jelenlegi) NT jelszó: "
 
-#: pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:2089
 msgid "Enter new NT password: "
 msgstr "Új NT jelszó: "
 
-#: pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:2090
 msgid "Retype new NT password: "
 msgstr "Új NT jelszó ismét: "
diff --git a/source3/locale/pam_winbind/it.po b/source3/locale/pam_winbind/it.po
index ddb70e21a51..e5ca86e6a85 100644
--- a/source3/locale/pam_winbind/it.po
+++ b/source3/locale/pam_winbind/it.po
@@ -13,141 +13,141 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:326
 msgid "Success"
 msgstr "Successo"
 
-#: pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:327
 msgid "No primary Domain Controler available"
 msgstr "Nessun controller di dominio primario disponibile"
 
-#: pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:328
 msgid "No domain controllers found"
 msgstr "Nessun controller di dominio trovato"
 
-#: pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:329
 msgid "No logon servers"
 msgstr "Nessun server d'autenticazione"
 
-#: pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:330
 msgid "Password too short"
 msgstr "Password troppo breve"
 
-#: pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:331
 msgid "The password of this user is too recent to change"
 msgstr "La password per questo utente è troppo recente per essere cambiata"
 
-#: pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:332
 msgid "Password is already in password history"
 msgstr "La password è già presente nella cronologia delle password"
 
-#: pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:333
 msgid "Your password has expired"
 msgstr "La password è scaduta"
 
-#: pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:334
 msgid "You need to change your password now"
 msgstr "È necessario modificare la password ora"
 
-#: pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:335
 msgid "You are not allowed to logon from this workstation"
 msgstr "Impossibile effettuare il login da questa workstation"
 
-#: pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:336
 msgid "You are not allowed to logon at this time"
 msgstr "Impossibile effettuare il login in questo momento"
 
-#: pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:337
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "L'account è scaduto. Contattare l'amministratore di sistema"
 
-#: pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:338
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "L'account è disabilitato. Contattare l'amministratore di sistema"
 
-#: pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:339
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "L'account è stato bloccato. Contattare l'amministratore di sistema"
 
-#: pam_winbind.c:340 pam_winbind.c:341 pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
 msgid "Invalid Trust Account"
 msgstr "Account attendibile non valido"
 
-#: pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:343
 msgid "Access is denied"
 msgstr "Accesso negato"
 
-#: pam_winbind.c:592
+#: ../../../nsswitch/pam_winbind.c:592
 msgid "Your password expires today"
 msgstr "La password scade oggi"
 
-#: pam_winbind.c:597
+#: ../../../nsswitch/pam_winbind.c:597
 #, c-format
 msgid "Your password will expire in %d %s"
 msgstr "La password scadrà tra %d %s"
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "days"
 msgstr "giorni"
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "day"
 msgstr "giorno"
 
-#: pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:917
 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"
 
-#: pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:924
 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"
 
-#: pam_winbind.c:950
+#: ../../../nsswitch/pam_winbind.c:950
 #, c-format
 msgid "Your password "
 msgstr "La tua password "
 
-#: pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:957
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "deve essere composta almeno da %d caratteri; "
 
-#: pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:967
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "non puoi ripetere nessuna delle tue %d password precedenti; "
 
-#: pam_winbind.c:977
+#: ../../../nsswitch/pam_winbind.c:977
 #, c-format
 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; "
 
-#: pam_winbind.c:986
+#: ../../../nsswitch/pam_winbind.c:986
 #, c-format
 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."
 
-#: pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1223
 msgid "Password does not meet complexity requirements"
 msgstr "La password non soddisfa i requisiti di complessità"
 
-#: pam_winbind.c:1564
+#: ../../../nsswitch/pam_winbind.c:1564
 msgid "Password: "
 msgstr "Password: "
 
-#: pam_winbind.c:2013
+#: ../../../nsswitch/pam_winbind.c:2013
 msgid "Changing password for"
 msgstr "Modifica la password per"
 
-#: pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:2027
 msgid "(current) NT password: "
 msgstr "Password NT (corrente): "
 
-#: pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:2089
 msgid "Enter new NT password: "
 msgstr "Immetti la nuova password NT: "
 
-#: pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:2090
 msgid "Retype new NT password: "
 msgstr "Reinserisci la nuova password NT: "
 
diff --git a/source3/locale/pam_winbind/ja.po b/source3/locale/pam_winbind/ja.po
index 991007aff32..c6d08a58dfd 100644
--- a/source3/locale/pam_winbind/ja.po
+++ b/source3/locale/pam_winbind/ja.po
@@ -13,141 +13,141 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:326
 msgid "Success"
 msgstr "成功しました"
 
-#: pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:327
 msgid "No primary Domain Controler available"
 msgstr "プライマリドメインコントローラが利用できません"
 
-#: pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:328
 msgid "No domain controllers found"
 msgstr "ドメインコントローラが見つかりません"
 
-#: pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:329
 msgid "No logon servers"
 msgstr "ログオンサーバがありません"
 
-#: pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:330
 msgid "Password too short"
 msgstr "パスワードが短すぎます"
 
-#: pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:331
 msgid "The password of this user is too recent to change"
 msgstr "このユーザに対するパスワードは変更するには新しすぎます"
 
-#: pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:332
 msgid "Password is already in password history"
 msgstr "指定したパスワードはパスワード履歴内に存在しています"
 
-#: pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:333
 msgid "Your password has expired"
 msgstr "お使いのパスワードの期限が切れました"
 
-#: pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:334
 msgid "You need to change your password now"
 msgstr "パスワードを今すぐ変更する必要があります"
 
-#: pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:335
 msgid "You are not allowed to logon from this workstation"
 msgstr "このワークステーションからログオンすることが許可されていません"
 
-#: pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:336
 msgid "You are not allowed to logon at this time"
 msgstr "この時間にログオンすることが許可されていません"
 
-#: pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:337
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "お使いのアカウントの期限が切れました。システム管理者に連絡してください"
 
-#: pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:338
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "アカウントは無効です。システム管理者にご連絡ください。"
 
-#: pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:339
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "お使いのアカウントはロック (施錠) されています。システム管理者に連絡してください"
 
-#: pam_winbind.c:340 pam_winbind.c:341 pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
 msgid "Invalid Trust Account"
 msgstr "信頼アカウントが正しくありません"
 
-#: pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:343
 msgid "Access is denied"
 msgstr "アクセスが拒否されました"
 
-#: pam_winbind.c:592
+#: ../../../nsswitch/pam_winbind.c:592
 msgid "Your password expires today"
 msgstr "お使いのパスワードは本日期限切れになります"
 
-#: pam_winbind.c:597
+#: ../../../nsswitch/pam_winbind.c:597
 #, c-format
 msgid "Your password will expire in %d %s"
 msgstr "お使いのパスワードは、あと %d %s で有効期限が切れます。"
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "days"
 msgstr "日"
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "day"
 msgstr "日"
 
-#: pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:917
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "猶予ログイン中です。次回ログオン時にすぐにパスワードを変更してください"
 
-#: pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:924
 msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable"
 msgstr "ドメインコントローラにアクセスできないため、記憶済みの認証を使用しました。ネットワーク資源が利用できないかもしれません"
 
-#: pam_winbind.c:950
+#: ../../../nsswitch/pam_winbind.c:950
 #, c-format
 msgid "Your password "
 msgstr "お使いのパスワードは "
 
-#: pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:957
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "少なくとも %d 文字以上でなければなりません; "
 
-#: pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:967
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "過去 %d 個分のパスワードはいずれも再度利用することはできません; "
 
-#: pam_winbind.c:977
+#: ../../../nsswitch/pam_winbind.c:977
 #, c-format
 msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; "
 msgstr "アルファベット大文字や数字、句読点 (カンマやピリオド) のいずれかを含まなければなりません; さらにアカウント名や本名 (フルネーム) を含めることはできません; "
 
-#: pam_winbind.c:986
+#: ../../../nsswitch/pam_winbind.c:986
 #, c-format
 msgid "Please type a different password. Type a password which meets these requirements in both text boxes."
 msgstr "別のパスワードを入力してください。両方のテキストボックス内にこれらの要件を満たすものを入力してください。"
 
-#: pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1223
 msgid "Password does not meet complexity requirements"
 msgstr "パスワードは複雑さの要件を満たしていません"
 
-#: pam_winbind.c:1564
+#: ../../../nsswitch/pam_winbind.c:1564
 msgid "Password: "
 msgstr "パスワード:"
 
-#: pam_winbind.c:2013
+#: ../../../nsswitch/pam_winbind.c:2013
 msgid "Changing password for"
 msgstr "下記に対するパスワードを変更しています"
 
-#: pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:2027
 msgid "(current) NT password: "
 msgstr "現在の NT パスワード: "
 
-#: pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:2089
 msgid "Enter new NT password: "
 msgstr "新しい NT パスワード: "
 
-#: pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:2090
 msgid "Retype new NT password: "
 msgstr "新しい NT パスワードの再入力: "
 
diff --git a/source3/locale/pam_winbind/ko.po b/source3/locale/pam_winbind/ko.po
index d61717344d4..f7a20564058 100644
--- a/source3/locale/pam_winbind/ko.po
+++ b/source3/locale/pam_winbind/ko.po
@@ -13,141 +13,141 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:326
 msgid "Success"
 msgstr "성공"
 
-#: pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:327
 msgid "No primary Domain Controler available"
 msgstr "사용할 수 있는 기본 도메인 컨트롤러가 없습니다."
 
-#: pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:328
 msgid "No domain controllers found"
 msgstr "도메인 컨트롤러가 없습니다."
 
-#: pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:329
 msgid "No logon servers"
 msgstr "서버에 로그온하지 않았습니다."
 
-#: pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:330
 msgid "Password too short"
 msgstr "비밀번호가 너무 짧습니다."
 
-#: pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:331
 msgid "The password of this user is too recent to change"
 msgstr "이 사용자의 비밀번호는 바꾼지 얼마 되지 않아 지금 바꿀 수 없습니다."
 
-#: pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:332
 msgid "Password is already in password history"
 msgstr "비밀번호 이력에 이미 있는 비밀번호입니다."
 
-#: pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:333
 msgid "Your password has expired"
 msgstr "비밀번호가 만료되었습니다."
 
-#: pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:334
 msgid "You need to change your password now"
 msgstr "지금 비밀번호를 변경해야 합니다."
 
-#: pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:335
 msgid "You are not allowed to logon from this workstation"
 msgstr "이 워크스테이션에서 로그온할 수 없습니다."
 
-#: pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:336
 msgid "You are not allowed to logon at this time"
 msgstr "현재 로그온이 허용되지 않습니다."
 
-#: pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:337
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "계정이 만료되었습니다. 시스템 관리자에게 문의하십시오."
 
-#: pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:338
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "계정이 비활성화되었습니다. 시스템 관리자에게 문의하십시오."
 
-#: pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:339
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "계정이 잠겼습니다. 시스템 관리자에게 문의하십시오."
 
-#: pam_winbind.c:340 pam_winbind.c:341 pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
 msgid "Invalid Trust Account"
 msgstr "잘못된 트러스트 계정입니다."
 
-#: pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:343
 msgid "Access is denied"
 msgstr "액세스가 거부되었습니다."
 
-#: pam_winbind.c:592
+#: ../../../nsswitch/pam_winbind.c:592
 msgid "Your password expires today"
 msgstr "오늘 비밀번호가 만료됩니다."
 
-#: pam_winbind.c:597
+#: ../../../nsswitch/pam_winbind.c:597
 #, c-format
 msgid "Your password will expire in %d %s"
 msgstr "비밀번호가 %d %s일 후에 만료됩니다."
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "days"
 msgstr "일"
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "day"
 msgstr "일"
 
-#: pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:917
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "정상적으로 로그온되었습니다. 다시 접속할 때 비밀번호를 변경해 주십시오. "
 
-#: pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:924
 msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable"
 msgstr "캐시된 자격인증을 사용하여 도메인 컨트롤러에 연결할 수 없습니다. 네트워크 리소스를 사용할 수 없습니다. "
 
-#: pam_winbind.c:950
+#: ../../../nsswitch/pam_winbind.c:950
 #, c-format
 msgid "Your password "
 msgstr "비밀번호는"
 
-#: pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:957
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "최소 %d자 이상이어야 합니다."
 
-#: pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:967
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "이전에 사용한 %d개의 비밀번호를 다시 사용할 수 없습니다."
 
-#: pam_winbind.c:977
+#: ../../../nsswitch/pam_winbind.c:977
 #, c-format
 msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; "
 msgstr "대문자, 숫자 또는 문장 부호를 포함해야 하며, 본인의 계정이나 이름을 비밀번호에 사용할 수 없습니다."
 
-#: pam_winbind.c:986
+#: ../../../nsswitch/pam_winbind.c:986
 #, c-format
 msgid "Please type a different password. Type a password which meets these requirements in both text boxes."
 msgstr "다른 비밀번호를 입력하십시오. 비밀번호 요구사항을 준수하여 두 텍스트 상자에 입력해 주십시오. "
 
-#: pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1223
 msgid "Password does not meet complexity requirements"
 msgstr "비밀번호 복잡성 요구사항에 맞지 않습니다."
 
-#: pam_winbind.c:1564
+#: ../../../nsswitch/pam_winbind.c:1564
 msgid "Password: "
 msgstr "비밀번호:"
 
-#: pam_winbind.c:2013
+#: ../../../nsswitch/pam_winbind.c:2013
 msgid "Changing password for"
 msgstr "비밀번호 변경"
 
-#: pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:2027
 msgid "(current) NT password: "
 msgstr "(현재) NT 비밀번호:"
 
-#: pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:2089
 msgid "Enter new NT password: "
 msgstr "새 NT 비밀번호 입력:"
 
-#: pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:2090
 msgid "Retype new NT password: "
 msgstr "새 NT 비밀번호 재입력:"
 
diff --git a/source3/locale/pam_winbind/nb.po b/source3/locale/pam_winbind/nb.po
index 36989b8425e..fb938c94c46 100644
--- a/source3/locale/pam_winbind/nb.po
+++ b/source3/locale/pam_winbind/nb.po
@@ -18,97 +18,97 @@ msgstr ""
 "X-Generator: Lokalize 0.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../nsswitch/pam_winbind.c:533
+#: ../../../nsswitch/pam_winbind.c:533
 msgid "Success"
 msgstr "Vellykket"
 
-#: ../../nsswitch/pam_winbind.c:535
+#: ../../../nsswitch/pam_winbind.c:535
 msgid "No primary Domain Controler available"
 msgstr "Ingen primær domenekontroller tilgjengelig"
 
-#: ../../nsswitch/pam_winbind.c:537
+#: ../../../nsswitch/pam_winbind.c:537
 msgid "No domain controllers found"
 msgstr "Ingen domenekontrollere funnet"
 
-#: ../../nsswitch/pam_winbind.c:539
+#: ../../../nsswitch/pam_winbind.c:539
 msgid "No logon servers"
 msgstr "Ingen innloggingsservere"
 
-#: ../../nsswitch/pam_winbind.c:541
+#: ../../../nsswitch/pam_winbind.c:541
 msgid "Password too short"
 msgstr "Passordet er for kort"
 
-#: ../../nsswitch/pam_winbind.c:543
+#: ../../../nsswitch/pam_winbind.c:543
 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:545
 msgid "Password is already in password history"
 msgstr "Passordet finnes allerede i passordloggen"
 
-#: ../../nsswitch/pam_winbind.c:547
+#: ../../../nsswitch/pam_winbind.c:547
 msgid "Your password has expired"
 msgstr "Passordet er utløpt"
 
-#: ../../nsswitch/pam_winbind.c:549
+#: ../../../nsswitch/pam_winbind.c:549
 msgid "You need to change your password now"
 msgstr "Du må endre passordet nå"
 
-#: ../../nsswitch/pam_winbind.c:551
+#: ../../../nsswitch/pam_winbind.c:551
 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:553
 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:555
 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:558
 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:561
 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:564 ../../../nsswitch/pam_winbind.c:566
+#: ../../../nsswitch/pam_winbind.c:568
 msgid "Invalid Trust Account"
 msgstr "Ugyldig pålitelig konto"
 
-#: ../../nsswitch/pam_winbind.c:570
+#: ../../../nsswitch/pam_winbind.c:570
 msgid "Access is denied"
 msgstr "Tilgang avvist"
 
-#: ../../nsswitch/pam_winbind.c:845
+#: ../../../nsswitch/pam_winbind.c:845
 msgid "Your password expires today"
 msgstr "Passordet utløper i dag"
 
-#: ../../nsswitch/pam_winbind.c:851
+#: ../../../nsswitch/pam_winbind.c:851
 #, c-format
 msgid "Your password will expire in %d %s"
 msgstr "Passordet vil utløpe om %d %s"
 
-#: ../../nsswitch/pam_winbind.c:852
+#: ../../../nsswitch/pam_winbind.c:852
 msgid "days"
 msgstr "dager"
 
-#: ../../nsswitch/pam_winbind.c:852
+#: ../../../nsswitch/pam_winbind.c:852
 msgid "day"
 msgstr "dag"
 
-#: ../../nsswitch/pam_winbind.c:1193
+#: ../../../nsswitch/pam_winbind.c:1193
 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:1203
 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:1228
 msgid ""
 "Failed to establish your Kerberos Ticket cache due time differences\n"
 "with the domain controller.  Please verify the system time.\n"
@@ -116,60 +116,60 @@ 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
+#: ../../../nsswitch/pam_winbind.c:1258
 #, c-format
 msgid "Your password "
 msgstr "Passordet "
 
-#: ../../nsswitch/pam_winbind.c:1265
+#: ../../../nsswitch/pam_winbind.c:1265
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "må inneholde minst %d tegn; "
 
-#: ../../nsswitch/pam_winbind.c:1275
+#: ../../../nsswitch/pam_winbind.c:1275
 #, 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
+#: ../../../nsswitch/pam_winbind.c:1287
 #, c-format
 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
+#: ../../../nsswitch/pam_winbind.c:1298
 #, c-format
 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:1600
 msgid "Password does not meet complexity requirements"
 msgstr "Passordet er for enkelt"
 
-#: ../../nsswitch/pam_winbind.c:2114
+#: ../../../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:2403 ../../../nsswitch/pam_winbind.c:2552
 msgid "Username: "
 msgstr "Brukernavn: "
 
 #. instruct user what is happening
-#: ../../nsswitch/pam_winbind.c:2589
+#: ../../../nsswitch/pam_winbind.c:2589
 msgid "Changing password for"
 msgstr "Endrer passord for"
 
-#: ../../nsswitch/pam_winbind.c:2604
+#: ../../../nsswitch/pam_winbind.c:2604
 msgid "(current) NT password: "
 msgstr "(gjeldende) NT-passord: "
 
-#: ../../nsswitch/pam_winbind.c:2672
+#: ../../../nsswitch/pam_winbind.c:2672
 msgid "Enter new NT password: "
 msgstr "Angi nytt NT-passord: "
 
-#: ../../nsswitch/pam_winbind.c:2673
+#: ../../../nsswitch/pam_winbind.c:2673
 msgid "Retype new NT password: "
 msgstr "Bekreft det nye NT-passordet: "
 
@@ -177,7 +177,7 @@ 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:119
 msgid "Sorry, passwords do not match"
 msgstr "Beklager, passordene samsvarer ikke"
 
diff --git a/source3/locale/pam_winbind/nl.po b/source3/locale/pam_winbind/nl.po
index f87bc94c6e9..e771e38ad31 100644
--- a/source3/locale/pam_winbind/nl.po
+++ b/source3/locale/pam_winbind/nl.po
@@ -13,141 +13,141 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:326
 msgid "Success"
 msgstr "Succes"
 
-#: pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:327
 msgid "No primary Domain Controler available"
 msgstr "Geen primaire domeincontroller beschikbaar"
 
-#: pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:328
 msgid "No domain controllers found"
 msgstr "Geen domeincontroller gevonden"
 
-#: pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:329
 msgid "No logon servers"
 msgstr "Geen aanmeldservers"
 
-#: pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:330
 msgid "Password too short"
 msgstr "Wachtwoord te kort"
 
-#: pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:331
 msgid "The password of this user is too recent to change"
 msgstr "Het wachtwoord van deze gebruiker is te recent om te wijzigen"
 
-#: pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:332
 msgid "Password is already in password history"
 msgstr "Wachtwoord zit al in de wachtwoordgeschiedenis"
 
-#: pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:333
 msgid "Your password has expired"
 msgstr "Uw wachtwoord is verlopen"
 
-#: pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:334
 msgid "You need to change your password now"
 msgstr "U moet uw wachtwoord nu wijzigen"
 
-#: pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:335
 msgid "You are not allowed to logon from this workstation"
 msgstr "U mag u vanaf dit werkstation niet aanmelden"
 
-#: pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:336
 msgid "You are not allowed to logon at this time"
 msgstr "U mag u op dit tijdstip niet aanmelden"
 
-#: pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:337
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "Uw account is verlopen. Neem contact op met uw systeembeheerder"
 
-#: pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:338
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "Uw account is uitgeschakeld. Neem contact op met de systeembeheerder"
 
-#: pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:339
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "Uw account is vergrendeld. Meen contact op met uw systeembeheerder"
 
-#: pam_winbind.c:340 pam_winbind.c:341 pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
 msgid "Invalid Trust Account"
 msgstr "Ongeldige vertrouwde account"
 
-#: pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:343
 msgid "Access is denied"
 msgstr "Toegang geweigerd"
 
-#: pam_winbind.c:592
+#: ../../../nsswitch/pam_winbind.c:592
 msgid "Your password expires today"
 msgstr "Uw wachtwoord verloopt vandaag"
 
-#: pam_winbind.c:597
+#: ../../../nsswitch/pam_winbind.c:597
 #, c-format
 msgid "Your password will expire in %d %s"
 msgstr "Uw wachtwoord verloopt over %d %s"
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "days"
 msgstr "dagen"
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "day"
 msgstr "dag"
 
-#: pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:917
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "Dispensatie-aanmelding. Wijzig uw wachtwoord zodra u weer online bent"
 
-#: pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:924
 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"
 
-#: pam_winbind.c:950
+#: ../../../nsswitch/pam_winbind.c:950
 #, c-format
 msgid "Your password "
 msgstr "Uw wachtwoord "
 
-#: pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:957
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "moet uit minstens %d tekens bestaan; "
 
-#: pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:967
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "mag niet hetzelfde zijn als een van uw voorgaande %d wachtwoorden; "
 
-#: pam_winbind.c:977
+#: ../../../nsswitch/pam_winbind.c:977
 #, c-format
 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; "
 
-#: pam_winbind.c:986
+#: ../../../nsswitch/pam_winbind.c:986
 #, c-format
 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."
 
-#: pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1223
 msgid "Password does not meet complexity requirements"
 msgstr "Wachtwoord voldoet niet aan de complexiteitseisen"
 
-#: pam_winbind.c:1564
+#: ../../../nsswitch/pam_winbind.c:1564
 msgid "Password: "
 msgstr "Wachtwoord:"
 
-#: pam_winbind.c:2013
+#: ../../../nsswitch/pam_winbind.c:2013
 msgid "Changing password for"
 msgstr "Wachtwoord wijzigen voor"
 
-#: pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:2027
 msgid "(current) NT password: "
 msgstr "(huidig) NT-wachtwoord: "
 
-#: pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:2089
 msgid "Enter new NT password: "
 msgstr "Geef nieuw NT-wachtwoord: "
 
-#: pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:2090
 msgid "Retype new NT password: "
 msgstr "Nieuw NT-wachtwoord herhalen: "
 
diff --git a/source3/locale/pam_winbind/pl.po b/source3/locale/pam_winbind/pl.po
index b9a5cf63289..f3c08d86981 100644
--- a/source3/locale/pam_winbind/pl.po
+++ b/source3/locale/pam_winbind/pl.po
@@ -13,141 +13,141 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:326
 msgid "Success"
 msgstr "Sukces"
 
-#: pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:327
 msgid "No primary Domain Controler available"
 msgstr "Brak podstawowego kontolera domeny"
 
-#: pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:328
 msgid "No domain controllers found"
 msgstr "Nie odnaleziono kontrolerów domen"
 
-#: pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:329
 msgid "No logon servers"
 msgstr "Brak serwerów logowania"
 
-#: pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:330
 msgid "Password too short"
 msgstr "Zbyt krótkie hasło"
 
-#: pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:331
 msgid "The password of this user is too recent to change"
 msgstr "Hasło tego użytkownika jest zbyt nowe, aby je zmienić"
 
-#: pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:332
 msgid "Password is already in password history"
 msgstr "Hasło znajduje się już w historii haseł."
 
-#: pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:333
 msgid "Your password has expired"
 msgstr "Hasło użytkownika wygasło"
 
-#: pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:334
 msgid "You need to change your password now"
 msgstr "Zmiana hasła jest wymagana w tej chwili"
 
-#: pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:335
 msgid "You are not allowed to logon from this workstation"
 msgstr "Brak zezwolenia na logowanie się z tej stacji roboczej"
 
-#: pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:336
 msgid "You are not allowed to logon at this time"
 msgstr "Brak zezwolenia na logowanie się w tej chwili"
 
-#: pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:337
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "To konto wygasło. Proszę skontaktować się z administratorem systemu."
 
-#: pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:338
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "To konto zostało wyłączone. Proszę skontaktować się z administratorem systemu."
 
-#: pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:339
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "To konto zostało zablokowane. Proszę skontaktować się z administratorem systemu."
 
-#: pam_winbind.c:340 pam_winbind.c:341 pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
 msgid "Invalid Trust Account"
 msgstr "Nieprawidłowe zaufane konto"
 
-#: pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:343
 msgid "Access is denied"
 msgstr "Brak dostępu"
 
-#: pam_winbind.c:592
+#: ../../../nsswitch/pam_winbind.c:592
 msgid "Your password expires today"
 msgstr "Hasło użytkownika wygasa dzisiaj"
 
-#: pam_winbind.c:597
+#: ../../../nsswitch/pam_winbind.c:597
 #, c-format
 msgid "Your password will expire in %d %s"
 msgstr "Hasło użytkownika wygaśnie za %d %s."
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "days"
 msgstr "dni"
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "day"
 msgstr "dzień"
 
-#: pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:917
 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."
 
-#: pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:924
 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."
 
-#: pam_winbind.c:950
+#: ../../../nsswitch/pam_winbind.c:950
 #, c-format
 msgid "Your password "
 msgstr "Hasło użytkownika "
 
-#: pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:957
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "musi mieć co najmniej %d znaków; "
 
-#: pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:967
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "nie można powtarzać żadnego z poprzednich %d haseł, "
 
-#: pam_winbind.c:977
+#: ../../../nsswitch/pam_winbind.c:977
 #, c-format
 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; "
 
-#: pam_winbind.c:986
+#: ../../../nsswitch/pam_winbind.c:986
 #, c-format
 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."
 
-#: pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1223
 msgid "Password does not meet complexity requirements"
 msgstr "Hasło nie spełnia wymagań złożoności"
 
-#: pam_winbind.c:1564
+#: ../../../nsswitch/pam_winbind.c:1564
 msgid "Password: "
 msgstr "Hasło: "
 
-#: pam_winbind.c:2013
+#: ../../../nsswitch/pam_winbind.c:2013
 msgid "Changing password for"
 msgstr "Zmiana hasła dla"
 
-#: pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:2027
 msgid "(current) NT password: "
 msgstr "(aktualne) hasło NT: "
 
-#: pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:2089
 msgid "Enter new NT password: "
 msgstr "Prosze podać nowe hasło NT: "
 
-#: pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:2090
 msgid "Retype new NT password: "
 msgstr "Powtórzenie nowego hasła NT: "
 
diff --git a/source3/locale/pam_winbind/pt_BR.po b/source3/locale/pam_winbind/pt_BR.po
index c1c993119ac..456f6fbe62b 100644
--- a/source3/locale/pam_winbind/pt_BR.po
+++ b/source3/locale/pam_winbind/pt_BR.po
@@ -13,141 +13,141 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:326
 msgid "Success"
 msgstr "Sucesso"
 
-#: pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:327
 msgid "No primary Domain Controler available"
 msgstr "Nenhum Controlador de Domínio primário disponível"
 
-#: pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:328
 msgid "No domain controllers found"
 msgstr "Nenhum controlador de domínio encontrado"
 
-#: pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:329
 msgid "No logon servers"
 msgstr "Nenhum servidor de logon"
 
-#: pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:330
 msgid "Password too short"
 msgstr "Senha muito curta"
 
-#: pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:331
 msgid "The password of this user is too recent to change"
 msgstr "A senha deste usuário é muito recente para ser alterada"
 
-#: pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:332
 msgid "Password is already in password history"
 msgstr "A senha já está no histórico de senhas"
 
-#: pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:333
 msgid "Your password has expired"
 msgstr "Sua senha expirou"
 
-#: pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:334
 msgid "You need to change your password now"
 msgstr "Você precisa alterar sua senha agora"
 
-#: pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:335
 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"
 
-#: pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:336
 msgid "You are not allowed to logon at this time"
 msgstr "Você não tem autorização para efetuar login agora"
 
-#: pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:337
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "Sua conta expirou. Entre em contato com o administrador do sistema"
 
-#: pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:338
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "Sua conta está desabilitada. Entre em contato com o administrador do sistema"
 
-#: pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:339
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "Sua conta foi bloqueada. Entre em contato com o administrador do sistema"
 
-#: pam_winbind.c:340 pam_winbind.c:341 pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
 msgid "Invalid Trust Account"
 msgstr "Conta Confiável Inválida"
 
-#: pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:343
 msgid "Access is denied"
 msgstr "O acesso foi negado"
 
-#: pam_winbind.c:592
+#: ../../../nsswitch/pam_winbind.c:592
 msgid "Your password expires today"
 msgstr "Sua senha expira hoje"
 
-#: pam_winbind.c:597
+#: ../../../nsswitch/pam_winbind.c:597
 #, c-format
 msgid "Your password will expire in %d %s"
 msgstr "Sua senha expirará em %d %s."
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "days"
 msgstr "dias"
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "day"
 msgstr "dia"
 
-#: pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:917
 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"
 
-#: pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:924
 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"
 
-#: pam_winbind.c:950
+#: ../../../nsswitch/pam_winbind.c:950
 #, c-format
 msgid "Your password "
 msgstr "Sua senha"
 
-#: pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:957
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "deve ter no mínimo %d caracteres;"
 
-#: pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:967
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "não é permitido repetir quaisquer das suas %d senhas anteriores;"
 
-#: pam_winbind.c:977
+#: ../../../nsswitch/pam_winbind.c:977
 #, c-format
 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;"
 
-#: pam_winbind.c:986
+#: ../../../nsswitch/pam_winbind.c:986
 #, c-format
 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."
 
-#: pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1223
 msgid "Password does not meet complexity requirements"
 msgstr "A senha não atende aos requisitos de complexidade"
 
-#: pam_winbind.c:1564
+#: ../../../nsswitch/pam_winbind.c:1564
 msgid "Password: "
 msgstr "Senha:"
 
-#: pam_winbind.c:2013
+#: ../../../nsswitch/pam_winbind.c:2013
 msgid "Changing password for"
 msgstr "Alterando a senha para"
 
-#: pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:2027
 msgid "(current) NT password: "
 msgstr "(atual) senha NT:"
 
-#: pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:2089
 msgid "Enter new NT password: "
 msgstr "Digite a nova senha NT:"
 
-#: pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:2090
 msgid "Retype new NT password: "
 msgstr "Redigite a nova senha NT:"
 
diff --git a/source3/locale/pam_winbind/ru.po b/source3/locale/pam_winbind/ru.po
index ade64b604f8..73b91e414f8 100644
--- a/source3/locale/pam_winbind/ru.po
+++ b/source3/locale/pam_winbind/ru.po
@@ -13,141 +13,141 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:326
 msgid "Success"
 msgstr "успешно"
 
-#: pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:327
 msgid "No primary Domain Controler available"
 msgstr "Нет доступных основных контроллеров домена"
 
-#: pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:328
 msgid "No domain controllers found"
 msgstr "Контроллеры домена не найдены"
 
-#: pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:329
 msgid "No logon servers"
 msgstr "Нет серверов входа"
 
-#: pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:330
 msgid "Password too short"
 msgstr "Пароль слишком короткий"
 
-#: pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:331
 msgid "The password of this user is too recent to change"
 msgstr "Пароль этого пользователя слишком новый, чтобы его менять"
 
-#: pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:332
 msgid "Password is already in password history"
 msgstr "Пароль уже в истории паролей"
 
-#: pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:333
 msgid "Your password has expired"
 msgstr "Срок действия Вашего пароля истёк"
 
-#: pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:334
 msgid "You need to change your password now"
 msgstr "Вам необходимо изменить Ваш пароль сейчас"
 
-#: pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:335
 msgid "You are not allowed to logon from this workstation"
 msgstr "Вам не разрешается входить с этой рабочей станции"
 
-#: pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:336
 msgid "You are not allowed to logon at this time"
 msgstr "Вам не разрешается входить в это время"
 
-#: pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:337
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "Срок действия Вашей учетной записи истёк. Пожалуйста, обратитесь к системному администратору"
 
-#: pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:338
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "Ваша учетная запись заблокирована. Обратитесь к системному администратору"
 
-#: pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:339
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "Ваша учётная запись заблокирована. Пожалуйста, обратитесь к системному администратору"
 
-#: pam_winbind.c:340 pam_winbind.c:341 pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
 msgid "Invalid Trust Account"
 msgstr "Неверная доверенная учётная запись"
 
-#: pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:343
 msgid "Access is denied"
 msgstr "Доступ запрещён"
 
-#: pam_winbind.c:592
+#: ../../../nsswitch/pam_winbind.c:592
 msgid "Your password expires today"
 msgstr "Срок действия Вашего пароля истекает сегодня"
 
-#: pam_winbind.c:597
+#: ../../../nsswitch/pam_winbind.c:597
 #, c-format
 msgid "Your password will expire in %d %s"
 msgstr "Срок действия Вашего пароля истечёт через %d %s"
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "days"
 msgstr "Дней"
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "day"
 msgstr "День"
 
-#: pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:917
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "Вход разрешён. Пожалуйста, измените Ваш пароль, как только Вы снова будете в сети"
 
-#: pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:924
 msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable"
 msgstr "Контроллер домена недоступен, используются кэшированные учетные данные входа. Сетевые ресурсы могут быть недоступны"
 
-#: pam_winbind.c:950
+#: ../../../nsswitch/pam_winbind.c:950
 #, c-format
 msgid "Your password "
 msgstr "Ваш пароль "
 
-#: pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:957
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "должен иметь хотя бы %d символов;"
 
-#: pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:967
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "не может повторять любой из ваших предыдущих %d паролей;"
 
-#: pam_winbind.c:977
+#: ../../../nsswitch/pam_winbind.c:977
 #, c-format
 msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; "
 msgstr "должен содержать заглавные буквы, цифры или знаки препинания; и не может содержать Вашу учётную запись или полное имя; "
 
-#: pam_winbind.c:986
+#: ../../../nsswitch/pam_winbind.c:986
 #, c-format
 msgid "Please type a different password. Type a password which meets these requirements in both text boxes."
 msgstr "Пожалуйста, введите другой пароль. Введите пароль, соответствующий этим требованиям, в оба текстовых поля."
 
-#: pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1223
 msgid "Password does not meet complexity requirements"
 msgstr "Пароль не соответствует требованиям сложности"
 
-#: pam_winbind.c:1564
+#: ../../../nsswitch/pam_winbind.c:1564
 msgid "Password: "
 msgstr "Пароль:"
 
-#: pam_winbind.c:2013
+#: ../../../nsswitch/pam_winbind.c:2013
 msgid "Changing password for"
 msgstr "Изменение пароля для"
 
-#: pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:2027
 msgid "(current) NT password: "
 msgstr "(текущий) пароль NT: "
 
-#: pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:2089
 msgid "Enter new NT password: "
 msgstr "Введите новый пароль NT: "
 
-#: pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:2090
 msgid "Retype new NT password: "
 msgstr "Повторите новый пароль NT: "
 
diff --git a/source3/locale/pam_winbind/sv.po b/source3/locale/pam_winbind/sv.po
index f5c0552542f..a783f58eb18 100644
--- a/source3/locale/pam_winbind/sv.po
+++ b/source3/locale/pam_winbind/sv.po
@@ -13,141 +13,141 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:326
 msgid "Success"
 msgstr "Lyckades"
 
-#: pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:327
 msgid "No primary Domain Controler available"
 msgstr "Det finns ingen tillgänglig primär domänkontrollant"
 
-#: pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:328
 msgid "No domain controllers found"
 msgstr "Inga domänkontrollanter hittades"
 
-#: pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:329
 msgid "No logon servers"
 msgstr "Inga inloggningsservrar"
 
-#: pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:330
 msgid "Password too short"
 msgstr "Lösenordet är för kort"
 
-#: pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:331
 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"
 
-#: pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:332
 msgid "Password is already in password history"
 msgstr "Lösenordet finns redan i lösenordshistoriken"
 
-#: pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:333
 msgid "Your password has expired"
 msgstr "Ditt lösenord gäller inte längre"
 
-#: pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:334
 msgid "You need to change your password now"
 msgstr "Du måste ändra ditt lösenord nu"
 
-#: pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:335
 msgid "You are not allowed to logon from this workstation"
 msgstr "Du kan inte logga in från den här arbetsstationen"
 
-#: pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:336
 msgid "You are not allowed to logon at this time"
 msgstr "Du kan inte logga in just nu"
 
-#: pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:337
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "Ditt konto gäller inte längre. Kontakta systemadministratören"
 
-#: pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:338
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "Ditt konto har inaktiverats. Kontakta systemadministratören."
 
-#: pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:339
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "Ditt konto har låsts. Kontakta systemadministratören"
 
-#: pam_winbind.c:340 pam_winbind.c:341 pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
 msgid "Invalid Trust Account"
 msgstr "Ogiltigt förtroendekonto"
 
-#: pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:343
 msgid "Access is denied"
 msgstr "Åtkomst nekades"
 
-#: pam_winbind.c:592
+#: ../../../nsswitch/pam_winbind.c:592
 msgid "Your password expires today"
 msgstr "Ditt lösenord upphör att gälla i dag"
 
-#: pam_winbind.c:597
+#: ../../../nsswitch/pam_winbind.c:597
 #, c-format
 msgid "Your password will expire in %d %s"
 msgstr "Ditt lösenord slutar gälla om %d %s"
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "days"
 msgstr "dagar"
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "day"
 msgstr "dag"
 
-#: pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:917
 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"
 
-#: pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:924
 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"
 
-#: pam_winbind.c:950
+#: ../../../nsswitch/pam_winbind.c:950
 #, c-format
 msgid "Your password "
 msgstr "Ditt lösenord"
 
-#: pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:957
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "måste vara minst %d tecken långt, "
 
-#: pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:967
 #, 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 "
 
-#: pam_winbind.c:977
+#: ../../../nsswitch/pam_winbind.c:977
 #, c-format
 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,"
 
-#: pam_winbind.c:986
+#: ../../../nsswitch/pam_winbind.c:986
 #, c-format
 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."
 
-#: pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1223
 msgid "Password does not meet complexity requirements"
 msgstr "Lösenordet uppfyller inte kraven på komplexitet"
 
-#: pam_winbind.c:1564
+#: ../../../nsswitch/pam_winbind.c:1564
 msgid "Password: "
 msgstr "Lösenord:"
 
-#: pam_winbind.c:2013
+#: ../../../nsswitch/pam_winbind.c:2013
 msgid "Changing password for"
 msgstr "Ändrar lösenord för"
 
-#: pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:2027
 msgid "(current) NT password: "
 msgstr "(aktuellt) NT-lösenord:"
 
-#: pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:2089
 msgid "Enter new NT password: "
 msgstr "Ange det nya NT-lösenordet: "
 
-#: pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:2090
 msgid "Retype new NT password: "
 msgstr "Skriv det nya NT-lösenordet igen: "
 
diff --git a/source3/locale/pam_winbind/zh_CN.po b/source3/locale/pam_winbind/zh_CN.po
index 6388b9f0524..d1eeb9a38ac 100644
--- a/source3/locale/pam_winbind/zh_CN.po
+++ b/source3/locale/pam_winbind/zh_CN.po
@@ -13,141 +13,141 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:326
 msgid "Success"
 msgstr "成功"
 
-#: pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:327
 msgid "No primary Domain Controler available"
 msgstr "没有可用的主域控制器"
 
-#: pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:328
 msgid "No domain controllers found"
 msgstr "未发现任何域控制器"
 
-#: pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:329
 msgid "No logon servers"
 msgstr "无登录服务器"
 
-#: pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:330
 msgid "Password too short"
 msgstr "密码太短"
 
-#: pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:331
 msgid "The password of this user is too recent to change"
 msgstr "此用户的密码很新，无法更改"
 
-#: pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:332
 msgid "Password is already in password history"
 msgstr "密码已在密码历史记录中"
 
-#: pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:333
 msgid "Your password has expired"
 msgstr "您的密码已失效"
 
-#: pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:334
 msgid "You need to change your password now"
 msgstr "您需要立即更改密码"
 
-#: pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:335
 msgid "You are not allowed to logon from this workstation"
 msgstr "不允许您从此工作站登录"
 
-#: pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:336
 msgid "You are not allowed to logon at this time"
 msgstr "此时不允许您登录"
 
-#: pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:337
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "您的帐户已失效。请与系统管理员联系"
 
-#: pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:338
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "您的帐户已禁用。请与系统管理员联系"
 
-#: pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:339
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "您的帐户已锁定。请与系统管理员联系"
 
-#: pam_winbind.c:340 pam_winbind.c:341 pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
 msgid "Invalid Trust Account"
 msgstr "无效的信任帐户"
 
-#: pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:343
 msgid "Access is denied"
 msgstr "访问被拒绝"
 
-#: pam_winbind.c:592
+#: ../../../nsswitch/pam_winbind.c:592
 msgid "Your password expires today"
 msgstr "您的密码将于今天失效"
 
-#: pam_winbind.c:597
+#: ../../../nsswitch/pam_winbind.c:597
 #, c-format
 msgid "Your password will expire in %d %s"
 msgstr "您的密码将在 %d %s 后失效"
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "days"
 msgstr "天"
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "day"
 msgstr "天"
 
-#: pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:917
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "宽限登录。请在您再次联机时立即更改密码"
 
-#: pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:924
 msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable"
 msgstr "域控制器无法访问，改为使用超速缓存的身份凭证。网络资源可能不可用"
 
-#: pam_winbind.c:950
+#: ../../../nsswitch/pam_winbind.c:950
 #, c-format
 msgid "Your password "
 msgstr "您的密码 "
 
-#: pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:957
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "必须至少为 %d 个字符； "
 
-#: pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:967
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "不能重复先前 %d 个密码中的任何一个； "
 
-#: pam_winbind.c:977
+#: ../../../nsswitch/pam_winbind.c:977
 #, c-format
 msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; "
 msgstr "必须包含大写字母、数字或标点；且不得包含您的帐户或全名； "
 
-#: pam_winbind.c:986
+#: ../../../nsswitch/pam_winbind.c:986
 #, c-format
 msgid "Please type a different password. Type a password which meets these requirements in both text boxes."
 msgstr "请键入其他密码。在两个文本框中键入符合这些要求的密码。"
 
-#: pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1223
 msgid "Password does not meet complexity requirements"
 msgstr "密码不符合复杂度要求"
 
-#: pam_winbind.c:1564
+#: ../../../nsswitch/pam_winbind.c:1564
 msgid "Password: "
 msgstr "密码："
 
-#: pam_winbind.c:2013
+#: ../../../nsswitch/pam_winbind.c:2013
 msgid "Changing password for"
 msgstr "更改密码"
 
-#: pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:2027
 msgid "(current) NT password: "
 msgstr "（当前）NT 密码： "
 
-#: pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:2089
 msgid "Enter new NT password: "
 msgstr "输入新 NT 密码： "
 
-#: pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:2090
 msgid "Retype new NT password: "
 msgstr "重键入新 NT 密码： "
 
diff --git a/source3/locale/pam_winbind/zh_TW.po b/source3/locale/pam_winbind/zh_TW.po
index d448140f674..a8460fe3545 100644
--- a/source3/locale/pam_winbind/zh_TW.po
+++ b/source3/locale/pam_winbind/zh_TW.po
@@ -13,141 +13,141 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:326
 msgid "Success"
 msgstr "成功"
 
-#: pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:327
 msgid "No primary Domain Controler available"
 msgstr "無可用的主要領域控制器"
 
-#: pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:328
 msgid "No domain controllers found"
 msgstr "找不到領域控制器"
 
-#: pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:329
 msgid "No logon servers"
 msgstr "沒有登入伺服器"
 
-#: pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:330
 msgid "Password too short"
 msgstr "密碼太短"
 
-#: pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:331
 msgid "The password of this user is too recent to change"
 msgstr "此使用者的密碼太新，無法變更"
 
-#: pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:332
 msgid "Password is already in password history"
 msgstr "密碼歷程記錄中已存在此密碼"
 
-#: pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:333
 msgid "Your password has expired"
 msgstr "您的密碼已過期"
 
-#: pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:334
 msgid "You need to change your password now"
 msgstr "您需要立即變更密碼"
 
-#: pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:335
 msgid "You are not allowed to logon from this workstation"
 msgstr "您不允許從此工作站登入"
 
-#: pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:336
 msgid "You are not allowed to logon at this time"
 msgstr "目前您不允許登入"
 
-#: pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:337
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "您的帳戶已經過期，請聯絡您的系統管理員"
 
-#: pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:338
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "您的帳戶已經停用，請聯絡您的系統管理員"
 
-#: pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:339
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "您的帳戶已經鎖定，請聯絡您的系統管理員"
 
-#: pam_winbind.c:340 pam_winbind.c:341 pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
 msgid "Invalid Trust Account"
 msgstr "無效的信任帳戶"
 
-#: pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:343
 msgid "Access is denied"
 msgstr "存取遭拒"
 
-#: pam_winbind.c:592
+#: ../../../nsswitch/pam_winbind.c:592
 msgid "Your password expires today"
 msgstr "您的密碼今天到期"
 
-#: pam_winbind.c:597
+#: ../../../nsswitch/pam_winbind.c:597
 #, c-format
 msgid "Your password will expire in %d %s"
 msgstr "您的密碼將在  %d %s 之後過期"
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "days"
 msgstr "日"
 
-#: pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:598
 msgid "day"
 msgstr "日"
 
-#: pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:917
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "寬限登入。請於您再次上線時立即變更密碼"
 
-#: pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:924
 msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable"
 msgstr "領域控制器無法連線，改用快取的身份證明。網路資源可能不可用"
 
-#: pam_winbind.c:950
+#: ../../../nsswitch/pam_winbind.c:950
 #, c-format
 msgid "Your password "
 msgstr "您的密碼"
 
-#: pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:957
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "必須至少包含 %d 個字元；"
 
-#: pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:967
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "不能重複使用前 %d 個密碼；"
 
-#: pam_winbind.c:977
+#: ../../../nsswitch/pam_winbind.c:977
 #, c-format
 msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; "
 msgstr "必須包含大寫字母、數字或標點符號；並且不能包含您的帳戶或全名；"
 
-#: pam_winbind.c:986
+#: ../../../nsswitch/pam_winbind.c:986
 #, c-format
 msgid "Please type a different password. Type a password which meets these requirements in both text boxes."
 msgstr "請輸入另一個密碼。請在兩個文字方塊中輸入符合這些要求的密碼。"
 
-#: pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1223
 msgid "Password does not meet complexity requirements"
 msgstr "密碼不符合複雜性要求"
 
-#: pam_winbind.c:1564
+#: ../../../nsswitch/pam_winbind.c:1564
 msgid "Password: "
 msgstr "密碼："
 
-#: pam_winbind.c:2013
+#: ../../../nsswitch/pam_winbind.c:2013
 msgid "Changing password for"
 msgstr "變更密碼 -"
 
-#: pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:2027
 msgid "(current) NT password: "
 msgstr "(目前) NT 密碼："
 
-#: pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:2089
 msgid "Enter new NT password: "
 msgstr "輸入新 NT 密碼︰"
 
-#: pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:2090
 msgid "Retype new NT password: "
 msgstr "重新輸入新 NT 密碼："