The branch, v3-4-test has been updated via 1bbbc15... s3: normalize "Changing password for" msg IDs and STRs from 49ed8e5... s3:libsmb: don't reuse the callers stype variable in cli_NetServerEnum()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log ----------------------------------------------------------------- commit 1bbbc152b4222554b2738108f3e267e147411166 Author: Lars Müller <l...@samba.org> Date: Fri Feb 5 17:38:04 2010 +0100 s3: normalize "Changing password for" msg IDs and STRs An additional space at the end of the "Changing password for" msgid lead to untranslated pam_winnind messages. (cherry picked from commit f9f1db18834648da73b7b1f6d9472523941e8277) Fix bug #7102 (normalize "Changing password for" msg IDs and STRs). (cherry picked from commit f6322442f54d49b8bacec2d8fc7960d0b87d674b) ----------------------------------------------------------------------- Summary of changes: source3/locale/pam_winbind/ar.po | 4 ++-- source3/locale/pam_winbind/cs.po | 2 +- source3/locale/pam_winbind/da.po | 2 +- source3/locale/pam_winbind/es.po | 4 ++-- source3/locale/pam_winbind/fi.po | 4 ++-- source3/locale/pam_winbind/fr.po | 4 ++-- source3/locale/pam_winbind/hu.po | 2 +- source3/locale/pam_winbind/it.po | 4 ++-- source3/locale/pam_winbind/ja.po | 4 ++-- source3/locale/pam_winbind/ko.po | 2 +- source3/locale/pam_winbind/nb.po | 4 ++-- source3/locale/pam_winbind/nl.po | 4 ++-- source3/locale/pam_winbind/pl.po | 4 ++-- source3/locale/pam_winbind/pt_BR.po | 2 +- source3/locale/pam_winbind/ru.po | 4 ++-- source3/locale/pam_winbind/sv.po | 4 ++-- source3/locale/pam_winbind/zh_CN.po | 4 ++-- source3/locale/pam_winbind/zh_TW.po | 2 +- 18 files changed, 30 insertions(+), 30 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/locale/pam_winbind/ar.po b/source3/locale/pam_winbind/ar.po index 1cd622b..d50aae3 100644 --- a/source3/locale/pam_winbind/ar.po +++ b/source3/locale/pam_winbind/ar.po @@ -136,8 +136,8 @@ msgid "Password: " msgstr "ÙÙÙ Ø© اÙسر: " #: pam_winbind.c:2013 -msgid "Changing password for " -msgstr "تغÙÙر ÙÙÙ Ø© اÙسر ÙÙ " +msgid "Changing password for" +msgstr "تغÙÙر ÙÙÙ Ø© اÙسر ÙÙ" #: pam_winbind.c:2027 msgid "(current) NT password: " diff --git a/source3/locale/pam_winbind/cs.po b/source3/locale/pam_winbind/cs.po index cffdf2b..3fe4d61 100644 --- a/source3/locale/pam_winbind/cs.po +++ b/source3/locale/pam_winbind/cs.po @@ -136,7 +136,7 @@ msgid "Password: " msgstr "Heslo:" #: pam_winbind.c:2013 -msgid "Changing password for " +msgid "Changing password for" msgstr "MÄnÃm heslo pro" #: pam_winbind.c:2027 diff --git a/source3/locale/pam_winbind/da.po b/source3/locale/pam_winbind/da.po index a2e3ad9..ddd46a6 100644 --- a/source3/locale/pam_winbind/da.po +++ b/source3/locale/pam_winbind/da.po @@ -153,7 +153,7 @@ msgstr "Brugernavn: " #. instruct user what is happening #: ../../nsswitch/pam_winbind.c:2589 -msgid "Changing password for " +msgid "Changing password for" msgstr "Ãndrer adgangskode for" #: ../../nsswitch/pam_winbind.c:2604 diff --git a/source3/locale/pam_winbind/es.po b/source3/locale/pam_winbind/es.po index 28fa2e8..f0ce376 100644 --- a/source3/locale/pam_winbind/es.po +++ b/source3/locale/pam_winbind/es.po @@ -136,8 +136,8 @@ msgid "Password: " msgstr "Contraseña:" #: pam_winbind.c:2013 -msgid "Changing password for " -msgstr "Cambiando la contraseña para " +msgid "Changing password for" +msgstr "Cambiando la contraseña para" #: pam_winbind.c:2027 msgid "(current) NT password: " diff --git a/source3/locale/pam_winbind/fi.po b/source3/locale/pam_winbind/fi.po index d7006a4..3ba7a3b 100644 --- a/source3/locale/pam_winbind/fi.po +++ b/source3/locale/pam_winbind/fi.po @@ -156,8 +156,8 @@ msgstr "Käyttäjänimi: " #. instruct user what is happening #: ../../nsswitch/pam_winbind.c:2589 -msgid "Changing password for " -msgstr "Vaihdetaan salasana käyttäjälle " +msgid "Changing password for" +msgstr "Vaihdetaan salasana käyttäjälle" #: ../../nsswitch/pam_winbind.c:2604 msgid "(current) NT password: " diff --git a/source3/locale/pam_winbind/fr.po b/source3/locale/pam_winbind/fr.po index 2b185fd..6f81c37 100644 --- a/source3/locale/pam_winbind/fr.po +++ b/source3/locale/pam_winbind/fr.po @@ -136,8 +136,8 @@ msgid "Password: " msgstr "Mot de passe : " #: pam_winbind.c:2013 -msgid "Changing password for " -msgstr "Changement du mot de passe pour " +msgid "Changing password for" +msgstr "Changement du mot de passe pour" #: pam_winbind.c:2027 msgid "(current) NT password: " diff --git a/source3/locale/pam_winbind/hu.po b/source3/locale/pam_winbind/hu.po index 08e96a3..b09d5f3 100644 --- a/source3/locale/pam_winbind/hu.po +++ b/source3/locale/pam_winbind/hu.po @@ -150,7 +150,7 @@ msgid "Password: " msgstr "Jelszó: " #: pam_winbind.c:2013 -msgid "Changing password for " +msgid "Changing password for" msgstr "JelszómódosÃtás" #: pam_winbind.c:2027 diff --git a/source3/locale/pam_winbind/it.po b/source3/locale/pam_winbind/it.po index c7d7463..ddb70e2 100644 --- a/source3/locale/pam_winbind/it.po +++ b/source3/locale/pam_winbind/it.po @@ -136,8 +136,8 @@ msgid "Password: " msgstr "Password: " #: pam_winbind.c:2013 -msgid "Changing password for " -msgstr "Modifica la password per " +msgid "Changing password for" +msgstr "Modifica la password per" #: pam_winbind.c:2027 msgid "(current) NT password: " diff --git a/source3/locale/pam_winbind/ja.po b/source3/locale/pam_winbind/ja.po index 9096282..991007a 100644 --- a/source3/locale/pam_winbind/ja.po +++ b/source3/locale/pam_winbind/ja.po @@ -136,8 +136,8 @@ msgid "Password: " msgstr "ãã¹ã¯ã¼ã:" #: pam_winbind.c:2013 -msgid "Changing password for " -msgstr "ä¸è¨ã«å¯¾ãããã¹ã¯ã¼ããå¤æ´ãã¦ãã¾ã " +msgid "Changing password for" +msgstr "ä¸è¨ã«å¯¾ãããã¹ã¯ã¼ããå¤æ´ãã¦ãã¾ã" #: pam_winbind.c:2027 msgid "(current) NT password: " diff --git a/source3/locale/pam_winbind/ko.po b/source3/locale/pam_winbind/ko.po index 59fd0d0..d617173 100644 --- a/source3/locale/pam_winbind/ko.po +++ b/source3/locale/pam_winbind/ko.po @@ -136,7 +136,7 @@ msgid "Password: " msgstr "ë¹ë°ë²í¸:" #: pam_winbind.c:2013 -msgid "Changing password for " +msgid "Changing password for" msgstr "ë¹ë°ë²í¸ ë³ê²½" #: pam_winbind.c:2027 diff --git a/source3/locale/pam_winbind/nb.po b/source3/locale/pam_winbind/nb.po index 60854c5..36989b8 100644 --- a/source3/locale/pam_winbind/nb.po +++ b/source3/locale/pam_winbind/nb.po @@ -158,8 +158,8 @@ msgstr "Brukernavn: " #. instruct user what is happening #: ../../nsswitch/pam_winbind.c:2589 -msgid "Changing password for " -msgstr "Endrer passord for " +msgid "Changing password for" +msgstr "Endrer passord for" #: ../../nsswitch/pam_winbind.c:2604 msgid "(current) NT password: " diff --git a/source3/locale/pam_winbind/nl.po b/source3/locale/pam_winbind/nl.po index 055d223..f87bc94 100644 --- a/source3/locale/pam_winbind/nl.po +++ b/source3/locale/pam_winbind/nl.po @@ -136,8 +136,8 @@ msgid "Password: " msgstr "Wachtwoord:" #: pam_winbind.c:2013 -msgid "Changing password for " -msgstr "Wachtwoord wijzigen voor " +msgid "Changing password for" +msgstr "Wachtwoord wijzigen voor" #: pam_winbind.c:2027 msgid "(current) NT password: " diff --git a/source3/locale/pam_winbind/pl.po b/source3/locale/pam_winbind/pl.po index 18bfc9f..b9a5cf6 100644 --- a/source3/locale/pam_winbind/pl.po +++ b/source3/locale/pam_winbind/pl.po @@ -136,8 +136,8 @@ msgid "Password: " msgstr "HasÅo: " #: pam_winbind.c:2013 -msgid "Changing password for " -msgstr "Zmiana hasÅa dla " +msgid "Changing password for" +msgstr "Zmiana hasÅa dla" #: pam_winbind.c:2027 msgid "(current) NT password: " diff --git a/source3/locale/pam_winbind/pt_BR.po b/source3/locale/pam_winbind/pt_BR.po index a7e2905..c1c9931 100644 --- a/source3/locale/pam_winbind/pt_BR.po +++ b/source3/locale/pam_winbind/pt_BR.po @@ -136,7 +136,7 @@ msgid "Password: " msgstr "Senha:" #: pam_winbind.c:2013 -msgid "Changing password for " +msgid "Changing password for" msgstr "Alterando a senha para" #: pam_winbind.c:2027 diff --git a/source3/locale/pam_winbind/ru.po b/source3/locale/pam_winbind/ru.po index 7b3c799..ade64b6 100644 --- a/source3/locale/pam_winbind/ru.po +++ b/source3/locale/pam_winbind/ru.po @@ -136,8 +136,8 @@ msgid "Password: " msgstr "ÐаÑолÑ:" #: pam_winbind.c:2013 -msgid "Changing password for " -msgstr "Ðзменение паÑÐ¾Ð»Ñ Ð´Ð»Ñ " +msgid "Changing password for" +msgstr "Ðзменение паÑÐ¾Ð»Ñ Ð´Ð»Ñ" #: pam_winbind.c:2027 msgid "(current) NT password: " diff --git a/source3/locale/pam_winbind/sv.po b/source3/locale/pam_winbind/sv.po index c07e25a..f5c0552 100644 --- a/source3/locale/pam_winbind/sv.po +++ b/source3/locale/pam_winbind/sv.po @@ -136,8 +136,8 @@ msgid "Password: " msgstr "Lösenord:" #: pam_winbind.c:2013 -msgid "Changing password for " -msgstr "Ãndrar lösenord för " +msgid "Changing password for" +msgstr "Ãndrar lösenord för" #: pam_winbind.c:2027 msgid "(current) NT password: " diff --git a/source3/locale/pam_winbind/zh_CN.po b/source3/locale/pam_winbind/zh_CN.po index 2efde23..6388b9f 100644 --- a/source3/locale/pam_winbind/zh_CN.po +++ b/source3/locale/pam_winbind/zh_CN.po @@ -136,8 +136,8 @@ msgid "Password: " msgstr "å¯ç ï¼" #: pam_winbind.c:2013 -msgid "Changing password for " -msgstr "æ´æ¹å¯ç " +msgid "Changing password for" +msgstr "æ´æ¹å¯ç " #: pam_winbind.c:2027 msgid "(current) NT password: " diff --git a/source3/locale/pam_winbind/zh_TW.po b/source3/locale/pam_winbind/zh_TW.po index 3f4925a..d448140 100644 --- a/source3/locale/pam_winbind/zh_TW.po +++ b/source3/locale/pam_winbind/zh_TW.po @@ -136,7 +136,7 @@ msgid "Password: " msgstr "å¯ç¢¼ï¼" #: pam_winbind.c:2013 -msgid "Changing password for " +msgid "Changing password for" msgstr "è®æ´å¯ç¢¼ -" #: pam_winbind.c:2027 -- Samba Shared Repository