[SCM] Samba Shared Repository - branch master updated

Bo Yang boyang at samba.org
Thu Mar 4 00:40:00 MST 2010


The branch, master has been updated
       via  6384f45... s3: Rerun genmsg after adding more strings.
       via  ef0b4e4... s3: Add i18n/l10n strings in pam_winbind.c coming from winbindd.
      from  fd00867... s4:samdb.c - Make it signed-safe

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6384f45f5253203ad4356dc94d2f520f310625a5
Author: Bo Yang <boyang at samba.org>
Date:   Sat Mar 6 01:59:55 2010 +0800

    s3: Rerun genmsg after adding more strings.
    
    Signed-off-by: Bo Yang <boyang at samba.org>

commit ef0b4e4687d9ea02554fe22f02cc615527e917ee
Author: Bo Yang <boyang at samba.org>
Date:   Sat Mar 6 01:53:13 2010 +0800

    s3: Add i18n/l10n strings in pam_winbind.c coming from winbindd.
    
    Signed-off-by: Bo Yang <boyang at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 nsswitch/pam_winbind.c              |    2 +-
 source3/libsmb/nterr.c              |  186 +++++++-------
 source3/locale/pam_winbind/ar.po    |  485 ++++++++++++++++++++++++++++++---
 source3/locale/pam_winbind/cs.po    |  485 ++++++++++++++++++++++++++++++---
 source3/locale/pam_winbind/da.po    |  476 +++++++++++++++++++++++++++++----
 source3/locale/pam_winbind/de.po    |  464 +++++++++++++++++++++++++++++---
 source3/locale/pam_winbind/es.po    |  485 ++++++++++++++++++++++++++++++---
 source3/locale/pam_winbind/fi.po    |  476 +++++++++++++++++++++++++++++----
 source3/locale/pam_winbind/fr.po    |  485 ++++++++++++++++++++++++++++++---
 source3/locale/pam_winbind/genmsg   |    2 +-
 source3/locale/pam_winbind/hu.po    |  505 +++++++++++++++++++++++++++++++----
 source3/locale/pam_winbind/it.po    |  485 ++++++++++++++++++++++++++++++---
 source3/locale/pam_winbind/ja.po    |  485 ++++++++++++++++++++++++++++++---
 source3/locale/pam_winbind/ko.po    |  485 ++++++++++++++++++++++++++++++---
 source3/locale/pam_winbind/nb.po    |  476 +++++++++++++++++++++++++++++----
 source3/locale/pam_winbind/nl.po    |  485 ++++++++++++++++++++++++++++++---
 source3/locale/pam_winbind/pl.po    |  485 ++++++++++++++++++++++++++++++---
 source3/locale/pam_winbind/pt_BR.po |  485 ++++++++++++++++++++++++++++++---
 source3/locale/pam_winbind/ru.po    |  485 ++++++++++++++++++++++++++++++---
 source3/locale/pam_winbind/sv.po    |  485 ++++++++++++++++++++++++++++++---
 source3/locale/pam_winbind/zh_CN.po |  485 ++++++++++++++++++++++++++++++---
 source3/locale/pam_winbind/zh_TW.po |  485 ++++++++++++++++++++++++++++++---
 22 files changed, 8486 insertions(+), 891 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 2689390..f13e365 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -1456,7 +1456,7 @@ static bool _pam_check_remark_auth_err(struct pwb_context *ctx,
 		}
 
 		if (e->display_string) {
-			_make_remark(ctx, PAM_ERROR_MSG, e->display_string);
+			_make_remark(ctx, PAM_ERROR_MSG, _(e->display_string));
 			*pam_error = e->pam_error;
 			return true;
 		}
diff --git a/source3/libsmb/nterr.c b/source3/libsmb/nterr.c
index 197d5bd..328ba3b 100644
--- a/source3/libsmb/nterr.c
+++ b/source3/libsmb/nterr.c
@@ -21,6 +21,10 @@
 
 #include "includes.h"
 
+#if !defined(N_)
+#define N_(string) string
+#endif
+
 typedef struct
 {
 	const char *nt_errstr;
@@ -551,98 +555,98 @@ static const nt_err_code_struct nt_errs[] =
 
 nt_err_code_struct nt_err_desc[] =
 {
-	{ "Success", 				NT_STATUS_OK },
-	{ "Undetermined error", 		NT_STATUS_UNSUCCESSFUL },
-	{ "Access denied", 			NT_STATUS_ACCESS_DENIED },
-	{ "Account locked out", 		NT_STATUS_ACCOUNT_LOCKED_OUT },
-	{ "Must change password", 		NT_STATUS_PASSWORD_MUST_CHANGE },
-	{ "Password is too short", 		NT_STATUS_PWD_TOO_SHORT },
-	{ "Password is too recent", 		NT_STATUS_PWD_TOO_RECENT },
-	{ "Password history conflict", 		NT_STATUS_PWD_HISTORY_CONFLICT },
-	{ "No logon servers", 			NT_STATUS_NO_LOGON_SERVERS },
-	{ "Improperly formed account name", 	NT_STATUS_INVALID_ACCOUNT_NAME },
-	{ "User exists", 			NT_STATUS_USER_EXISTS },
-	{ "No such user", 			NT_STATUS_NO_SUCH_USER },
-	{ "Group exists", 			NT_STATUS_GROUP_EXISTS },
-	{ "No such group", 			NT_STATUS_NO_SUCH_GROUP },
-	{ "Member not in group", 		NT_STATUS_MEMBER_NOT_IN_GROUP },
-	{ "Wrong Password", 			NT_STATUS_WRONG_PASSWORD },
-	{ "Ill formed password", 		NT_STATUS_ILL_FORMED_PASSWORD },
-	{ "Password restriction", 		NT_STATUS_PASSWORD_RESTRICTION },
-	{ "Logon failure", 			NT_STATUS_LOGON_FAILURE },
-	{ "Account restriction", 		NT_STATUS_ACCOUNT_RESTRICTION },
-	{ "Invalid logon hours", 		NT_STATUS_INVALID_LOGON_HOURS },
-	{ "Invalid workstation", 		NT_STATUS_INVALID_WORKSTATION },
-	{ "Password expired", 			NT_STATUS_PASSWORD_EXPIRED },
-	{ "Account disabled", 			NT_STATUS_ACCOUNT_DISABLED },
-	{ "Memory allocation error", 		NT_STATUS_NO_MEMORY },
-	{ "No domain controllers located", 	NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND },
-	{ "Named pipe not available", 		NT_STATUS_PIPE_NOT_AVAILABLE },
-	{ "Not implemented", 			NT_STATUS_NOT_IMPLEMENTED },
-	{ "Invalid information class", 		NT_STATUS_INVALID_INFO_CLASS },
-	{ "Information length mismatch", 	NT_STATUS_INFO_LENGTH_MISMATCH },
-	{ "Access violation", 			NT_STATUS_ACCESS_VIOLATION },
-	{ "Invalid handle", 			NT_STATUS_INVALID_HANDLE },
-	{ "Invalid parameter", 			NT_STATUS_INVALID_PARAMETER },
-	{ "No memory", 				NT_STATUS_NO_MEMORY },
-	{ "Buffer too small", 			NT_STATUS_BUFFER_TOO_SMALL },
-	{ "Revision mismatch", 			NT_STATUS_REVISION_MISMATCH },
-	{ "No such logon session", 		NT_STATUS_NO_SUCH_LOGON_SESSION },
-	{ "No such privilege", 			NT_STATUS_NO_SUCH_PRIVILEGE },
-	{ "Procedure not found", 		NT_STATUS_PROCEDURE_NOT_FOUND },
-	{ "Server disabled", 			NT_STATUS_SERVER_DISABLED },
-	{ "Invalid pipe state", 		NT_STATUS_INVALID_PIPE_STATE },
-	{ "Named pipe busy", 			NT_STATUS_PIPE_BUSY },
-	{ "Illegal function",		 	NT_STATUS_ILLEGAL_FUNCTION },
-	{ "Named pipe dicconnected", 		NT_STATUS_PIPE_DISCONNECTED },
-	{ "Named pipe closing", 		NT_STATUS_PIPE_CLOSING },
-	{ "Remote host not listening", 		NT_STATUS_REMOTE_NOT_LISTENING },
-	{ "Duplicate name on network", 		NT_STATUS_DUPLICATE_NAME },
-	{ "Print queue is full", 		NT_STATUS_PRINT_QUEUE_FULL },
-	{ "No print spool space available", 	NT_STATUS_NO_SPOOL_SPACE },
-	{ "The network name cannot be found",   NT_STATUS_BAD_NETWORK_NAME },
-	{ "The connection was refused",         NT_STATUS_CONNECTION_REFUSED },
-	{ "Too many names", 			NT_STATUS_TOO_MANY_NAMES },
-	{ "Too many sessions", 			NT_STATUS_TOO_MANY_SESSIONS },
-	{ "Invalid server state", 		NT_STATUS_INVALID_SERVER_STATE },
-	{ "Invalid domain state", 		NT_STATUS_INVALID_DOMAIN_STATE },
-	{ "Invalid domain role", 		NT_STATUS_INVALID_DOMAIN_ROLE },
-	{ "No such domain", 			NT_STATUS_NO_SUCH_DOMAIN },
-	{ "Domain exists", 			NT_STATUS_DOMAIN_EXISTS },
-	{ "Domain limit exceeded", 		NT_STATUS_DOMAIN_LIMIT_EXCEEDED },
-	{ "Bad logon session state", 		NT_STATUS_BAD_LOGON_SESSION_STATE },
-	{ "Logon session collision", 		NT_STATUS_LOGON_SESSION_COLLISION },
-	{ "Invalid logon type", 		NT_STATUS_INVALID_LOGON_TYPE },
-	{ "Cancelled", 				NT_STATUS_CANCELLED },
-	{ "Invalid computer name", 		NT_STATUS_INVALID_COMPUTER_NAME },	
-	{ "Logon server conflict", 		NT_STATUS_LOGON_SERVER_CONFLICT },
-	{ "Time difference at domain controller", NT_STATUS_TIME_DIFFERENCE_AT_DC },
-	{ "Pipe broken", 			NT_STATUS_PIPE_BROKEN },
-	{ "Registry corrupt", 			NT_STATUS_REGISTRY_CORRUPT },
-	{ "Too many secrets", 			NT_STATUS_TOO_MANY_SECRETS },
-	{ "Too many SIDs", 			NT_STATUS_TOO_MANY_SIDS },
-	{ "Lanmanager cross encryption required", NT_STATUS_LM_CROSS_ENCRYPTION_REQUIRED },
-	{ "Log file full", 			NT_STATUS_LOG_FILE_FULL },
-	{ "No trusted LSA secret", 		NT_STATUS_NO_TRUST_LSA_SECRET },
-	{ "No trusted SAM account", 		NT_STATUS_NO_TRUST_SAM_ACCOUNT },
-	{ "Trusted domain failure", 		NT_STATUS_TRUSTED_DOMAIN_FAILURE },
-	{ "Trust relationship failure", 	NT_STATUS_TRUSTED_RELATIONSHIP_FAILURE },
-	{ "Trust failure", 			NT_STATUS_TRUST_FAILURE },
-	{ "Netlogon service not started", 	NT_STATUS_NETLOGON_NOT_STARTED },
-	{ "Account expired", 			NT_STATUS_ACCOUNT_EXPIRED },
-	{ "Network credential conflict", 	NT_STATUS_NETWORK_CREDENTIAL_CONFLICT },
-	{ "Remote session limit", 		NT_STATUS_REMOTE_SESSION_LIMIT },
-	{ "No logon interdomain trust account", NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT },
-	{ "No logon workstation trust account", NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT },
-	{ "No logon server trust account", 	NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT },
-	{ "Domain trust inconsistent", 		NT_STATUS_DOMAIN_TRUST_INCONSISTENT },
-	{ "No user session key available", 	NT_STATUS_NO_USER_SESSION_KEY },
-	{ "User session deleted", 		NT_STATUS_USER_SESSION_DELETED },
-	{ "Insufficient server resources", 	NT_STATUS_INSUFF_SERVER_RESOURCES },
-	{ "Insufficient logon information", 	NT_STATUS_INSUFFICIENT_LOGON_INFO },
+	{ N_("Success"), 				NT_STATUS_OK },
+	{ N_("Undetermined error"), 		NT_STATUS_UNSUCCESSFUL },
+	{ N_("Access denied"), 			NT_STATUS_ACCESS_DENIED },
+	{ N_("Account locked out"), 		NT_STATUS_ACCOUNT_LOCKED_OUT },
+	{ N_("Must change password"), 		NT_STATUS_PASSWORD_MUST_CHANGE },
+	{ N_("Password is too short"), 		NT_STATUS_PWD_TOO_SHORT },
+	{ N_("Password is too recent"), 		NT_STATUS_PWD_TOO_RECENT },
+	{ N_("Password history conflict"), 		NT_STATUS_PWD_HISTORY_CONFLICT },
+	{ N_("No logon servers"), 			NT_STATUS_NO_LOGON_SERVERS },
+	{ N_("Improperly formed account name"), 	NT_STATUS_INVALID_ACCOUNT_NAME },
+	{ N_("User exists"), 			NT_STATUS_USER_EXISTS },
+	{ N_("No such user"), 			NT_STATUS_NO_SUCH_USER },
+	{ N_("Group exists"), 			NT_STATUS_GROUP_EXISTS },
+	{ N_("No such group"), 			NT_STATUS_NO_SUCH_GROUP },
+	{ N_("Member not in group"), 		NT_STATUS_MEMBER_NOT_IN_GROUP },
+	{ N_("Wrong Password"), 			NT_STATUS_WRONG_PASSWORD },
+	{ N_("Ill formed password"), 		NT_STATUS_ILL_FORMED_PASSWORD },
+	{ N_("Password restriction"), 		NT_STATUS_PASSWORD_RESTRICTION },
+	{ N_("Logon failure"), 			NT_STATUS_LOGON_FAILURE },
+	{ N_("Account restriction"), 		NT_STATUS_ACCOUNT_RESTRICTION },
+	{ N_("Invalid logon hours"), 		NT_STATUS_INVALID_LOGON_HOURS },
+	{ N_("Invalid workstation"), 		NT_STATUS_INVALID_WORKSTATION },
+	{ N_("Password expired"), 			NT_STATUS_PASSWORD_EXPIRED },
+	{ N_("Account disabled"), 			NT_STATUS_ACCOUNT_DISABLED },
+	{ N_("Memory allocation error"), 		NT_STATUS_NO_MEMORY },
+	{ N_("No domain controllers located"), 	NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND },
+	{ N_("Named pipe not available"), 		NT_STATUS_PIPE_NOT_AVAILABLE },
+	{ N_("Not implemented"), 			NT_STATUS_NOT_IMPLEMENTED },
+	{ N_("Invalid information class"), 		NT_STATUS_INVALID_INFO_CLASS },
+	{ N_("Information length mismatch"), 	NT_STATUS_INFO_LENGTH_MISMATCH },
+	{ N_("Access violation"), 			NT_STATUS_ACCESS_VIOLATION },
+	{ N_("Invalid handle"), 			NT_STATUS_INVALID_HANDLE },
+	{ N_("Invalid parameter"), 			NT_STATUS_INVALID_PARAMETER },
+	{ N_("No memory"), 				NT_STATUS_NO_MEMORY },
+	{ N_("Buffer too small"), 			NT_STATUS_BUFFER_TOO_SMALL },
+	{ N_("Revision mismatch"), 			NT_STATUS_REVISION_MISMATCH },
+	{ N_("No such logon session"), 		NT_STATUS_NO_SUCH_LOGON_SESSION },
+	{ N_("No such privilege"), 			NT_STATUS_NO_SUCH_PRIVILEGE },
+	{ N_("Procedure not found"), 		NT_STATUS_PROCEDURE_NOT_FOUND },
+	{ N_("Server disabled"), 			NT_STATUS_SERVER_DISABLED },
+	{ N_("Invalid pipe state"), 		NT_STATUS_INVALID_PIPE_STATE },
+	{ N_("Named pipe busy"), 			NT_STATUS_PIPE_BUSY },
+	{ N_("Illegal function"),		 	NT_STATUS_ILLEGAL_FUNCTION },
+	{ N_("Named pipe dicconnected"), 		NT_STATUS_PIPE_DISCONNECTED },
+	{ N_("Named pipe closing"), 		NT_STATUS_PIPE_CLOSING },
+	{ N_("Remote host not listening"), 		NT_STATUS_REMOTE_NOT_LISTENING },
+	{ N_("Duplicate name on network"), 		NT_STATUS_DUPLICATE_NAME },
+	{ N_("Print queue is full"), 		NT_STATUS_PRINT_QUEUE_FULL },
+	{ N_("No print spool space available"), 	NT_STATUS_NO_SPOOL_SPACE },
+	{ N_("The network name cannot be found"),   NT_STATUS_BAD_NETWORK_NAME },
+	{ N_("The connection was refused"),         NT_STATUS_CONNECTION_REFUSED },
+	{ N_("Too many names"), 			NT_STATUS_TOO_MANY_NAMES },
+	{ N_("Too many sessions"), 			NT_STATUS_TOO_MANY_SESSIONS },
+	{ N_("Invalid server state"), 		NT_STATUS_INVALID_SERVER_STATE },
+	{ N_("Invalid domain state"), 		NT_STATUS_INVALID_DOMAIN_STATE },
+	{ N_("Invalid domain role"), 		NT_STATUS_INVALID_DOMAIN_ROLE },
+	{ N_("No such domain"), 			NT_STATUS_NO_SUCH_DOMAIN },
+	{ N_("Domain exists"), 			NT_STATUS_DOMAIN_EXISTS },
+	{ N_("Domain limit exceeded"), 		NT_STATUS_DOMAIN_LIMIT_EXCEEDED },
+	{ N_("Bad logon session state"), 		NT_STATUS_BAD_LOGON_SESSION_STATE },
+	{ N_("Logon session collision"), 		NT_STATUS_LOGON_SESSION_COLLISION },
+	{ N_("Invalid logon type"), 		NT_STATUS_INVALID_LOGON_TYPE },
+	{ N_("Cancelled"), 				NT_STATUS_CANCELLED },
+	{ N_("Invalid computer name"), 		NT_STATUS_INVALID_COMPUTER_NAME },	
+	{ N_("Logon server conflict"), 		NT_STATUS_LOGON_SERVER_CONFLICT },
+	{ N_("Time difference at domain controller"), NT_STATUS_TIME_DIFFERENCE_AT_DC },
+	{ N_("Pipe broken"), 			NT_STATUS_PIPE_BROKEN },
+	{ N_("Registry corrupt"), 			NT_STATUS_REGISTRY_CORRUPT },
+	{ N_("Too many secrets"), 			NT_STATUS_TOO_MANY_SECRETS },
+	{ N_("Too many SIDs"), 			NT_STATUS_TOO_MANY_SIDS },
+	{ N_("Lanmanager cross encryption required"), NT_STATUS_LM_CROSS_ENCRYPTION_REQUIRED },
+	{ N_("Log file full"), 			NT_STATUS_LOG_FILE_FULL },
+	{ N_("No trusted LSA secret"), 		NT_STATUS_NO_TRUST_LSA_SECRET },
+	{ N_("No trusted SAM account"), 		NT_STATUS_NO_TRUST_SAM_ACCOUNT },
+	{ N_("Trusted domain failure"), 		NT_STATUS_TRUSTED_DOMAIN_FAILURE },
+	{ N_("Trust relationship failure"), 	NT_STATUS_TRUSTED_RELATIONSHIP_FAILURE },
+	{ N_("Trust failure"), 			NT_STATUS_TRUST_FAILURE },
+	{ N_("Netlogon service not started"), 	NT_STATUS_NETLOGON_NOT_STARTED },
+	{ N_("Account expired"), 			NT_STATUS_ACCOUNT_EXPIRED },
+	{ N_("Network credential conflict"), 	NT_STATUS_NETWORK_CREDENTIAL_CONFLICT },
+	{ N_("Remote session limit"), 		NT_STATUS_REMOTE_SESSION_LIMIT },
+	{ N_("No logon interdomain trust account"), NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT },
+	{ N_("No logon workstation trust account"), NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT },
+	{ N_("No logon server trust account"), 	NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT },
+	{ N_("Domain trust inconsistent"), 		NT_STATUS_DOMAIN_TRUST_INCONSISTENT },
+	{ N_("No user session key available"), 	NT_STATUS_NO_USER_SESSION_KEY },
+	{ N_("User session deleted"), 		NT_STATUS_USER_SESSION_DELETED },
+	{ N_("Insufficient server resources"), 	NT_STATUS_INSUFF_SERVER_RESOURCES },
+	{ N_("Insufficient logon information"), 	NT_STATUS_INSUFFICIENT_LOGON_INFO },
 	
-	{ "License quota exceeded", 		NT_STATUS_LICENSE_QUOTA_EXCEEDED },
-	{ "No more files",			STATUS_NO_MORE_FILES },
+	{ N_("License quota exceeded"), 		NT_STATUS_LICENSE_QUOTA_EXCEEDED },
+	{ N_("No more files"),			STATUS_NO_MORE_FILES },
 
 	{ NULL, NT_STATUS(0) }
 };
diff --git a/source3/locale/pam_winbind/ar.po b/source3/locale/pam_winbind/ar.po
index 43e8a87..6ed0ac1 100644
--- a/source3/locale/pam_winbind/ar.po
+++ b/source3/locale/pam_winbind/ar.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_winbind\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-16 15:30+0800\n"
+"POT-Creation-Date: 2010-03-06 01:55+0800\n"
 "PO-Revision-Date: 2009-02-06 08:04\n"
 "Last-Translator: Novell Language <language at novell.com>\n"
 "Language-Team: Novell Language <language at novell.com>\n"
@@ -13,141 +13,546 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../../nsswitch/pam_winbind.c:326
+#: ../../../nsswitch/pam_winbind.c:583 ../../libsmb/nterr.c:558
 msgid "Success"
 msgstr "نجاح"
 
-#: ../../../nsswitch/pam_winbind.c:327
+#: ../../../nsswitch/pam_winbind.c:585
 msgid "No primary Domain Controler available"
 msgstr "جهاز التحكم في المجال الرئيسي غير متوفر"
 
-#: ../../../nsswitch/pam_winbind.c:328
+#: ../../../nsswitch/pam_winbind.c:587
 msgid "No domain controllers found"
 msgstr "لم يتم العثور على أجهزة تحكم في المجال"
 
-#: ../../../nsswitch/pam_winbind.c:329
+#: ../../../nsswitch/pam_winbind.c:589 ../../libsmb/nterr.c:566
 msgid "No logon servers"
 msgstr "لا توجد خوادم تسجيل الدخول"
 
-#: ../../../nsswitch/pam_winbind.c:330
+#: ../../../nsswitch/pam_winbind.c:591
 msgid "Password too short"
 msgstr "كلمة السر قصيرة جدًا"
 
-#: ../../../nsswitch/pam_winbind.c:331
+#: ../../../nsswitch/pam_winbind.c:593
 msgid "The password of this user is too recent to change"
 msgstr "كلمة سر هذا المستخدم حديثة جدًا على التغيير"
 
-#: ../../../nsswitch/pam_winbind.c:332
+#: ../../../nsswitch/pam_winbind.c:595
 msgid "Password is already in password history"
 msgstr "كلمة السر موجودة بالفعل في سجل كلمات السر"
 
-#: ../../../nsswitch/pam_winbind.c:333
+#: ../../../nsswitch/pam_winbind.c:597
 msgid "Your password has expired"
 msgstr "انتهت صلاحية كلمة السر الخاصة بك"
 
-#: ../../../nsswitch/pam_winbind.c:334
+#: ../../../nsswitch/pam_winbind.c:599
 msgid "You need to change your password now"
 msgstr "يلزم تغيير كلمة السر الآن"
 
-#: ../../../nsswitch/pam_winbind.c:335
+#: ../../../nsswitch/pam_winbind.c:601
 msgid "You are not allowed to logon from this workstation"
 msgstr "غير مسموح لك بتسجيل الدخول من محطة العمل هذه"
 
-#: ../../../nsswitch/pam_winbind.c:336
+#: ../../../nsswitch/pam_winbind.c:603
 msgid "You are not allowed to logon at this time"
 msgstr "غير مسموح لك بتسجيل الدخول في هذا الوقت"
 
-#: ../../../nsswitch/pam_winbind.c:337
+#: ../../../nsswitch/pam_winbind.c:605
 msgid "Your account has expired. Please contact your System administrator"
 msgstr "انتهت صلاحية حسابك. الرجاء الاتصال بمسؤول النظام"
 
-#: ../../../nsswitch/pam_winbind.c:338
+#: ../../../nsswitch/pam_winbind.c:608
 msgid "Your account is disabled. Please contact your System administrator"
 msgstr "تم تعطيل حسابك. الرجاء الاتصال بمسؤول النظام"
 
-#: ../../../nsswitch/pam_winbind.c:339
+#: ../../../nsswitch/pam_winbind.c:611
 msgid "Your account has been locked. Please contact your System administrator"
 msgstr "تم قفل حسابك. الرجاء الاتصال بمسؤول النظام"
 
-#: ../../../nsswitch/pam_winbind.c:340 ../../../nsswitch/pam_winbind.c:341 ../../../nsswitch/pam_winbind.c:342
+#: ../../../nsswitch/pam_winbind.c:614 ../../../nsswitch/pam_winbind.c:616 ../../../nsswitch/pam_winbind.c:618
 msgid "Invalid Trust Account"
 msgstr "حساب ثقة غير صالح"
 
-#: ../../../nsswitch/pam_winbind.c:343
+#: ../../../nsswitch/pam_winbind.c:620
 msgid "Access is denied"
 msgstr "الوصول مرفوض"
 
-#: ../../../nsswitch/pam_winbind.c:592
-msgid "Your password expires today"
+#: ../../../nsswitch/pam_winbind.c:818
+#, fuzzy
+msgid "Do you want to change your password now?"
+msgstr "يلزم تغيير كلمة السر الآن"
+
+#: ../../../nsswitch/pam_winbind.c:902
+#, fuzzy
+msgid "Your password expires today.\n"
 msgstr "انتهت صلاحية كلمة السر الخاصة بك اليوم"
 
-#: ../../../nsswitch/pam_winbind.c:597
-#, c-format
-msgid "Your password will expire in %d %s"
+#: ../../../nsswitch/pam_winbind.c:932
+#, fuzzy, c-format
+msgid "Your password will expire in %d %s.\n"
 msgstr "ستنتهي صلاحية كلمة السر الخاصة بك خلال %d %s"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "days"
 msgstr "أيام"
 
-#: ../../../nsswitch/pam_winbind.c:598
+#: ../../../nsswitch/pam_winbind.c:933
 msgid "day"
 msgstr "اليوم"
 
-#: ../../../nsswitch/pam_winbind.c:917
+#: ../../../nsswitch/pam_winbind.c:1169 ../../../nsswitch/pam_winbind.c:1193
+#, c-format
+msgid "Cannot convert group %s to sid, please contact your administrator to see if group %s is valid."
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1387
 msgid "Grace login. Please change your password as soon you're online again"
 msgstr "تسجيل الدخول في فترة السماح. الرجاء تغيير كلمة السر الخاصة بك عند الاتصال بالإنترنت مرة أخرى."
 
-#: ../../../nsswitch/pam_winbind.c:924
+#: ../../../nsswitch/pam_winbind.c:1397
 msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable"
 msgstr "تعذر الوصول إلى جهاز التحكم في المجال، قم باستخدام بيانات تعريف مؤقتة بدلاً من ذلك. ربما لا تتوفر مصادر الشبكة"
 
-#: ../../../nsswitch/pam_winbind.c:950
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1422
+msgid ""
+"Failed to establish your Kerberos Ticket cache due time differences\n"
+"with the domain controller.  Please verify the system time.\n"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:1490
 msgid "Your password "
 msgstr "كلمة السر الخاصة بك "
 
-#: ../../../nsswitch/pam_winbind.c:957
+#: ../../../nsswitch/pam_winbind.c:1497
 #, c-format
 msgid "must be at least %d characters; "
 msgstr "يجب أن تكون %d من الأحرف على الأقل؛ "
 
-#: ../../../nsswitch/pam_winbind.c:967
+#: ../../../nsswitch/pam_winbind.c:1506
 #, c-format
 msgid "cannot repeat any of your previous %d passwords; "
 msgstr "لا يمكنك تكرار أي من كلمات السر %dالسابقة الخاصة بك؛"
 
-#: ../../../nsswitch/pam_winbind.c:977
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1516
 msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; "
 msgstr "يجب أن تحتوي على حروف كبيرة أو أرقام أو علامات ترقيم؛ وألا تحتوي على اسم الحساب الخاص بك أو الاسم الكامل؛"
 
-#: ../../../nsswitch/pam_winbind.c:986
-#, c-format
+#: ../../../nsswitch/pam_winbind.c:1526
 msgid "Please type a different password. Type a password which meets these requirements in both text boxes."
 msgstr "الرجاء كتابة كلمة سر مختلفة. قم بكتابة كلمة سر تتوافق مع هذه المتطلبات الموجودة في مربعي النص."
 
-#: ../../../nsswitch/pam_winbind.c:1223
+#: ../../../nsswitch/pam_winbind.c:1553
+#, c-format
+msgid "Creating directory: %s failed: %s"
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2018
 msgid "Password does not meet complexity requirements"
 msgstr "كلمة السر لا تتوافق مع المتطلبات المعقدة"
 
-#: ../../../nsswitch/pam_winbind.c:1564
+#.
+#. * First get the name of a user
+#.
+#: ../../../nsswitch/pam_winbind.c:2489 ../../../nsswitch/pam_winbind.c:3035
+msgid "Username: "
+msgstr ""
+
+#: ../../../nsswitch/pam_winbind.c:2665
 msgid "Password: "
 msgstr "كلمة السر: "
 
-#: ../../../nsswitch/pam_winbind.c:2013
+#. instruct user what is happening
+#: ../../../nsswitch/pam_winbind.c:3073
 msgid "Changing password for"
 msgstr "تغيير كلمة السر لـ"
 
-#: ../../../nsswitch/pam_winbind.c:2027
+#: ../../../nsswitch/pam_winbind.c:3086
 msgid "(current) NT password: "
 msgstr "كلمة سر NT (الحالية) "
 
-#: ../../../nsswitch/pam_winbind.c:2089
+#: ../../../nsswitch/pam_winbind.c:3156
 msgid "Enter new NT password: "
 msgstr "إدخال كلمة سر NT: "
 
-#: ../../../nsswitch/pam_winbind.c:2090
+#: ../../../nsswitch/pam_winbind.c:3157
 msgid "Retype new NT password: "
 msgstr "إعادة كتابة كلمة سر NT الجديدة: "
 
+#.
+#. * here is the string to inform the user that the new passwords they
+#. * typed were not the same.
+#.
+#: ../../../nsswitch/pam_winbind.h:128
+msgid "Sorry, passwords do not match"
+msgstr ""
+
+#: ../../libsmb/nterr.c:559
+msgid "Undetermined error"
+msgstr ""
+
+#: ../../libsmb/nterr.c:560
+#, fuzzy
+msgid "Access denied"
+msgstr "الوصول مرفوض"
+
+#: ../../libsmb/nterr.c:561
+msgid "Account locked out"
+msgstr ""
+
+#: ../../libsmb/nterr.c:562
+#, fuzzy
+msgid "Must change password"
+msgstr "يلزم تغيير كلمة السر الآن"
+
+#: ../../libsmb/nterr.c:563
+#, fuzzy
+msgid "Password is too short"
+msgstr "كلمة السر قصيرة جدًا"
+
+#: ../../libsmb/nterr.c:564
+#, fuzzy
+msgid "Password is too recent"
+msgstr "كلمة السر قصيرة جدًا"
+
+#: ../../libsmb/nterr.c:565
+#, fuzzy
+msgid "Password history conflict"
+msgstr "كلمة السر قصيرة جدًا"
+
+#: ../../libsmb/nterr.c:567
+msgid "Improperly formed account name"
+msgstr ""
+
+#: ../../libsmb/nterr.c:568
+msgid "User exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:569
+msgid "No such user"
+msgstr ""
+
+#: ../../libsmb/nterr.c:570
+msgid "Group exists"
+msgstr ""
+
+#: ../../libsmb/nterr.c:571
+msgid "No such group"
+msgstr ""
+


-- 
Samba Shared Repository


More information about the samba-cvs mailing list