Update translations for string freeze

12 files changed, 697 insertions, 577 deletions

diff --git a/src/po/de.po b/src/po/de.po
index 4a3bdc6f3..f6727b061 100644
--- a/src/po/de.po
+++ b/src/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SSS\n"
 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2010-03-09 08:15-0500\n"
+"POT-Creation-Date: 2010-03-15 07:37-0400\n"
 "PO-Revision-Date: 2009-12-09 11:13+0100\n"
 "Last-Translator: Fabian Affolter <fab@fedoraproject.org>\n"
 "Language-Team: German <fedora-trans-de@redhat.com>\n"
@@ -172,11 +172,11 @@ msgstr "IPA-Serveradresse"
 msgid "IPA client hostname"
 msgstr "IPA-Client-Rechnername"
 
-#: config/SSSDConfig.py:91 config/SSSDConfig.py:118
+#: config/SSSDConfig.py:91 config/SSSDConfig.py:119
 msgid "Kerberos server address"
 msgstr "Kerberos-Serveradresse"
 
-#: config/SSSDConfig.py:92 config/SSSDConfig.py:119
+#: config/SSSDConfig.py:92 config/SSSDConfig.py:120
 msgid "Kerberos realm"
 msgstr "Kerberos Realm"
 
@@ -204,167 +204,171 @@ msgstr ""
 msgid "The principal of the change password service"
 msgstr ""
 
-#: config/SSSDConfig.py:105
-msgid "ldap_uri, The URI of the LDAP server"
+#: config/SSSDConfig.py:103
+msgid "Server where the change password service is running if not on the KDC"
 msgstr ""
 
 #: config/SSSDConfig.py:106
-msgid "The default base DN"
+msgid "ldap_uri, The URI of the LDAP server"
 msgstr ""
 
 #: config/SSSDConfig.py:107
-msgid "The Schema Type in use on the LDAP server, rfc2307"
+msgid "The default base DN"
 msgstr ""
 
 #: config/SSSDConfig.py:108
-msgid "The default bind DN"
+msgid "The Schema Type in use on the LDAP server, rfc2307"
 msgstr ""
 
 #: config/SSSDConfig.py:109
-msgid "The type of the authentication token of the default bind DN"
+msgid "The default bind DN"
 msgstr ""
 
 #: config/SSSDConfig.py:110
-msgid "The authentication token of the default bind DN"
+msgid "The type of the authentication token of the default bind DN"
 msgstr ""
 
 #: config/SSSDConfig.py:111
-msgid "Length of time to attempt connection"
+msgid "The authentication token of the default bind DN"
 msgstr ""
 
 #: config/SSSDConfig.py:112
-msgid "Length of time to attempt synchronous LDAP operations"
+msgid "Length of time to attempt connection"
 msgstr ""
 
 #: config/SSSDConfig.py:113
-msgid "Length of time between attempts to reconnect while offline"
+msgid "Length of time to attempt synchronous LDAP operations"
 msgstr ""
 
 #: config/SSSDConfig.py:114
-msgid "file that contains CA certificates"
+msgid "Length of time between attempts to reconnect while offline"
 msgstr ""
 
 #: config/SSSDConfig.py:115
-msgid "Require TLS certificate verification"
+msgid "file that contains CA certificates"
 msgstr ""
 
 #: config/SSSDConfig.py:116
-msgid "Specify the sasl mechanism to use"
+msgid "Require TLS certificate verification"
 msgstr ""
 
 #: config/SSSDConfig.py:117
+msgid "Specify the sasl mechanism to use"
+msgstr ""
+
+#: config/SSSDConfig.py:118
 msgid "Specify the sasl authorization id to use"
 msgstr ""
 
-#: config/SSSDConfig.py:120
+#: config/SSSDConfig.py:121
 msgid "Kerberos service keytab"
 msgstr ""
 
-#: config/SSSDConfig.py:121
+#: config/SSSDConfig.py:122
 msgid "Use Kerberos auth for LDAP connection"
 msgstr ""
 
-#: config/SSSDConfig.py:122
+#: config/SSSDConfig.py:123
 msgid "Follow LDAP referrals"
 msgstr ""
 
-#: config/SSSDConfig.py:125
+#: config/SSSDConfig.py:126
 msgid "Length of time to wait for a search request"
 msgstr ""
 
-#: config/SSSDConfig.py:126
+#: config/SSSDConfig.py:127
 msgid "Length of time between enumeration updates"
 msgstr ""
 
-#: config/SSSDConfig.py:127
+#: config/SSSDConfig.py:128
 msgid "Require TLS for ID lookups, false"
 msgstr ""
 
-#: config/SSSDConfig.py:128
+#: config/SSSDConfig.py:129
 msgid "Base DN for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:129
+#: config/SSSDConfig.py:130
 msgid "Scope of user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:130
+#: config/SSSDConfig.py:131
 msgid "Filter for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:131
+#: config/SSSDConfig.py:132
 msgid "Objectclass for users"
 msgstr ""
 
-#: config/SSSDConfig.py:132
+#: config/SSSDConfig.py:133
 msgid "Username attribute"
 msgstr "Benutzername-Attribut"
 
-#: config/SSSDConfig.py:133
+#: config/SSSDConfig.py:134
 msgid "UID attribute"
 msgstr "UID-Attribut"
 
-#: config/SSSDConfig.py:134
+#: config/SSSDConfig.py:135
 msgid "Primary GID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:135
+#: config/SSSDConfig.py:136
 msgid "GECOS attribute"
 msgstr "GECOS-Attribut"
 
-#: config/SSSDConfig.py:136
+#: config/SSSDConfig.py:137
 msgid "Home directory attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:137
+#: config/SSSDConfig.py:138
 msgid "Shell attribute"
 msgstr "Shell-Attribut"
 
-#: config/SSSDConfig.py:138
+#: config/SSSDConfig.py:139
 msgid "UUID attribute"
 msgstr "UUID-Attribut"
 
-#: config/SSSDConfig.py:139
+#: config/SSSDConfig.py:140
 msgid "User principal attribute (for Kerberos)"
 msgstr ""
 
-#: config/SSSDConfig.py:140
+#: config/SSSDConfig.py:141
 msgid "Full Name"
 msgstr "Vollständiger Name"
 
-#: config/SSSDConfig.py:141
+#: config/SSSDConfig.py:142
 msgid "memberOf attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:142
+#: config/SSSDConfig.py:143
 msgid "Modification time attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:145
+#: config/SSSDConfig.py:146
 msgid "Policy to evaluate the password expiration"
 msgstr ""
 
-#: config/SSSDConfig.py:148
+#: config/SSSDConfig.py:149
 msgid "Comma separated list of allowed users"
 msgstr ""
 
-#: config/SSSDConfig.py:149
+#: config/SSSDConfig.py:150
 msgid "Comma separated list of prohibited users"
 msgstr ""
 
-#: config/SSSDConfig.py:152
+#: config/SSSDConfig.py:153
 msgid "Default shell, /bin/bash"
 msgstr ""
 
-#: config/SSSDConfig.py:153
+#: config/SSSDConfig.py:154
 msgid "Base for home directories"
 msgstr ""
 
-#: config/SSSDConfig.py:156
+#: config/SSSDConfig.py:157
 msgid "The name of the NSS library to use"
 msgstr ""
 
-#: config/SSSDConfig.py:159
+#: config/SSSDConfig.py:160
 msgid "PAM stack to use"
 msgstr ""
 
@@ -384,24 +388,30 @@ msgstr ""
 msgid "sssd must be run as root\n"
 msgstr ""
 
-#: monitor/monitor.c:2265
+#: monitor/monitor.c:2264
+msgid ""
+"nscd socket was detected.  As nscd caching capabilities may conflict with "
+"SSSD, it is recommended to not run nscd in parallel with SSSD\n"
+msgstr ""
+
+#: monitor/monitor.c:2274
 #, c-format
 msgid ""
 "Cannot read config file %s, please check if permissions are 0600 and the "
 "file is owned by root.root\n"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:922 providers/ldap/ldap_child.c:316
+#: providers/krb5/krb5_child.c:929 providers/ldap/ldap_child.c:316
 #: util/util.h:61
 msgid "Debug level"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:924 providers/ldap/ldap_child.c:318
+#: providers/krb5/krb5_child.c:931 providers/ldap/ldap_child.c:318
 #: util/util.h:65
 msgid "Add debug timestamps"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:926 providers/ldap/ldap_child.c:320
+#: providers/krb5/krb5_child.c:933 providers/ldap/ldap_child.c:320
 msgid "An open file descriptor for the debug logs"
 msgstr ""
 
diff --git a/src/po/es.po b/src/po/es.po
index c43547e6a..7a0ead937 100644
--- a/src/po/es.po
+++ b/src/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sss_daemon 0.4.0\n"
 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2010-03-09 08:15-0500\n"
+"POT-Creation-Date: 2010-03-15 07:37-0400\n"
 "PO-Revision-Date: 2010-03-09 12:46-0300\n"
 "Last-Translator: Héctor Daniel Cabrera <logan@fedoraproject.org>\n"
 "Language-Team: Fedora Spanish <trans-es@lists.fedoraproject.org>\n"
@@ -185,11 +185,11 @@ msgstr "Dirección del servidor IPA"
 msgid "IPA client hostname"
 msgstr "Nombre de equipo del cliente IPA"
 
-#: config/SSSDConfig.py:91 config/SSSDConfig.py:118
+#: config/SSSDConfig.py:91 config/SSSDConfig.py:119
 msgid "Kerberos server address"
 msgstr "Dirección del servidor Kerberos"
 
-#: config/SSSDConfig.py:92 config/SSSDConfig.py:119
+#: config/SSSDConfig.py:92 config/SSSDConfig.py:120
 msgid "Kerberos realm"
 msgstr "Reinado Kerberos"
 
@@ -217,167 +217,171 @@ msgstr "Habilitar la validación de credenciales"
 msgid "The principal of the change password service"
 msgstr "El principal del servicio de cambio de contraseña"
 
-#: config/SSSDConfig.py:105
+#: config/SSSDConfig.py:103
+msgid "Server where the change password service is running if not on the KDC"
+msgstr ""
+
+#: config/SSSDConfig.py:106
 msgid "ldap_uri, The URI of the LDAP server"
 msgstr "ldap_uri, El URI del servidor LDAP"
 
-#: config/SSSDConfig.py:106
+#: config/SSSDConfig.py:107
 msgid "The default base DN"
 msgstr "DN base predeterminado"
 
-#: config/SSSDConfig.py:107
+#: config/SSSDConfig.py:108
 msgid "The Schema Type in use on the LDAP server, rfc2307"
 msgstr "El Tipo de Esquema a usar en el servidor LDAP, rfc2307"
 
-#: config/SSSDConfig.py:108
+#: config/SSSDConfig.py:109
 msgid "The default bind DN"
 msgstr "El DN Bind predeterminado"
 
-#: config/SSSDConfig.py:109
+#: config/SSSDConfig.py:110
 msgid "The type of the authentication token of the default bind DN"
 msgstr "El tipo del token de autenticación del DN bind predeterminado"
 
-#: config/SSSDConfig.py:110
+#: config/SSSDConfig.py:111
 msgid "The authentication token of the default bind DN"
 msgstr "El token de autenticación del DN bind predeterminado"
 
-#: config/SSSDConfig.py:111
+#: config/SSSDConfig.py:112
 msgid "Length of time to attempt connection"
 msgstr "Tiempo durante el que se intentará la conexión"
 
-#: config/SSSDConfig.py:112
+#: config/SSSDConfig.py:113
 msgid "Length of time to attempt synchronous LDAP operations"
 msgstr "Tiempo durante el que se intentará operaciones LDAP sincrónicas"
 
-#: config/SSSDConfig.py:113
+#: config/SSSDConfig.py:114
 msgid "Length of time between attempts to reconnect while offline"
 msgstr "Tiempo entre intentos de reconexión cuando esté fuera de línea"
 
-#: config/SSSDConfig.py:114
+#: config/SSSDConfig.py:115
 msgid "file that contains CA certificates"
 msgstr "archivo que contiene los certificados CA"
 
-#: config/SSSDConfig.py:115
+#: config/SSSDConfig.py:116
 msgid "Require TLS certificate verification"
 msgstr "Requiere la verificación de certificado TLS"
 
-#: config/SSSDConfig.py:116
+#: config/SSSDConfig.py:117
 msgid "Specify the sasl mechanism to use"
 msgstr "Especificar el mecanismo sasl a usar"
 
-#: config/SSSDConfig.py:117
+#: config/SSSDConfig.py:118
 msgid "Specify the sasl authorization id to use"
 msgstr "Especifique el id de autorización sasl a usar"
 
-#: config/SSSDConfig.py:120
+#: config/SSSDConfig.py:121
 msgid "Kerberos service keytab"
 msgstr "Tabla de clave del servicio Kerberos"
 
-#: config/SSSDConfig.py:121
+#: config/SSSDConfig.py:122
 msgid "Use Kerberos auth for LDAP connection"
 msgstr "Usar auth Kerberos para la conexión LDAP"
 
-#: config/SSSDConfig.py:122
+#: config/SSSDConfig.py:123
 msgid "Follow LDAP referrals"
 msgstr "Seguir referencias LDAP"
 
-#: config/SSSDConfig.py:125
+#: config/SSSDConfig.py:126
 msgid "Length of time to wait for a search request"
 msgstr "Tiempo máximo a esperar un pedido de búsqueda"
 
-#: config/SSSDConfig.py:126
+#: config/SSSDConfig.py:127
 msgid "Length of time between enumeration updates"
 msgstr "Tiempo en segundos entre las actualizaciones de enumeración"
 
-#: config/SSSDConfig.py:127
+#: config/SSSDConfig.py:128
 msgid "Require TLS for ID lookups, false"
 msgstr "Requiere TLS para búsquedas de ID, falso"
 
-#: config/SSSDConfig.py:128
+#: config/SSSDConfig.py:129
 msgid "Base DN for user lookups"
 msgstr "DN base para búsquedas de usuario"
 
-#: config/SSSDConfig.py:129
+#: config/SSSDConfig.py:130
 msgid "Scope of user lookups"
 msgstr "Ambito de las búsquedas del usuario"
 
-#: config/SSSDConfig.py:130
+#: config/SSSDConfig.py:131
 msgid "Filter for user lookups"
 msgstr "Filtro para las búsquedas del usuario"
 
-#: config/SSSDConfig.py:131
+#: config/SSSDConfig.py:132
 msgid "Objectclass for users"
 msgstr "Objectclass para los usuarios"
 
-#: config/SSSDConfig.py:132
+#: config/SSSDConfig.py:133
 msgid "Username attribute"
 msgstr "Atributo Username"
 
-#: config/SSSDConfig.py:133
+#: config/SSSDConfig.py:134
 msgid "UID attribute"
 msgstr "Atributo UID"
 
-#: config/SSSDConfig.py:134
+#: config/SSSDConfig.py:135
 msgid "Primary GID attribute"
 msgstr "Atributo GID primario"
 
-#: config/SSSDConfig.py:135
+#: config/SSSDConfig.py:136
 msgid "GECOS attribute"
 msgstr "Atributo GECOS"
 
-#: config/SSSDConfig.py:136
+#: config/SSSDConfig.py:137
 msgid "Home directory attribute"
 msgstr "Atributo Directorio de inicio"
 
-#: config/SSSDConfig.py:137
+#: config/SSSDConfig.py:138
 msgid "Shell attribute"
 msgstr "Atributo shell"
 
-#: config/SSSDConfig.py:138
+#: config/SSSDConfig.py:139
 msgid "UUID attribute"
 msgstr "Atributo UUID"
 
-#: config/SSSDConfig.py:139
+#: config/SSSDConfig.py:140
 msgid "User principal attribute (for Kerberos)"
 msgstr "Atributo principal del usuario (para Kerberos) "
 
-#: config/SSSDConfig.py:140
+#: config/SSSDConfig.py:141
 msgid "Full Name"
 msgstr "Nombre completo"
 
-#: config/SSSDConfig.py:141
+#: config/SSSDConfig.py:142
 msgid "memberOf attribute"
 msgstr "Atributo memberOf"
 
-#: config/SSSDConfig.py:142
+#: config/SSSDConfig.py:143
 msgid "Modification time attribute"
 msgstr "Atributo hora de modificación"
 
-#: config/SSSDConfig.py:145
+#: config/SSSDConfig.py:146
 msgid "Policy to evaluate the password expiration"
 msgstr "Política para evaluar el vencimiento de la contraseña"
 
-#: config/SSSDConfig.py:148
+#: config/SSSDConfig.py:149
 msgid "Comma separated list of allowed users"
 msgstr "Lista separada por comas de usuarios autorizados"
 
-#: config/SSSDConfig.py:149
+#: config/SSSDConfig.py:150
 msgid "Comma separated list of prohibited users"
 msgstr "Lista separada por comas de usuarios prohibidos"
 
-#: config/SSSDConfig.py:152
+#: config/SSSDConfig.py:153
 msgid "Default shell, /bin/bash"
 msgstr "Shell predeterminado, /bin/bash"
 
-#: config/SSSDConfig.py:153
+#: config/SSSDConfig.py:154
 msgid "Base for home directories"
 msgstr "Base de los directorios de inicio"
 
-#: config/SSSDConfig.py:156
+#: config/SSSDConfig.py:157
 msgid "The name of the NSS library to use"
 msgstr "Nombre de la biblioteca NSS a usar"
 
-#: config/SSSDConfig.py:159
+#: config/SSSDConfig.py:160
 msgid "PAM stack to use"
 msgstr "Pila PAM a usar"
 
@@ -397,7 +401,13 @@ msgstr "Indicar un archivo de configuración diferente al predeterminado"
 msgid "sssd must be run as root\n"
 msgstr "sssd debe ejecutarse como root\n"
 
-#: monitor/monitor.c:2265
+#: monitor/monitor.c:2264
+msgid ""
+"nscd socket was detected.  As nscd caching capabilities may conflict with "
+"SSSD, it is recommended to not run nscd in parallel with SSSD\n"
+msgstr ""
+
+#: monitor/monitor.c:2274
 #, c-format
 msgid ""
 "Cannot read config file %s, please check if permissions are 0600 and the "
@@ -406,17 +416,17 @@ msgstr ""
 "No es posible leer el archivo de configuración %s, por favor verifique que "
 "los permisos sean 0600, y que su deueño sea root.root\n"
 
-#: providers/krb5/krb5_child.c:922 providers/ldap/ldap_child.c:316
+#: providers/krb5/krb5_child.c:929 providers/ldap/ldap_child.c:316
 #: util/util.h:61
 msgid "Debug level"
 msgstr "Nive de depuración"
 
-#: providers/krb5/krb5_child.c:924 providers/ldap/ldap_child.c:318
+#: providers/krb5/krb5_child.c:931 providers/ldap/ldap_child.c:318
 #: util/util.h:65
 msgid "Add debug timestamps"
 msgstr "Agregar marcas de tiempo de depuración"
 
-#: providers/krb5/krb5_child.c:926 providers/ldap/ldap_child.c:320
+#: providers/krb5/krb5_child.c:933 providers/ldap/ldap_child.c:320
 msgid "An open file descriptor for the debug logs"
 msgstr "Un arhivo abierto de descriptor para los registros de depuración"
 
diff --git a/src/po/fr.po b/src/po/fr.po
index cbe28ae35..90376923f 100644
--- a/src/po/fr.po
+++ b/src/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2010-03-09 08:15-0500\n"
+"POT-Creation-Date: 2010-03-15 07:37-0400\n"
 "PO-Revision-Date: 2009-11-17 21:05+0100\n"
 "Last-Translator: Pablo Martin-Gomez <pablo.martin-gomez@laposte.net>\n"
 "Language-Team: Français <fedora-trans-fr@redhat.com>\n"
@@ -171,11 +171,11 @@ msgstr ""
 msgid "IPA client hostname"
 msgstr ""
 
-#: config/SSSDConfig.py:91 config/SSSDConfig.py:118
+#: config/SSSDConfig.py:91 config/SSSDConfig.py:119
 msgid "Kerberos server address"
 msgstr ""
 
-#: config/SSSDConfig.py:92 config/SSSDConfig.py:119
+#: config/SSSDConfig.py:92 config/SSSDConfig.py:120
 msgid "Kerberos realm"
 msgstr ""
 
@@ -203,167 +203,171 @@ msgstr ""
 msgid "The principal of the change password service"
 msgstr ""
 
-#: config/SSSDConfig.py:105
-msgid "ldap_uri, The URI of the LDAP server"
+#: config/SSSDConfig.py:103
+msgid "Server where the change password service is running if not on the KDC"
 msgstr ""
 
 #: config/SSSDConfig.py:106
-msgid "The default base DN"
+msgid "ldap_uri, The URI of the LDAP server"
 msgstr ""
 
 #: config/SSSDConfig.py:107
-msgid "The Schema Type in use on the LDAP server, rfc2307"
+msgid "The default base DN"
 msgstr ""
 
 #: config/SSSDConfig.py:108
-msgid "The default bind DN"
+msgid "The Schema Type in use on the LDAP server, rfc2307"
 msgstr ""
 
 #: config/SSSDConfig.py:109
-msgid "The type of the authentication token of the default bind DN"
+msgid "The default bind DN"
 msgstr ""
 
 #: config/SSSDConfig.py:110
-msgid "The authentication token of the default bind DN"
+msgid "The type of the authentication token of the default bind DN"
 msgstr ""
 
 #: config/SSSDConfig.py:111
-msgid "Length of time to attempt connection"
+msgid "The authentication token of the default bind DN"
 msgstr ""
 
 #: config/SSSDConfig.py:112
-msgid "Length of time to attempt synchronous LDAP operations"
+msgid "Length of time to attempt connection"
 msgstr ""
 
 #: config/SSSDConfig.py:113
-msgid "Length of time between attempts to reconnect while offline"
+msgid "Length of time to attempt synchronous LDAP operations"
 msgstr ""
 
 #: config/SSSDConfig.py:114
-msgid "file that contains CA certificates"
+msgid "Length of time between attempts to reconnect while offline"
 msgstr ""
 
 #: config/SSSDConfig.py:115
-msgid "Require TLS certificate verification"
+msgid "file that contains CA certificates"
 msgstr ""
 
 #: config/SSSDConfig.py:116
-msgid "Specify the sasl mechanism to use"
+msgid "Require TLS certificate verification"
 msgstr ""
 
 #: config/SSSDConfig.py:117
+msgid "Specify the sasl mechanism to use"
+msgstr ""
+
+#: config/SSSDConfig.py:118
 msgid "Specify the sasl authorization id to use"
 msgstr ""
 
-#: config/SSSDConfig.py:120
+#: config/SSSDConfig.py:121
 msgid "Kerberos service keytab"
 msgstr ""
 
-#: config/SSSDConfig.py:121
+#: config/SSSDConfig.py:122
 msgid "Use Kerberos auth for LDAP connection"
 msgstr ""
 
-#: config/SSSDConfig.py:122
+#: config/SSSDConfig.py:123
 msgid "Follow LDAP referrals"
 msgstr ""
 
-#: config/SSSDConfig.py:125
+#: config/SSSDConfig.py:126
 msgid "Length of time to wait for a search request"
 msgstr ""
 
-#: config/SSSDConfig.py:126
+#: config/SSSDConfig.py:127
 msgid "Length of time between enumeration updates"
 msgstr ""
 
-#: config/SSSDConfig.py:127
+#: config/SSSDConfig.py:128
 msgid "Require TLS for ID lookups, false"
 msgstr ""
 
-#: config/SSSDConfig.py:128
+#: config/SSSDConfig.py:129
 msgid "Base DN for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:129
+#: config/SSSDConfig.py:130
 msgid "Scope of user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:130
+#: config/SSSDConfig.py:131
 msgid "Filter for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:131
+#: config/SSSDConfig.py:132
 msgid "Objectclass for users"
 msgstr ""
 
-#: config/SSSDConfig.py:132
+#: config/SSSDConfig.py:133
 msgid "Username attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:133
+#: config/SSSDConfig.py:134
 msgid "UID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:134
+#: config/SSSDConfig.py:135
 msgid "Primary GID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:135
+#: config/SSSDConfig.py:136
 msgid "GECOS attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:136
+#: config/SSSDConfig.py:137
 msgid "Home directory attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:137
+#: config/SSSDConfig.py:138
 msgid "Shell attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:138
+#: config/SSSDConfig.py:139
 msgid "UUID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:139
+#: config/SSSDConfig.py:140
 msgid "User principal attribute (for Kerberos)"
 msgstr ""
 
-#: config/SSSDConfig.py:140
+#: config/SSSDConfig.py:141
 msgid "Full Name"
 msgstr ""
 
-#: config/SSSDConfig.py:141
+#: config/SSSDConfig.py:142
 msgid "memberOf attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:142
+#: config/SSSDConfig.py:143
 msgid "Modification time attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:145
+#: config/SSSDConfig.py:146
 msgid "Policy to evaluate the password expiration"
 msgstr ""
 
-#: config/SSSDConfig.py:148
+#: config/SSSDConfig.py:149
 msgid "Comma separated list of allowed users"
 msgstr ""
 
-#: config/SSSDConfig.py:149
+#: config/SSSDConfig.py:150
 msgid "Comma separated list of prohibited users"
 msgstr ""
 
-#: config/SSSDConfig.py:152
+#: config/SSSDConfig.py:153
 msgid "Default shell, /bin/bash"
 msgstr ""
 
-#: config/SSSDConfig.py:153
+#: config/SSSDConfig.py:154
 msgid "Base for home directories"
 msgstr ""
 
-#: config/SSSDConfig.py:156
+#: config/SSSDConfig.py:157
 msgid "The name of the NSS library to use"
 msgstr ""
 
-#: config/SSSDConfig.py:159
+#: config/SSSDConfig.py:160
 msgid "PAM stack to use"
 msgstr ""
 
@@ -383,24 +387,30 @@ msgstr ""
 msgid "sssd must be run as root\n"
 msgstr ""
 
-#: monitor/monitor.c:2265
+#: monitor/monitor.c:2264
+msgid ""
+"nscd socket was detected.  As nscd caching capabilities may conflict with "
+"SSSD, it is recommended to not run nscd in parallel with SSSD\n"
+msgstr ""
+
+#: monitor/monitor.c:2274
 #, c-format
 msgid ""
 "Cannot read config file %s, please check if permissions are 0600 and the "
 "file is owned by root.root\n"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:922 providers/ldap/ldap_child.c:316
+#: providers/krb5/krb5_child.c:929 providers/ldap/ldap_child.c:316
 #: util/util.h:61
 msgid "Debug level"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:924 providers/ldap/ldap_child.c:318
+#: providers/krb5/krb5_child.c:931 providers/ldap/ldap_child.c:318
 #: util/util.h:65
 msgid "Add debug timestamps"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:926 providers/ldap/ldap_child.c:320
+#: providers/krb5/krb5_child.c:933 providers/ldap/ldap_child.c:320
 msgid "An open file descriptor for the debug logs"
 msgstr ""
 
diff --git a/src/po/id.po b/src/po/id.po
index 1ce305155..31c4eaf2a 100644
--- a/src/po/id.po
+++ b/src/po/id.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sssd\n"
 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2010-03-09 08:15-0500\n"
+"POT-Creation-Date: 2010-03-15 07:37-0400\n"
 "PO-Revision-Date: 2010-03-09 10:34+0700\n"
 "Last-Translator: Teguh DC <dheche@songolimo.net>\n"
 "Language-Team: Fedora Indonesia <trans-id@lists.fedoraproject.org>\n"
@@ -172,11 +172,11 @@ msgstr "Alamat server IPA"
 msgid "IPA client hostname"
 msgstr "Nama host klien IPA"
 
-#: config/SSSDConfig.py:91 config/SSSDConfig.py:118
+#: config/SSSDConfig.py:91 config/SSSDConfig.py:119
 msgid "Kerberos server address"
 msgstr "Alamat server Kerberos"
 
-#: config/SSSDConfig.py:92 config/SSSDConfig.py:119
+#: config/SSSDConfig.py:92 config/SSSDConfig.py:120
 msgid "Kerberos realm"
 msgstr "Realm Kerberos"
 
@@ -204,167 +204,171 @@ msgstr ""
 msgid "The principal of the change password service"
 msgstr ""
 
-#: config/SSSDConfig.py:105
+#: config/SSSDConfig.py:103
+msgid "Server where the change password service is running if not on the KDC"
+msgstr ""
+
+#: config/SSSDConfig.py:106
 msgid "ldap_uri, The URI of the LDAP server"
 msgstr "ldap_uri, URI server LDAP"
 
-#: config/SSSDConfig.py:106
+#: config/SSSDConfig.py:107
 msgid "The default base DN"
 msgstr ""
 
-#: config/SSSDConfig.py:107
+#: config/SSSDConfig.py:108
 msgid "The Schema Type in use on the LDAP server, rfc2307"
 msgstr "Jenis Skema yang digunakan pada server LDAP, rfc2307"
 
-#: config/SSSDConfig.py:108
+#: config/SSSDConfig.py:109
 msgid "The default bind DN"
 msgstr ""
 
-#: config/SSSDConfig.py:109
+#: config/SSSDConfig.py:110
 msgid "The type of the authentication token of the default bind DN"
 msgstr ""
 
-#: config/SSSDConfig.py:110
+#: config/SSSDConfig.py:111
 msgid "The authentication token of the default bind DN"
 msgstr ""
 
-#: config/SSSDConfig.py:111
+#: config/SSSDConfig.py:112
 msgid "Length of time to attempt connection"
 msgstr "Lamanya waktu untuk mencoba koneksi"
 
-#: config/SSSDConfig.py:112
+#: config/SSSDConfig.py:113
 msgid "Length of time to attempt synchronous LDAP operations"
 msgstr "Lamanya waktu untuk mencoba operasi LDAP yang sinkron"
 
-#: config/SSSDConfig.py:113
+#: config/SSSDConfig.py:114
 msgid "Length of time between attempts to reconnect while offline"
 msgstr "Lamanya waktu antara upaya untuk menyambung kembali saat luring"
 
-#: config/SSSDConfig.py:114
+#: config/SSSDConfig.py:115
 msgid "file that contains CA certificates"
 msgstr "berkas yang berisi sertifikat CA"
 
-#: config/SSSDConfig.py:115
+#: config/SSSDConfig.py:116
 msgid "Require TLS certificate verification"
 msgstr "Membutuhkan verifikasi sertifikat TLS"
 
-#: config/SSSDConfig.py:116
+#: config/SSSDConfig.py:117
 msgid "Specify the sasl mechanism to use"
 msgstr "Tentukan mekanisme sasl yang digunakan"
 
-#: config/SSSDConfig.py:117
+#: config/SSSDConfig.py:118
 msgid "Specify the sasl authorization id to use"
 msgstr "Tentukan id otorisasi sasl yang digunakan"
 
-#: config/SSSDConfig.py:120
+#: config/SSSDConfig.py:121
 msgid "Kerberos service keytab"
 msgstr "Keytab layanan Kerberos"
 
-#: config/SSSDConfig.py:121
+#: config/SSSDConfig.py:122
 msgid "Use Kerberos auth for LDAP connection"
 msgstr "Gunakan otentikasi Kerberos untuk koneksi LDAP"
 
-#: config/SSSDConfig.py:122
+#: config/SSSDConfig.py:123
 msgid "Follow LDAP referrals"
 msgstr ""
 
-#: config/SSSDConfig.py:125
+#: config/SSSDConfig.py:126
 msgid "Length of time to wait for a search request"
 msgstr ""
 
-#: config/SSSDConfig.py:126
+#: config/SSSDConfig.py:127
 msgid "Length of time between enumeration updates"
 msgstr ""
 
-#: config/SSSDConfig.py:127
+#: config/SSSDConfig.py:128
 msgid "Require TLS for ID lookups, false"
 msgstr ""
 
-#: config/SSSDConfig.py:128
+#: config/SSSDConfig.py:129
 msgid "Base DN for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:129
+#: config/SSSDConfig.py:130
 msgid "Scope of user lookups"
 msgstr "Lingkup pencarian pengguna"
 
-#: config/SSSDConfig.py:130
+#: config/SSSDConfig.py:131
 msgid "Filter for user lookups"
 msgstr "Filter pencarian pengguna"
 
-#: config/SSSDConfig.py:131
+#: config/SSSDConfig.py:132
 msgid "Objectclass for users"
 msgstr "Objectclass untuk pengguna"
 
-#: config/SSSDConfig.py:132
+#: config/SSSDConfig.py:133
 msgid "Username attribute"
 msgstr "Atribut Nama pengguna"
 
-#: config/SSSDConfig.py:133
+#: config/SSSDConfig.py:134
 msgid "UID attribute"
 msgstr "Atribut UID"
 
-#: config/SSSDConfig.py:134
+#: config/SSSDConfig.py:135
 msgid "Primary GID attribute"
 msgstr "Atribut GID Primer"
 
-#: config/SSSDConfig.py:135
+#: config/SSSDConfig.py:136
 msgid "GECOS attribute"
 msgstr "Atribut GECOS"
 
-#: config/SSSDConfig.py:136
+#: config/SSSDConfig.py:137
 msgid "Home directory attribute"
 msgstr "Atribut direktori Home"
 
-#: config/SSSDConfig.py:137
+#: config/SSSDConfig.py:138
 msgid "Shell attribute"
 msgstr "Atribut Shell"
 
-#: config/SSSDConfig.py:138
+#: config/SSSDConfig.py:139
 msgid "UUID attribute"
 msgstr "Atribut UUID"
 
-#: config/SSSDConfig.py:139
+#: config/SSSDConfig.py:140
 msgid "User principal attribute (for Kerberos)"
 msgstr "Atribut utama pengguna (untuk Kerberos)"
 
-#: config/SSSDConfig.py:140
+#: config/SSSDConfig.py:141
 msgid "Full Name"
 msgstr "Nama Lengkap"
 
-#: config/SSSDConfig.py:141
+#: config/SSSDConfig.py:142
 msgid "memberOf attribute"
 msgstr "Atribut memberOf"
 
-#: config/SSSDConfig.py:142
+#: config/SSSDConfig.py:143
 msgid "Modification time attribute"
 msgstr "Atribut waktu modifikasi"
 
-#: config/SSSDConfig.py:145
+#: config/SSSDConfig.py:146
 msgid "Policy to evaluate the password expiration"
 msgstr ""
 
-#: config/SSSDConfig.py:148
+#: config/SSSDConfig.py:149
 msgid "Comma separated list of allowed users"
 msgstr "Daftar pengguna yang diijinkan dalam format yang dipisahkan koma"
 
-#: config/SSSDConfig.py:149
+#: config/SSSDConfig.py:150
 msgid "Comma separated list of prohibited users"
 msgstr "Daftar pengguna yang tidak diijinkan dalam format yang dipisahkan koma"
 
-#: config/SSSDConfig.py:152
+#: config/SSSDConfig.py:153
 msgid "Default shell, /bin/bash"
 msgstr "Shell default, /bin/bash"
 
-#: config/SSSDConfig.py:153
+#: config/SSSDConfig.py:154
 msgid "Base for home directories"
 msgstr ""
 
-#: config/SSSDConfig.py:156
+#: config/SSSDConfig.py:157
 msgid "The name of the NSS library to use"
 msgstr ""
 
-#: config/SSSDConfig.py:159
+#: config/SSSDConfig.py:160
 msgid "PAM stack to use"
 msgstr ""
 
@@ -385,24 +389,30 @@ msgstr ""
 msgid "sssd must be run as root\n"
 msgstr "%s harus dijalankan sebagai root\n"
 
-#: monitor/monitor.c:2265
+#: monitor/monitor.c:2264
+msgid ""
+"nscd socket was detected.  As nscd caching capabilities may conflict with "
+"SSSD, it is recommended to not run nscd in parallel with SSSD\n"
+msgstr ""
+
+#: monitor/monitor.c:2274
 #, c-format
 msgid ""
 "Cannot read config file %s, please check if permissions are 0600 and the "
 "file is owned by root.root\n"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:922 providers/ldap/ldap_child.c:316
+#: providers/krb5/krb5_child.c:929 providers/ldap/ldap_child.c:316
 #: util/util.h:61
 msgid "Debug level"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:924 providers/ldap/ldap_child.c:318
+#: providers/krb5/krb5_child.c:931 providers/ldap/ldap_child.c:318
 #: util/util.h:65
 msgid "Add debug timestamps"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:926 providers/ldap/ldap_child.c:320
+#: providers/krb5/krb5_child.c:933 providers/ldap/ldap_child.c:320
 #, fuzzy
 msgid "An open file descriptor for the debug logs"
 msgstr "Mengatur verbosity dari pencatatan debug"
diff --git a/src/po/it.po b/src/po/it.po
index a3fc77485..e7823786a 100644
--- a/src/po/it.po
+++ b/src/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2010-03-09 08:15-0500\n"
+"POT-Creation-Date: 2010-03-15 07:37-0400\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Marina Latini <deneb.alphacygni@gmail.com>\n"
 "Language-Team: Italian <fedora-trans-it@redhat.com>\n"
@@ -173,11 +173,11 @@ msgstr "indirizzi del server IPA"
 msgid "IPA client hostname"
 msgstr ""
 
-#: config/SSSDConfig.py:91 config/SSSDConfig.py:118
+#: config/SSSDConfig.py:91 config/SSSDConfig.py:119
 msgid "Kerberos server address"
 msgstr "Indirizzi del server Kerberos"
 
-#: config/SSSDConfig.py:92 config/SSSDConfig.py:119
+#: config/SSSDConfig.py:92 config/SSSDConfig.py:120
 msgid "Kerberos realm"
 msgstr ""
 
@@ -205,167 +205,171 @@ msgstr "Abilita la validazione delle credenziali"
 msgid "The principal of the change password service"
 msgstr ""
 
-#: config/SSSDConfig.py:105
-msgid "ldap_uri, The URI of the LDAP server"
+#: config/SSSDConfig.py:103
+msgid "Server where the change password service is running if not on the KDC"
 msgstr ""
 
 #: config/SSSDConfig.py:106
-msgid "The default base DN"
+msgid "ldap_uri, The URI of the LDAP server"
 msgstr ""
 
 #: config/SSSDConfig.py:107
-msgid "The Schema Type in use on the LDAP server, rfc2307"
+msgid "The default base DN"
 msgstr ""
 
 #: config/SSSDConfig.py:108
-msgid "The default bind DN"
+msgid "The Schema Type in use on the LDAP server, rfc2307"
 msgstr ""
 
 #: config/SSSDConfig.py:109
-msgid "The type of the authentication token of the default bind DN"
+msgid "The default bind DN"
 msgstr ""
 
 #: config/SSSDConfig.py:110
-msgid "The authentication token of the default bind DN"
+msgid "The type of the authentication token of the default bind DN"
 msgstr ""
 
 #: config/SSSDConfig.py:111
-msgid "Length of time to attempt connection"
+msgid "The authentication token of the default bind DN"
 msgstr ""
 
 #: config/SSSDConfig.py:112
-msgid "Length of time to attempt synchronous LDAP operations"
+msgid "Length of time to attempt connection"
 msgstr ""
 
 #: config/SSSDConfig.py:113
-msgid "Length of time between attempts to reconnect while offline"
+msgid "Length of time to attempt synchronous LDAP operations"
 msgstr ""
 
 #: config/SSSDConfig.py:114
+msgid "Length of time between attempts to reconnect while offline"
+msgstr ""
+
+#: config/SSSDConfig.py:115
 msgid "file that contains CA certificates"
 msgstr "file che contiene certificati CA"
 
-#: config/SSSDConfig.py:115
+#: config/SSSDConfig.py:116
 msgid "Require TLS certificate verification"
 msgstr "Richiedere la verifica del certificato TLS"
 
-#: config/SSSDConfig.py:116
+#: config/SSSDConfig.py:117
 msgid "Specify the sasl mechanism to use"
 msgstr "Specificare il meccanismo sasl da usare"
 
-#: config/SSSDConfig.py:117
+#: config/SSSDConfig.py:118
 msgid "Specify the sasl authorization id to use"
 msgstr "Specificare l'id di autorizzazione sasl da usare"
 
-#: config/SSSDConfig.py:120
+#: config/SSSDConfig.py:121
 msgid "Kerberos service keytab"
 msgstr ""
 
-#: config/SSSDConfig.py:121
+#: config/SSSDConfig.py:122
 msgid "Use Kerberos auth for LDAP connection"
 msgstr ""
 
-#: config/SSSDConfig.py:122
+#: config/SSSDConfig.py:123
 msgid "Follow LDAP referrals"
 msgstr ""
 
-#: config/SSSDConfig.py:125
+#: config/SSSDConfig.py:126
 msgid "Length of time to wait for a search request"
 msgstr ""
 
-#: config/SSSDConfig.py:126
+#: config/SSSDConfig.py:127
 msgid "Length of time between enumeration updates"
 msgstr ""
 
-#: config/SSSDConfig.py:127
+#: config/SSSDConfig.py:128
 msgid "Require TLS for ID lookups, false"
 msgstr ""
 
-#: config/SSSDConfig.py:128
+#: config/SSSDConfig.py:129
 msgid "Base DN for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:129
+#: config/SSSDConfig.py:130
 msgid "Scope of user lookups"
 msgstr "Ambito di applicazione della ricerca degli utenti"
 
-#: config/SSSDConfig.py:130
+#: config/SSSDConfig.py:131
 msgid "Filter for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:131
+#: config/SSSDConfig.py:132
 msgid "Objectclass for users"
 msgstr ""
 
-#: config/SSSDConfig.py:132
+#: config/SSSDConfig.py:133
 msgid "Username attribute"
 msgstr "Attributo del nome utente"
 
-#: config/SSSDConfig.py:133
+#: config/SSSDConfig.py:134
 msgid "UID attribute"
 msgstr "Attributo UID"
 
-#: config/SSSDConfig.py:134
+#: config/SSSDConfig.py:135
 msgid "Primary GID attribute"
 msgstr "Attributo del GID primario"
 
-#: config/SSSDConfig.py:135
+#: config/SSSDConfig.py:136
 msgid "GECOS attribute"
 msgstr "Attributo GECOS"
 
-#: config/SSSDConfig.py:136
+#: config/SSSDConfig.py:137
 msgid "Home directory attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:137
+#: config/SSSDConfig.py:138
 msgid "Shell attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:138
+#: config/SSSDConfig.py:139
 msgid "UUID attribute"
 msgstr "Attributo UUID"
 
-#: config/SSSDConfig.py:139
+#: config/SSSDConfig.py:140
 msgid "User principal attribute (for Kerberos)"
 msgstr ""
 
-#: config/SSSDConfig.py:140
+#: config/SSSDConfig.py:141
 msgid "Full Name"
 msgstr ""
 
-#: config/SSSDConfig.py:141
+#: config/SSSDConfig.py:142
 msgid "memberOf attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:142
+#: config/SSSDConfig.py:143
 msgid "Modification time attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:145
+#: config/SSSDConfig.py:146
 msgid "Policy to evaluate the password expiration"
 msgstr "Politica per controllare la scadenza della password"
 
-#: config/SSSDConfig.py:148
+#: config/SSSDConfig.py:149
 msgid "Comma separated list of allowed users"
 msgstr ""
 
-#: config/SSSDConfig.py:149
+#: config/SSSDConfig.py:150
 msgid "Comma separated list of prohibited users"
 msgstr ""
 
-#: config/SSSDConfig.py:152
+#: config/SSSDConfig.py:153
 msgid "Default shell, /bin/bash"
 msgstr ""
 
-#: config/SSSDConfig.py:153
+#: config/SSSDConfig.py:154
 msgid "Base for home directories"
 msgstr ""
 
-#: config/SSSDConfig.py:156
+#: config/SSSDConfig.py:157
 msgid "The name of the NSS library to use"
 msgstr ""
 
-#: config/SSSDConfig.py:159
+#: config/SSSDConfig.py:160
 msgid "PAM stack to use"
 msgstr "Stack PAM da usare"
 
@@ -386,24 +390,30 @@ msgstr ""
 msgid "sssd must be run as root\n"
 msgstr "%s deve essere eseguito come root\n"
 
-#: monitor/monitor.c:2265
+#: monitor/monitor.c:2264
+msgid ""
+"nscd socket was detected.  As nscd caching capabilities may conflict with "
+"SSSD, it is recommended to not run nscd in parallel with SSSD\n"
+msgstr ""
+
+#: monitor/monitor.c:2274
 #, c-format
 msgid ""
 "Cannot read config file %s, please check if permissions are 0600 and the "
 "file is owned by root.root\n"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:922 providers/ldap/ldap_child.c:316
+#: providers/krb5/krb5_child.c:929 providers/ldap/ldap_child.c:316
 #: util/util.h:61
 msgid "Debug level"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:924 providers/ldap/ldap_child.c:318
+#: providers/krb5/krb5_child.c:931 providers/ldap/ldap_child.c:318
 #: util/util.h:65
 msgid "Add debug timestamps"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:926 providers/ldap/ldap_child.c:320
+#: providers/krb5/krb5_child.c:933 providers/ldap/ldap_child.c:320
 #, fuzzy
 msgid "An open file descriptor for the debug logs"
 msgstr "Impostare il livello di dettaglio dello storico dei file di log"
diff --git a/src/po/ja.po b/src/po/ja.po
index 6fdb9608f..639ea5f30 100644
--- a/src/po/ja.po
+++ b/src/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sss_daemon_ja\n"
 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2010-03-09 08:15-0500\n"
+"POT-Creation-Date: 2010-03-15 07:37-0400\n"
 "PO-Revision-Date: 2009-11-18 09:48+1000\n"
 "Last-Translator: Noriko Mizumoto <noriko@fedoraproject.org>\n"
 "Language-Team: Japanese <fedora-trans-ja@redhat.com>\n"
@@ -172,11 +172,11 @@ msgstr ""
 msgid "IPA client hostname"
 msgstr ""
 
-#: config/SSSDConfig.py:91 config/SSSDConfig.py:118
+#: config/SSSDConfig.py:91 config/SSSDConfig.py:119
 msgid "Kerberos server address"
 msgstr ""
 
-#: config/SSSDConfig.py:92 config/SSSDConfig.py:119
+#: config/SSSDConfig.py:92 config/SSSDConfig.py:120
 msgid "Kerberos realm"
 msgstr ""
 
@@ -204,167 +204,171 @@ msgstr ""
 msgid "The principal of the change password service"
 msgstr ""
 
-#: config/SSSDConfig.py:105
-msgid "ldap_uri, The URI of the LDAP server"
+#: config/SSSDConfig.py:103
+msgid "Server where the change password service is running if not on the KDC"
 msgstr ""
 
 #: config/SSSDConfig.py:106
-msgid "The default base DN"
+msgid "ldap_uri, The URI of the LDAP server"
 msgstr ""
 
 #: config/SSSDConfig.py:107
-msgid "The Schema Type in use on the LDAP server, rfc2307"
+msgid "The default base DN"
 msgstr ""
 
 #: config/SSSDConfig.py:108
-msgid "The default bind DN"
+msgid "The Schema Type in use on the LDAP server, rfc2307"
 msgstr ""
 
 #: config/SSSDConfig.py:109
-msgid "The type of the authentication token of the default bind DN"
+msgid "The default bind DN"
 msgstr ""
 
 #: config/SSSDConfig.py:110
-msgid "The authentication token of the default bind DN"
+msgid "The type of the authentication token of the default bind DN"
 msgstr ""
 
 #: config/SSSDConfig.py:111
-msgid "Length of time to attempt connection"
+msgid "The authentication token of the default bind DN"
 msgstr ""
 
 #: config/SSSDConfig.py:112
-msgid "Length of time to attempt synchronous LDAP operations"
+msgid "Length of time to attempt connection"
 msgstr ""
 
 #: config/SSSDConfig.py:113
-msgid "Length of time between attempts to reconnect while offline"
+msgid "Length of time to attempt synchronous LDAP operations"
 msgstr ""
 
 #: config/SSSDConfig.py:114
-msgid "file that contains CA certificates"
+msgid "Length of time between attempts to reconnect while offline"
 msgstr ""
 
 #: config/SSSDConfig.py:115
-msgid "Require TLS certificate verification"
+msgid "file that contains CA certificates"
 msgstr ""
 
 #: config/SSSDConfig.py:116
-msgid "Specify the sasl mechanism to use"
+msgid "Require TLS certificate verification"
 msgstr ""
 
 #: config/SSSDConfig.py:117
+msgid "Specify the sasl mechanism to use"
+msgstr ""
+
+#: config/SSSDConfig.py:118
 msgid "Specify the sasl authorization id to use"
 msgstr ""
 
-#: config/SSSDConfig.py:120
+#: config/SSSDConfig.py:121
 msgid "Kerberos service keytab"
 msgstr ""
 
-#: config/SSSDConfig.py:121
+#: config/SSSDConfig.py:122
 msgid "Use Kerberos auth for LDAP connection"
 msgstr ""
 
-#: config/SSSDConfig.py:122
+#: config/SSSDConfig.py:123
 msgid "Follow LDAP referrals"
 msgstr ""
 
-#: config/SSSDConfig.py:125
+#: config/SSSDConfig.py:126
 msgid "Length of time to wait for a search request"
 msgstr ""
 
-#: config/SSSDConfig.py:126
+#: config/SSSDConfig.py:127
 msgid "Length of time between enumeration updates"
 msgstr ""
 
-#: config/SSSDConfig.py:127
+#: config/SSSDConfig.py:128
 msgid "Require TLS for ID lookups, false"
 msgstr ""
 
-#: config/SSSDConfig.py:128
+#: config/SSSDConfig.py:129
 msgid "Base DN for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:129
+#: config/SSSDConfig.py:130
 msgid "Scope of user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:130
+#: config/SSSDConfig.py:131
 msgid "Filter for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:131
+#: config/SSSDConfig.py:132
 msgid "Objectclass for users"
 msgstr ""
 
-#: config/SSSDConfig.py:132
+#: config/SSSDConfig.py:133
 msgid "Username attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:133
+#: config/SSSDConfig.py:134
 msgid "UID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:134
+#: config/SSSDConfig.py:135
 msgid "Primary GID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:135
+#: config/SSSDConfig.py:136
 msgid "GECOS attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:136
+#: config/SSSDConfig.py:137
 msgid "Home directory attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:137
+#: config/SSSDConfig.py:138
 msgid "Shell attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:138
+#: config/SSSDConfig.py:139
 msgid "UUID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:139
+#: config/SSSDConfig.py:140
 msgid "User principal attribute (for Kerberos)"
 msgstr ""
 
-#: config/SSSDConfig.py:140
+#: config/SSSDConfig.py:141
 msgid "Full Name"
 msgstr ""
 
-#: config/SSSDConfig.py:141
+#: config/SSSDConfig.py:142
 msgid "memberOf attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:142
+#: config/SSSDConfig.py:143
 msgid "Modification time attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:145
+#: config/SSSDConfig.py:146
 msgid "Policy to evaluate the password expiration"
 msgstr ""
 
-#: config/SSSDConfig.py:148
+#: config/SSSDConfig.py:149
 msgid "Comma separated list of allowed users"
 msgstr ""
 
-#: config/SSSDConfig.py:149
+#: config/SSSDConfig.py:150
 msgid "Comma separated list of prohibited users"
 msgstr ""
 
-#: config/SSSDConfig.py:152
+#: config/SSSDConfig.py:153
 msgid "Default shell, /bin/bash"
 msgstr ""
 
-#: config/SSSDConfig.py:153
+#: config/SSSDConfig.py:154
 msgid "Base for home directories"
 msgstr ""
 
-#: config/SSSDConfig.py:156
+#: config/SSSDConfig.py:157
 msgid "The name of the NSS library to use"
 msgstr ""
 
-#: config/SSSDConfig.py:159
+#: config/SSSDConfig.py:160
 msgid "PAM stack to use"
 msgstr ""
 
@@ -384,24 +388,30 @@ msgstr ""
 msgid "sssd must be run as root\n"
 msgstr ""
 
-#: monitor/monitor.c:2265
+#: monitor/monitor.c:2264
+msgid ""
+"nscd socket was detected.  As nscd caching capabilities may conflict with "
+"SSSD, it is recommended to not run nscd in parallel with SSSD\n"
+msgstr ""
+
+#: monitor/monitor.c:2274
 #, c-format
 msgid ""
 "Cannot read config file %s, please check if permissions are 0600 and the "
 "file is owned by root.root\n"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:922 providers/ldap/ldap_child.c:316
+#: providers/krb5/krb5_child.c:929 providers/ldap/ldap_child.c:316
 #: util/util.h:61
 msgid "Debug level"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:924 providers/ldap/ldap_child.c:318
+#: providers/krb5/krb5_child.c:931 providers/ldap/ldap_child.c:318
 #: util/util.h:65
 msgid "Add debug timestamps"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:926 providers/ldap/ldap_child.c:320
+#: providers/krb5/krb5_child.c:933 providers/ldap/ldap_child.c:320
 msgid "An open file descriptor for the debug logs"
 msgstr ""
 
diff --git a/src/po/nl.po b/src/po/nl.po
index 93909d88e..a0a7d9728 100644
--- a/src/po/nl.po
+++ b/src/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sssd.master.sss_daemon\n"
 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2010-03-09 08:15-0500\n"
+"POT-Creation-Date: 2010-03-15 07:37-0400\n"
 "PO-Revision-Date: 2009-11-19 12:19+0100\n"
 "Last-Translator: Richard van der Luit <nippur@fedoraproject.org>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -172,11 +172,11 @@ msgstr ""
 msgid "IPA client hostname"
 msgstr ""
 
-#: config/SSSDConfig.py:91 config/SSSDConfig.py:118
+#: config/SSSDConfig.py:91 config/SSSDConfig.py:119
 msgid "Kerberos server address"
 msgstr ""
 
-#: config/SSSDConfig.py:92 config/SSSDConfig.py:119
+#: config/SSSDConfig.py:92 config/SSSDConfig.py:120
 msgid "Kerberos realm"
 msgstr ""
 
@@ -204,167 +204,171 @@ msgstr ""
 msgid "The principal of the change password service"
 msgstr ""
 
-#: config/SSSDConfig.py:105
-msgid "ldap_uri, The URI of the LDAP server"
+#: config/SSSDConfig.py:103
+msgid "Server where the change password service is running if not on the KDC"
 msgstr ""
 
 #: config/SSSDConfig.py:106
-msgid "The default base DN"
+msgid "ldap_uri, The URI of the LDAP server"
 msgstr ""
 
 #: config/SSSDConfig.py:107
-msgid "The Schema Type in use on the LDAP server, rfc2307"
+msgid "The default base DN"
 msgstr ""
 
 #: config/SSSDConfig.py:108
-msgid "The default bind DN"
+msgid "The Schema Type in use on the LDAP server, rfc2307"
 msgstr ""
 
 #: config/SSSDConfig.py:109
-msgid "The type of the authentication token of the default bind DN"
+msgid "The default bind DN"
 msgstr ""
 
 #: config/SSSDConfig.py:110
-msgid "The authentication token of the default bind DN"
+msgid "The type of the authentication token of the default bind DN"
 msgstr ""
 
 #: config/SSSDConfig.py:111
-msgid "Length of time to attempt connection"
+msgid "The authentication token of the default bind DN"
 msgstr ""
 
 #: config/SSSDConfig.py:112
-msgid "Length of time to attempt synchronous LDAP operations"
+msgid "Length of time to attempt connection"
 msgstr ""
 
 #: config/SSSDConfig.py:113
-msgid "Length of time between attempts to reconnect while offline"
+msgid "Length of time to attempt synchronous LDAP operations"
 msgstr ""
 
 #: config/SSSDConfig.py:114
-msgid "file that contains CA certificates"
+msgid "Length of time between attempts to reconnect while offline"
 msgstr ""
 
 #: config/SSSDConfig.py:115
-msgid "Require TLS certificate verification"
+msgid "file that contains CA certificates"
 msgstr ""
 
 #: config/SSSDConfig.py:116
-msgid "Specify the sasl mechanism to use"
+msgid "Require TLS certificate verification"
 msgstr ""
 
 #: config/SSSDConfig.py:117
+msgid "Specify the sasl mechanism to use"
+msgstr ""
+
+#: config/SSSDConfig.py:118
 msgid "Specify the sasl authorization id to use"
 msgstr ""
 
-#: config/SSSDConfig.py:120
+#: config/SSSDConfig.py:121
 msgid "Kerberos service keytab"
 msgstr ""
 
-#: config/SSSDConfig.py:121
+#: config/SSSDConfig.py:122
 msgid "Use Kerberos auth for LDAP connection"
 msgstr ""
 
-#: config/SSSDConfig.py:122
+#: config/SSSDConfig.py:123
 msgid "Follow LDAP referrals"
 msgstr ""
 
-#: config/SSSDConfig.py:125
+#: config/SSSDConfig.py:126
 msgid "Length of time to wait for a search request"
 msgstr ""
 
-#: config/SSSDConfig.py:126
+#: config/SSSDConfig.py:127
 msgid "Length of time between enumeration updates"
 msgstr ""
 
-#: config/SSSDConfig.py:127
+#: config/SSSDConfig.py:128
 msgid "Require TLS for ID lookups, false"
 msgstr ""
 
-#: config/SSSDConfig.py:128
+#: config/SSSDConfig.py:129
 msgid "Base DN for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:129
+#: config/SSSDConfig.py:130
 msgid "Scope of user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:130
+#: config/SSSDConfig.py:131
 msgid "Filter for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:131
+#: config/SSSDConfig.py:132
 msgid "Objectclass for users"
 msgstr ""
 
-#: config/SSSDConfig.py:132
+#: config/SSSDConfig.py:133
 msgid "Username attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:133
+#: config/SSSDConfig.py:134
 msgid "UID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:134
+#: config/SSSDConfig.py:135
 msgid "Primary GID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:135
+#: config/SSSDConfig.py:136
 msgid "GECOS attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:136
+#: config/SSSDConfig.py:137
 msgid "Home directory attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:137
+#: config/SSSDConfig.py:138
 msgid "Shell attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:138
+#: config/SSSDConfig.py:139
 msgid "UUID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:139
+#: config/SSSDConfig.py:140
 msgid "User principal attribute (for Kerberos)"
 msgstr ""
 
-#: config/SSSDConfig.py:140
+#: config/SSSDConfig.py:141
 msgid "Full Name"
 msgstr ""
 
-#: config/SSSDConfig.py:141
+#: config/SSSDConfig.py:142
 msgid "memberOf attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:142
+#: config/SSSDConfig.py:143
 msgid "Modification time attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:145
+#: config/SSSDConfig.py:146
 msgid "Policy to evaluate the password expiration"
 msgstr ""
 
-#: config/SSSDConfig.py:148
+#: config/SSSDConfig.py:149
 msgid "Comma separated list of allowed users"
 msgstr ""
 
-#: config/SSSDConfig.py:149
+#: config/SSSDConfig.py:150
 msgid "Comma separated list of prohibited users"
 msgstr ""
 
-#: config/SSSDConfig.py:152
+#: config/SSSDConfig.py:153
 msgid "Default shell, /bin/bash"
 msgstr ""
 
-#: config/SSSDConfig.py:153
+#: config/SSSDConfig.py:154
 msgid "Base for home directories"
 msgstr ""
 
-#: config/SSSDConfig.py:156
+#: config/SSSDConfig.py:157
 msgid "The name of the NSS library to use"
 msgstr ""
 
-#: config/SSSDConfig.py:159
+#: config/SSSDConfig.py:160
 msgid "PAM stack to use"
 msgstr ""
 
@@ -384,24 +388,30 @@ msgstr ""
 msgid "sssd must be run as root\n"
 msgstr ""
 
-#: monitor/monitor.c:2265
+#: monitor/monitor.c:2264
+msgid ""
+"nscd socket was detected.  As nscd caching capabilities may conflict with "
+"SSSD, it is recommended to not run nscd in parallel with SSSD\n"
+msgstr ""
+
+#: monitor/monitor.c:2274
 #, c-format
 msgid ""
 "Cannot read config file %s, please check if permissions are 0600 and the "
 "file is owned by root.root\n"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:922 providers/ldap/ldap_child.c:316
+#: providers/krb5/krb5_child.c:929 providers/ldap/ldap_child.c:316
 #: util/util.h:61
 msgid "Debug level"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:924 providers/ldap/ldap_child.c:318
+#: providers/krb5/krb5_child.c:931 providers/ldap/ldap_child.c:318
 #: util/util.h:65
 msgid "Add debug timestamps"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:926 providers/ldap/ldap_child.c:320
+#: providers/krb5/krb5_child.c:933 providers/ldap/ldap_child.c:320
 msgid "An open file descriptor for the debug logs"
 msgstr ""
 
diff --git a/src/po/pl.po b/src/po/pl.po
index 8b9491ae4..d3c01f6c2 100644
--- a/src/po/pl.po
+++ b/src/po/pl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2010-03-10 07:43-0500\n"
+"POT-Creation-Date: 2010-03-15 07:37-0400\n"
 "PO-Revision-Date: 2010-03-10 11:41+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n"
@@ -176,11 +176,11 @@ msgstr "Adres serwera IPA"
 msgid "IPA client hostname"
 msgstr "Nazwa komputera klienta IPA"
 
-#: config/SSSDConfig.py:91 config/SSSDConfig.py:118
+#: config/SSSDConfig.py:91 config/SSSDConfig.py:119
 msgid "Kerberos server address"
 msgstr "Adres serwera Kerberos"
 
-#: config/SSSDConfig.py:92 config/SSSDConfig.py:119
+#: config/SSSDConfig.py:92 config/SSSDConfig.py:120
 msgid "Kerberos realm"
 msgstr "Obszar Kerberos"
 
@@ -209,167 +209,171 @@ msgstr "Włącza sprawdzanie danych uwierzytelniających"
 msgid "The principal of the change password service"
 msgstr "Główna usługa zmiany hasła"
 
-#: config/SSSDConfig.py:105
+#: config/SSSDConfig.py:103
+msgid "Server where the change password service is running if not on the KDC"
+msgstr ""
+
+#: config/SSSDConfig.py:106
 msgid "ldap_uri, The URI of the LDAP server"
 msgstr "ldap_uri, adres URI serwera LDAP"
 
-#: config/SSSDConfig.py:106
+#: config/SSSDConfig.py:107
 msgid "The default base DN"
 msgstr "Domyślna podstawowa DN"
 
-#: config/SSSDConfig.py:107
+#: config/SSSDConfig.py:108
 msgid "The Schema Type in use on the LDAP server, rfc2307"
 msgstr "Typ Schema do użycia na serwerze LDAP, RFC2307"
 
-#: config/SSSDConfig.py:108
+#: config/SSSDConfig.py:109
 msgid "The default bind DN"
 msgstr "Domyślne DN dowiązania"
 
-#: config/SSSDConfig.py:109
+#: config/SSSDConfig.py:110
 msgid "The type of the authentication token of the default bind DN"
 msgstr "Typ tokenu uwierzytelniania domyślnego DN dowiązania"
 
-#: config/SSSDConfig.py:110
+#: config/SSSDConfig.py:111
 msgid "The authentication token of the default bind DN"
 msgstr "Token uwierzytelniania domyślnego DN dowiązania"
 
-#: config/SSSDConfig.py:111
+#: config/SSSDConfig.py:112
 msgid "Length of time to attempt connection"
 msgstr "Czas do próby połączenia"
 
-#: config/SSSDConfig.py:112
+#: config/SSSDConfig.py:113
 msgid "Length of time to attempt synchronous LDAP operations"
 msgstr "Czas do próby synchronicznych działań LDAP"
 
-#: config/SSSDConfig.py:113
+#: config/SSSDConfig.py:114
 msgid "Length of time between attempts to reconnect while offline"
 msgstr "Czas między próbami ponownego połączenia w trybie offline"
 
-#: config/SSSDConfig.py:114
+#: config/SSSDConfig.py:115
 msgid "file that contains CA certificates"
 msgstr "plik zawierający certyfikaty CA"
 
-#: config/SSSDConfig.py:115
+#: config/SSSDConfig.py:116
 msgid "Require TLS certificate verification"
 msgstr "Wymaga sprawdzenia certyfikatu TLS"
 
-#: config/SSSDConfig.py:116
+#: config/SSSDConfig.py:117
 msgid "Specify the sasl mechanism to use"
 msgstr "Podaje używany mechanizm SASL"
 
-#: config/SSSDConfig.py:117
+#: config/SSSDConfig.py:118
 msgid "Specify the sasl authorization id to use"
 msgstr "Podaje używany identyfikator upoważnienia SASL"
 
-#: config/SSSDConfig.py:120
+#: config/SSSDConfig.py:121
 msgid "Kerberos service keytab"
 msgstr "Tablica kluczy usługi Kerberos"
 
-#: config/SSSDConfig.py:121
+#: config/SSSDConfig.py:122
 msgid "Use Kerberos auth for LDAP connection"
 msgstr "Używa uwierzytelniania Kerberos dla połączenia LDAP"
 
-#: config/SSSDConfig.py:122
+#: config/SSSDConfig.py:123
 msgid "Follow LDAP referrals"
 msgstr "Podąża za odsyłaniami LDAP"
 
-#: config/SSSDConfig.py:125
+#: config/SSSDConfig.py:126
 msgid "Length of time to wait for a search request"
 msgstr "Czas oczekiwania na żądanie wyszukiwania"
 
-#: config/SSSDConfig.py:126
+#: config/SSSDConfig.py:127
 msgid "Length of time between enumeration updates"
 msgstr "Czas między aktualizacjami wyliczania"
 
-#: config/SSSDConfig.py:127
+#: config/SSSDConfig.py:128
 msgid "Require TLS for ID lookups, false"
 msgstr "Wymaga TLS dla wyszukiwania identyfikatorów, fałsz"
 
-#: config/SSSDConfig.py:128
+#: config/SSSDConfig.py:129
 msgid "Base DN for user lookups"
 msgstr "Podstawowe DN dla wyszukiwania użytkowników"
 
-#: config/SSSDConfig.py:129
+#: config/SSSDConfig.py:130
 msgid "Scope of user lookups"
 msgstr "Zakres wyszukiwania użytkowników"
 
-#: config/SSSDConfig.py:130
+#: config/SSSDConfig.py:131
 msgid "Filter for user lookups"
 msgstr "Filtruje wyszukiwania użytkowników"
 
-#: config/SSSDConfig.py:131
+#: config/SSSDConfig.py:132
 msgid "Objectclass for users"
 msgstr "Klasa obiektów dla użytkowników"
 
-#: config/SSSDConfig.py:132
+#: config/SSSDConfig.py:133
 msgid "Username attribute"
 msgstr "Atrybut nazwy użytkownika"
 
-#: config/SSSDConfig.py:133
+#: config/SSSDConfig.py:134
 msgid "UID attribute"
 msgstr "Atrybut UID"
 
-#: config/SSSDConfig.py:134
+#: config/SSSDConfig.py:135
 msgid "Primary GID attribute"
 msgstr "Pierwszy atrybut GID"
 
-#: config/SSSDConfig.py:135
+#: config/SSSDConfig.py:136
 msgid "GECOS attribute"
 msgstr "Atrybut GECOS"
 
-#: config/SSSDConfig.py:136
+#: config/SSSDConfig.py:137
 msgid "Home directory attribute"
 msgstr "Atrybut katalogu domowego"
 
-#: config/SSSDConfig.py:137
+#: config/SSSDConfig.py:138
 msgid "Shell attribute"
 msgstr "Atrybut powłoki"
 
-#: config/SSSDConfig.py:138
+#: config/SSSDConfig.py:139
 msgid "UUID attribute"
 msgstr "Atrybut UUID"
 
-#: config/SSSDConfig.py:139
+#: config/SSSDConfig.py:140
 msgid "User principal attribute (for Kerberos)"
 msgstr "Atrybut głównego użytkownika (dla Kerberos)"
 
-#: config/SSSDConfig.py:140
+#: config/SSSDConfig.py:141
 msgid "Full Name"
 msgstr "Imię i nazwisko"
 
-#: config/SSSDConfig.py:141
+#: config/SSSDConfig.py:142
 msgid "memberOf attribute"
 msgstr "Atrybut memberOf"
 
-#: config/SSSDConfig.py:142
+#: config/SSSDConfig.py:143
 msgid "Modification time attribute"
 msgstr "Atrybut czasu modyfikacji"
 
-#: config/SSSDConfig.py:145
+#: config/SSSDConfig.py:146
 msgid "Policy to evaluate the password expiration"
 msgstr "Polityka do oszacowania wygaszenia hasła"
 
-#: config/SSSDConfig.py:148
+#: config/SSSDConfig.py:149
 msgid "Comma separated list of allowed users"
 msgstr "Lista dozwolonych użytkowników oddzielonych przecinkami"
 
-#: config/SSSDConfig.py:149
+#: config/SSSDConfig.py:150
 msgid "Comma separated list of prohibited users"
 msgstr "Lista zabronionych użytkowników oddzielonych przecinkami"
 
-#: config/SSSDConfig.py:152
+#: config/SSSDConfig.py:153
 msgid "Default shell, /bin/bash"
 msgstr "Domyślna powłoka, /bin/bash"
 
-#: config/SSSDConfig.py:153
+#: config/SSSDConfig.py:154
 msgid "Base for home directories"
 msgstr "Podstawa katalogów domowych"
 
-#: config/SSSDConfig.py:156
+#: config/SSSDConfig.py:157
 msgid "The name of the NSS library to use"
 msgstr "Nazwa używanej biblioteki NSS"
 
-#: config/SSSDConfig.py:159
+#: config/SSSDConfig.py:160
 msgid "PAM stack to use"
 msgstr "Używany stos PAM"
 
@@ -389,7 +393,13 @@ msgstr "Podaje niedomyślny plik konfiguracji"
 msgid "sssd must be run as root\n"
 msgstr "sssd musi zostać uruchomione jako root\n"
 
-#: monitor/monitor.c:2265
+#: monitor/monitor.c:2264
+msgid ""
+"nscd socket was detected.  As nscd caching capabilities may conflict with "
+"SSSD, it is recommended to not run nscd in parallel with SSSD\n"
+msgstr ""
+
+#: monitor/monitor.c:2274
 #, c-format
 msgid ""
 "Cannot read config file %s, please check if permissions are 0600 and the "
@@ -398,17 +408,17 @@ msgstr ""
 "Nie można odczytać pliku konfiguracji %s. Proszę sprawdzić, czy uprawnienia "
 "wynoszą 0600, a właścicielem pliku jest root.root\n"
 
-#: providers/krb5/krb5_child.c:922 providers/ldap/ldap_child.c:316
+#: providers/krb5/krb5_child.c:929 providers/ldap/ldap_child.c:316
 #: util/util.h:61
 msgid "Debug level"
 msgstr "Poziom debugowania"
 
-#: providers/krb5/krb5_child.c:924 providers/ldap/ldap_child.c:318
+#: providers/krb5/krb5_child.c:931 providers/ldap/ldap_child.c:318
 #: util/util.h:65
 msgid "Add debug timestamps"
 msgstr "Dodaje czasy debugowania"
 
-#: providers/krb5/krb5_child.c:926 providers/ldap/ldap_child.c:320
+#: providers/krb5/krb5_child.c:933 providers/ldap/ldap_child.c:320
 msgid "An open file descriptor for the debug logs"
 msgstr "Otwiera deskryptor pliku dla dzienników debugowania"
 
diff --git a/src/po/pt.po b/src/po/pt.po
index dca77138f..1a20681cd 100644
--- a/src/po/pt.po
+++ b/src/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sssd.master.sss_daemon\n"
 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2010-03-10 07:43-0500\n"
+"POT-Creation-Date: 2010-03-15 07:37-0400\n"
 "PO-Revision-Date: 2010-02-23 13:59+0100\n"
 "Last-Translator: Rui Gouveia <rui.gouveia@gmail.com>\n"
 "Language-Team: fedora-trans-pt@redhat.com\n"
@@ -183,11 +183,11 @@ msgstr "Endereço do servidor IPA"
 msgid "IPA client hostname"
 msgstr "Nome da máquina do cliente IPA"
 
-#: config/SSSDConfig.py:91 config/SSSDConfig.py:118
+#: config/SSSDConfig.py:91 config/SSSDConfig.py:119
 msgid "Kerberos server address"
 msgstr "Endereço do servidor Kerberos"
 
-#: config/SSSDConfig.py:92 config/SSSDConfig.py:119
+#: config/SSSDConfig.py:92 config/SSSDConfig.py:120
 msgid "Kerberos realm"
 msgstr "Reino Kerberos"
 
@@ -215,167 +215,171 @@ msgstr "Activar validação de credenciais"
 msgid "The principal of the change password service"
 msgstr "O principal do serviço de alteração de senha"
 
-#: config/SSSDConfig.py:105
+#: config/SSSDConfig.py:103
+msgid "Server where the change password service is running if not on the KDC"
+msgstr ""
+
+#: config/SSSDConfig.py:106
 msgid "ldap_uri, The URI of the LDAP server"
 msgstr "ldap_uri, O URI do servidor LDAP"
 
-#: config/SSSDConfig.py:106
+#: config/SSSDConfig.py:107
 msgid "The default base DN"
 msgstr "A base DN por omissão"
 
-#: config/SSSDConfig.py:107
+#: config/SSSDConfig.py:108
 msgid "The Schema Type in use on the LDAP server, rfc2307"
 msgstr "O tipo de Schema em utilização no servidor LDAP, rfc2307"
 
-#: config/SSSDConfig.py:108
+#: config/SSSDConfig.py:109
 msgid "The default bind DN"
 msgstr "O DN por omissão para a ligação"
 
-#: config/SSSDConfig.py:109
+#: config/SSSDConfig.py:110
 msgid "The type of the authentication token of the default bind DN"
 msgstr "O tipo de token de autenticação do bind DN por omissão"
 
-#: config/SSSDConfig.py:110
+#: config/SSSDConfig.py:111
 msgid "The authentication token of the default bind DN"
 msgstr "O token de autenticação do bind DN por omissão"
 
-#: config/SSSDConfig.py:111
+#: config/SSSDConfig.py:112
 msgid "Length of time to attempt connection"
 msgstr "Período de tempo para tentar ligação"
 
-#: config/SSSDConfig.py:112
+#: config/SSSDConfig.py:113
 msgid "Length of time to attempt synchronous LDAP operations"
 msgstr "Tempo de espera para tentar operações LDAP síncronas"
 
-#: config/SSSDConfig.py:113
+#: config/SSSDConfig.py:114
 msgid "Length of time between attempts to reconnect while offline"
 msgstr "Tempo de espera entre tentativas para re-conectar quando desligado"
 
-#: config/SSSDConfig.py:114
+#: config/SSSDConfig.py:115
 msgid "file that contains CA certificates"
 msgstr "ficheiro que contêm os certificados CA"
 
-#: config/SSSDConfig.py:115
+#: config/SSSDConfig.py:116
 msgid "Require TLS certificate verification"
 msgstr "Obriga a verificação de certificados TLS"
 
-#: config/SSSDConfig.py:116
+#: config/SSSDConfig.py:117
 msgid "Specify the sasl mechanism to use"
 msgstr "Especificar mecanismo sasl a utilizar"
 
-#: config/SSSDConfig.py:117
+#: config/SSSDConfig.py:118
 msgid "Specify the sasl authorization id to use"
 msgstr "Especifique o id sasl para utilizar na autorização"
 
-#: config/SSSDConfig.py:120
+#: config/SSSDConfig.py:121
 msgid "Kerberos service keytab"
 msgstr "Separador chave do serviço Kerberos"
 
-#: config/SSSDConfig.py:121
+#: config/SSSDConfig.py:122
 msgid "Use Kerberos auth for LDAP connection"
 msgstr "Utilizar autenticação Kerberos para ligações LDAP"
 
-#: config/SSSDConfig.py:122
+#: config/SSSDConfig.py:123
 msgid "Follow LDAP referrals"
 msgstr "Seguir os referrals LDAP"
 
-#: config/SSSDConfig.py:125
+#: config/SSSDConfig.py:126
 msgid "Length of time to wait for a search request"
 msgstr "Tempo de espera por um pedido de pesquisa"
 
-#: config/SSSDConfig.py:126
+#: config/SSSDConfig.py:127
 msgid "Length of time between enumeration updates"
 msgstr "Período de tempo entre enumeração de actualizações"
 
-#: config/SSSDConfig.py:127
+#: config/SSSDConfig.py:128
 msgid "Require TLS for ID lookups, false"
 msgstr "Requer TLS para consultas de ID, falso"
 
-#: config/SSSDConfig.py:128
+#: config/SSSDConfig.py:129
 msgid "Base DN for user lookups"
 msgstr "DN base para pesquisa de utilizadores"
 
-#: config/SSSDConfig.py:129
+#: config/SSSDConfig.py:130
 msgid "Scope of user lookups"
 msgstr "Âmbito das pesquisas do utilizador"
 
-#: config/SSSDConfig.py:130
+#: config/SSSDConfig.py:131
 msgid "Filter for user lookups"
 msgstr "Filtro para as pesquisas do utilizador"
 
-#: config/SSSDConfig.py:131
+#: config/SSSDConfig.py:132
 msgid "Objectclass for users"
 msgstr "Objectclass para utilizadores"
 
-#: config/SSSDConfig.py:132
+#: config/SSSDConfig.py:133
 msgid "Username attribute"
 msgstr "Atributo do nome do utilizador"
 
-#: config/SSSDConfig.py:133
+#: config/SSSDConfig.py:134
 msgid "UID attribute"
 msgstr "Atributo UID"
 
-#: config/SSSDConfig.py:134
+#: config/SSSDConfig.py:135
 msgid "Primary GID attribute"
 msgstr "Atributo GID primário"
 
-#: config/SSSDConfig.py:135
+#: config/SSSDConfig.py:136
 msgid "GECOS attribute"
 msgstr "Atributo GECOS"
 
-#: config/SSSDConfig.py:136
+#: config/SSSDConfig.py:137
 msgid "Home directory attribute"
 msgstr "Atributo da pasta pessoal"
 
-#: config/SSSDConfig.py:137
+#: config/SSSDConfig.py:138
 msgid "Shell attribute"
 msgstr "Atributo da Shell"
 
-#: config/SSSDConfig.py:138
+#: config/SSSDConfig.py:139
 msgid "UUID attribute"
 msgstr "Atributo UUID"
 
-#: config/SSSDConfig.py:139
+#: config/SSSDConfig.py:140
 msgid "User principal attribute (for Kerberos)"
 msgstr "Atributo principal do utilizador (para Kerberos)"
 
-#: config/SSSDConfig.py:140
+#: config/SSSDConfig.py:141
 msgid "Full Name"
 msgstr "Nome Completo"
 
-#: config/SSSDConfig.py:141
+#: config/SSSDConfig.py:142
 msgid "memberOf attribute"
 msgstr "Atributo memberOf"
 
-#: config/SSSDConfig.py:142
+#: config/SSSDConfig.py:143
 msgid "Modification time attribute"
 msgstr "Atributo da alteração da data"
 
-#: config/SSSDConfig.py:145
+#: config/SSSDConfig.py:146
 msgid "Policy to evaluate the password expiration"
 msgstr "Politica para avaliar a expiração da senha"
 
-#: config/SSSDConfig.py:148
+#: config/SSSDConfig.py:149
 msgid "Comma separated list of allowed users"
 msgstr "Lista de utilizadores autorizados separados por vírgulas"
 
-#: config/SSSDConfig.py:149
+#: config/SSSDConfig.py:150
 msgid "Comma separated list of prohibited users"
 msgstr "Lista de utilizadores não autorizados separados por vírgulas"
 
-#: config/SSSDConfig.py:152
+#: config/SSSDConfig.py:153
 msgid "Default shell, /bin/bash"
 msgstr "Shell pré-definida, /bin/bash"
 
-#: config/SSSDConfig.py:153
+#: config/SSSDConfig.py:154
 msgid "Base for home directories"
 msgstr "Directório base para as pastas pessoais"
 
-#: config/SSSDConfig.py:156
+#: config/SSSDConfig.py:157
 msgid "The name of the NSS library to use"
 msgstr "O nome da biblioteca NSS a utilizar"
 
-#: config/SSSDConfig.py:159
+#: config/SSSDConfig.py:160
 msgid "PAM stack to use"
 msgstr "Stack PAM a utilizar"
 
@@ -395,7 +399,13 @@ msgstr "Especificar um ficheiro de configuração não standard"
 msgid "sssd must be run as root\n"
 msgstr "sssd tem de executar como root\n"
 
-#: monitor/monitor.c:2265
+#: monitor/monitor.c:2264
+msgid ""
+"nscd socket was detected.  As nscd caching capabilities may conflict with "
+"SSSD, it is recommended to not run nscd in parallel with SSSD\n"
+msgstr ""
+
+#: monitor/monitor.c:2274
 #, c-format
 msgid ""
 "Cannot read config file %s, please check if permissions are 0600 and the "
@@ -404,17 +414,17 @@ msgstr ""
 "Incapaz de ler o ficheiro de configuração %s. Por favor, verifique se as "
 "permissões são 0600 e se o ficheiro pertence a root.root\n"
 
-#: providers/krb5/krb5_child.c:922 providers/ldap/ldap_child.c:316
+#: providers/krb5/krb5_child.c:929 providers/ldap/ldap_child.c:316
 #: util/util.h:61
 msgid "Debug level"
 msgstr "Nível de depuração"
 
-#: providers/krb5/krb5_child.c:924 providers/ldap/ldap_child.c:318
+#: providers/krb5/krb5_child.c:931 providers/ldap/ldap_child.c:318
 #: util/util.h:65
 msgid "Add debug timestamps"
 msgstr "Adicionar tempos na depuração"
 
-#: providers/krb5/krb5_child.c:926 providers/ldap/ldap_child.c:320
+#: providers/krb5/krb5_child.c:933 providers/ldap/ldap_child.c:320
 msgid "An open file descriptor for the debug logs"
 msgstr "Um descritor de ficheiro aberto para os registos de depuração"
 
diff --git a/src/po/sss_daemon.pot b/src/po/sss_daemon.pot
index cab14b1c0..269199c78 100644
--- a/src/po/sss_daemon.pot
+++ b/src/po/sss_daemon.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: sss_daemon 1.1.0\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2010-03-09 08:15-0500\n"
+"POT-Creation-Date: 2010-03-15 07:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -171,11 +171,11 @@ msgstr ""
 msgid "IPA client hostname"
 msgstr ""
 
-#: config/SSSDConfig.py:91 config/SSSDConfig.py:118
+#: config/SSSDConfig.py:91 config/SSSDConfig.py:119
 msgid "Kerberos server address"
 msgstr ""
 
-#: config/SSSDConfig.py:92 config/SSSDConfig.py:119
+#: config/SSSDConfig.py:92 config/SSSDConfig.py:120
 msgid "Kerberos realm"
 msgstr ""
 
@@ -203,167 +203,171 @@ msgstr ""
 msgid "The principal of the change password service"
 msgstr ""
 
-#: config/SSSDConfig.py:105
-msgid "ldap_uri, The URI of the LDAP server"
+#: config/SSSDConfig.py:103
+msgid "Server where the change password service is running if not on the KDC"
 msgstr ""
 
 #: config/SSSDConfig.py:106
-msgid "The default base DN"
+msgid "ldap_uri, The URI of the LDAP server"
 msgstr ""
 
 #: config/SSSDConfig.py:107
-msgid "The Schema Type in use on the LDAP server, rfc2307"
+msgid "The default base DN"
 msgstr ""
 
 #: config/SSSDConfig.py:108
-msgid "The default bind DN"
+msgid "The Schema Type in use on the LDAP server, rfc2307"
 msgstr ""
 
 #: config/SSSDConfig.py:109
-msgid "The type of the authentication token of the default bind DN"
+msgid "The default bind DN"
 msgstr ""
 
 #: config/SSSDConfig.py:110
-msgid "The authentication token of the default bind DN"
+msgid "The type of the authentication token of the default bind DN"
 msgstr ""
 
 #: config/SSSDConfig.py:111
-msgid "Length of time to attempt connection"
+msgid "The authentication token of the default bind DN"
 msgstr ""
 
 #: config/SSSDConfig.py:112
-msgid "Length of time to attempt synchronous LDAP operations"
+msgid "Length of time to attempt connection"
 msgstr ""
 
 #: config/SSSDConfig.py:113
-msgid "Length of time between attempts to reconnect while offline"
+msgid "Length of time to attempt synchronous LDAP operations"
 msgstr ""
 
 #: config/SSSDConfig.py:114
-msgid "file that contains CA certificates"
+msgid "Length of time between attempts to reconnect while offline"
 msgstr ""
 
 #: config/SSSDConfig.py:115
-msgid "Require TLS certificate verification"
+msgid "file that contains CA certificates"
 msgstr ""
 
 #: config/SSSDConfig.py:116
-msgid "Specify the sasl mechanism to use"
+msgid "Require TLS certificate verification"
 msgstr ""
 
 #: config/SSSDConfig.py:117
+msgid "Specify the sasl mechanism to use"
+msgstr ""
+
+#: config/SSSDConfig.py:118
 msgid "Specify the sasl authorization id to use"
 msgstr ""
 
-#: config/SSSDConfig.py:120
+#: config/SSSDConfig.py:121
 msgid "Kerberos service keytab"
 msgstr ""
 
-#: config/SSSDConfig.py:121
+#: config/SSSDConfig.py:122
 msgid "Use Kerberos auth for LDAP connection"
 msgstr ""
 
-#: config/SSSDConfig.py:122
+#: config/SSSDConfig.py:123
 msgid "Follow LDAP referrals"
 msgstr ""
 
-#: config/SSSDConfig.py:125
+#: config/SSSDConfig.py:126
 msgid "Length of time to wait for a search request"
 msgstr ""
 
-#: config/SSSDConfig.py:126
+#: config/SSSDConfig.py:127
 msgid "Length of time between enumeration updates"
 msgstr ""
 
-#: config/SSSDConfig.py:127
+#: config/SSSDConfig.py:128
 msgid "Require TLS for ID lookups, false"
 msgstr ""
 
-#: config/SSSDConfig.py:128
+#: config/SSSDConfig.py:129
 msgid "Base DN for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:129
+#: config/SSSDConfig.py:130
 msgid "Scope of user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:130
+#: config/SSSDConfig.py:131
 msgid "Filter for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:131
+#: config/SSSDConfig.py:132
 msgid "Objectclass for users"
 msgstr ""
 
-#: config/SSSDConfig.py:132
+#: config/SSSDConfig.py:133
 msgid "Username attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:133
+#: config/SSSDConfig.py:134
 msgid "UID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:134
+#: config/SSSDConfig.py:135
 msgid "Primary GID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:135
+#: config/SSSDConfig.py:136
 msgid "GECOS attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:136
+#: config/SSSDConfig.py:137
 msgid "Home directory attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:137
+#: config/SSSDConfig.py:138
 msgid "Shell attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:138
+#: config/SSSDConfig.py:139
 msgid "UUID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:139
+#: config/SSSDConfig.py:140
 msgid "User principal attribute (for Kerberos)"
 msgstr ""
 
-#: config/SSSDConfig.py:140
+#: config/SSSDConfig.py:141
 msgid "Full Name"
 msgstr ""
 
-#: config/SSSDConfig.py:141
+#: config/SSSDConfig.py:142
 msgid "memberOf attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:142
+#: config/SSSDConfig.py:143
 msgid "Modification time attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:145
+#: config/SSSDConfig.py:146
 msgid "Policy to evaluate the password expiration"
 msgstr ""
 
-#: config/SSSDConfig.py:148
+#: config/SSSDConfig.py:149
 msgid "Comma separated list of allowed users"
 msgstr ""
 
-#: config/SSSDConfig.py:149
+#: config/SSSDConfig.py:150
 msgid "Comma separated list of prohibited users"
 msgstr ""
 
-#: config/SSSDConfig.py:152
+#: config/SSSDConfig.py:153
 msgid "Default shell, /bin/bash"
 msgstr ""
 
-#: config/SSSDConfig.py:153
+#: config/SSSDConfig.py:154
 msgid "Base for home directories"
 msgstr ""
 
-#: config/SSSDConfig.py:156
+#: config/SSSDConfig.py:157
 msgid "The name of the NSS library to use"
 msgstr ""
 
-#: config/SSSDConfig.py:159
+#: config/SSSDConfig.py:160
 msgid "PAM stack to use"
 msgstr ""
 
@@ -383,24 +387,30 @@ msgstr ""
 msgid "sssd must be run as root\n"
 msgstr ""
 
-#: monitor/monitor.c:2265
+#: monitor/monitor.c:2264
+msgid ""
+"nscd socket was detected.  As nscd caching capabilities may conflict with "
+"SSSD, it is recommended to not run nscd in parallel with SSSD\n"
+msgstr ""
+
+#: monitor/monitor.c:2274
 #, c-format
 msgid ""
 "Cannot read config file %s, please check if permissions are 0600 and the "
 "file is owned by root.root\n"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:922 providers/ldap/ldap_child.c:316
+#: providers/krb5/krb5_child.c:929 providers/ldap/ldap_child.c:316
 #: util/util.h:61
 msgid "Debug level"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:924 providers/ldap/ldap_child.c:318
+#: providers/krb5/krb5_child.c:931 providers/ldap/ldap_child.c:318
 #: util/util.h:65
 msgid "Add debug timestamps"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:926 providers/ldap/ldap_child.c:320
+#: providers/krb5/krb5_child.c:933 providers/ldap/ldap_child.c:320
 msgid "An open file descriptor for the debug logs"
 msgstr ""
 
diff --git a/src/po/sv.po b/src/po/sv.po
index fb51f19b8..64dc58ac0 100644
--- a/src/po/sv.po
+++ b/src/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sss_server\n"
 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2010-03-09 08:15-0500\n"
+"POT-Creation-Date: 2010-03-15 07:37-0400\n"
 "PO-Revision-Date: 2009-12-30 17:58+0100\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -174,11 +174,11 @@ msgstr "IPA-serveradress"
 msgid "IPA client hostname"
 msgstr "IPA-klienvärdnamn"
 
-#: config/SSSDConfig.py:91 config/SSSDConfig.py:118
+#: config/SSSDConfig.py:91 config/SSSDConfig.py:119
 msgid "Kerberos server address"
 msgstr "Kerberosserveradress"
 
-#: config/SSSDConfig.py:92 config/SSSDConfig.py:119
+#: config/SSSDConfig.py:92 config/SSSDConfig.py:120
 msgid "Kerberos realm"
 msgstr "Kerberosrike"
 
@@ -206,167 +206,171 @@ msgstr "Aktivera validering av kreditiv"
 msgid "The principal of the change password service"
 msgstr "Huvudmannen för tjänsten att ändra lösenord"
 
-#: config/SSSDConfig.py:105
+#: config/SSSDConfig.py:103
+msgid "Server where the change password service is running if not on the KDC"
+msgstr ""
+
+#: config/SSSDConfig.py:106
 msgid "ldap_uri, The URI of the LDAP server"
 msgstr "ldap_uri, URI:n för LDAP-servern"
 
-#: config/SSSDConfig.py:106
+#: config/SSSDConfig.py:107
 msgid "The default base DN"
 msgstr "Standard bas-DN"
 
-#: config/SSSDConfig.py:107
+#: config/SSSDConfig.py:108
 msgid "The Schema Type in use on the LDAP server, rfc2307"
 msgstr "Schematypen som används i LDAP-servern, rfc2307"
 
-#: config/SSSDConfig.py:108
+#: config/SSSDConfig.py:109
 msgid "The default bind DN"
 msgstr "Standard bindnings-DN"
 
-#: config/SSSDConfig.py:109
+#: config/SSSDConfig.py:110
 msgid "The type of the authentication token of the default bind DN"
 msgstr "Typen på autenticerings-token för standard bindnings-DN"
 
-#: config/SSSDConfig.py:110
+#: config/SSSDConfig.py:111
 msgid "The authentication token of the default bind DN"
 msgstr "Autenticerings-token för standard bindnings-DN"
 
-#: config/SSSDConfig.py:111
+#: config/SSSDConfig.py:112
 msgid "Length of time to attempt connection"
 msgstr "Tidslängd att försöka ansluta"
 
-#: config/SSSDConfig.py:112
+#: config/SSSDConfig.py:113
 msgid "Length of time to attempt synchronous LDAP operations"
 msgstr "Tidslängd att försök synkrona LDAP-operationer"
 
-#: config/SSSDConfig.py:113
+#: config/SSSDConfig.py:114
 msgid "Length of time between attempts to reconnect while offline"
 msgstr "Tidslängd mellan försök att återansluta under frånkoppling"
 
-#: config/SSSDConfig.py:114
+#: config/SSSDConfig.py:115
 msgid "file that contains CA certificates"
 msgstr "fil som innehåller CA-certifikat"
 
-#: config/SSSDConfig.py:115
+#: config/SSSDConfig.py:116
 msgid "Require TLS certificate verification"
 msgstr "Kräv TLS-certifikatverifiering"
 
-#: config/SSSDConfig.py:116
+#: config/SSSDConfig.py:117
 msgid "Specify the sasl mechanism to use"
 msgstr "Ange sasl-mekanismen att använda"
 
-#: config/SSSDConfig.py:117
+#: config/SSSDConfig.py:118
 msgid "Specify the sasl authorization id to use"
 msgstr "Ange sasl-auktorisering-id att använda"
 
-#: config/SSSDConfig.py:120
+#: config/SSSDConfig.py:121
 msgid "Kerberos service keytab"
 msgstr "Kerberostjänstens nyckeltabell"
 
-#: config/SSSDConfig.py:121
+#: config/SSSDConfig.py:122
 msgid "Use Kerberos auth for LDAP connection"
 msgstr "Avnänd Kerberosautenticering för LDAP-anslutning"
 
-#: config/SSSDConfig.py:122
+#: config/SSSDConfig.py:123
 msgid "Follow LDAP referrals"
 msgstr ""
 
-#: config/SSSDConfig.py:125
+#: config/SSSDConfig.py:126
 msgid "Length of time to wait for a search request"
 msgstr "Tidslängd att vänta på en sökbegäran"
 
-#: config/SSSDConfig.py:126
+#: config/SSSDConfig.py:127
 msgid "Length of time between enumeration updates"
 msgstr "Tidslängd mellan uppräkningsuppdateringar"
 
-#: config/SSSDConfig.py:127
+#: config/SSSDConfig.py:128
 msgid "Require TLS for ID lookups, false"
 msgstr "Kräv TLS för ID-uppslagningar, falsk"
 
-#: config/SSSDConfig.py:128
+#: config/SSSDConfig.py:129
 msgid "Base DN for user lookups"
 msgstr "Bas-DN för användaruppslagningar"
 
-#: config/SSSDConfig.py:129
+#: config/SSSDConfig.py:130
 msgid "Scope of user lookups"
 msgstr "Omfång av användaruppslagningar"
 
-#: config/SSSDConfig.py:130
+#: config/SSSDConfig.py:131
 msgid "Filter for user lookups"
 msgstr "Filter för användaruppslagningar"
 
-#: config/SSSDConfig.py:131
+#: config/SSSDConfig.py:132
 msgid "Objectclass for users"
 msgstr "Objektklass för användare"
 
-#: config/SSSDConfig.py:132
+#: config/SSSDConfig.py:133
 msgid "Username attribute"
 msgstr "Användarnamnsattribut"
 
-#: config/SSSDConfig.py:133
+#: config/SSSDConfig.py:134
 msgid "UID attribute"
 msgstr "UID-attribut"
 
-#: config/SSSDConfig.py:134
+#: config/SSSDConfig.py:135
 msgid "Primary GID attribute"
 msgstr "Primärt GID-attribut"
 
-#: config/SSSDConfig.py:135
+#: config/SSSDConfig.py:136
 msgid "GECOS attribute"
 msgstr "GECOS-attribut"
 
-#: config/SSSDConfig.py:136
+#: config/SSSDConfig.py:137
 msgid "Home directory attribute"
 msgstr "Hemkatalogattribut"
 
-#: config/SSSDConfig.py:137
+#: config/SSSDConfig.py:138
 msgid "Shell attribute"
 msgstr "Skalattribut"
 
-#: config/SSSDConfig.py:138
+#: config/SSSDConfig.py:139
 msgid "UUID attribute"
 msgstr "UUID-attribut"
 
-#: config/SSSDConfig.py:139
+#: config/SSSDConfig.py:140
 msgid "User principal attribute (for Kerberos)"
 msgstr "Användarens huvudmansattribut (för Kerberos)"
 
-#: config/SSSDConfig.py:140
+#: config/SSSDConfig.py:141
 msgid "Full Name"
 msgstr "Fullständigt namn"
 
-#: config/SSSDConfig.py:141
+#: config/SSSDConfig.py:142
 msgid "memberOf attribute"
 msgstr "medlemAv-attribut"
 
-#: config/SSSDConfig.py:142
+#: config/SSSDConfig.py:143
 msgid "Modification time attribute"
 msgstr "Modifieringstidsattribut"
 
-#: config/SSSDConfig.py:145
+#: config/SSSDConfig.py:146
 msgid "Policy to evaluate the password expiration"
 msgstr "Policy för att utvärdera utgång av lösenord"
 
-#: config/SSSDConfig.py:148
+#: config/SSSDConfig.py:149
 msgid "Comma separated list of allowed users"
 msgstr ""
 
-#: config/SSSDConfig.py:149
+#: config/SSSDConfig.py:150
 msgid "Comma separated list of prohibited users"
 msgstr ""
 
-#: config/SSSDConfig.py:152
+#: config/SSSDConfig.py:153
 msgid "Default shell, /bin/bash"
 msgstr "Standardskal, /bin/bash"
 
-#: config/SSSDConfig.py:153
+#: config/SSSDConfig.py:154
 msgid "Base for home directories"
 msgstr "Bas för hemkataloger"
 
-#: config/SSSDConfig.py:156
+#: config/SSSDConfig.py:157
 msgid "The name of the NSS library to use"
 msgstr "Namnet på NSS-biblioteket att använda"
 
-#: config/SSSDConfig.py:159
+#: config/SSSDConfig.py:160
 msgid "PAM stack to use"
 msgstr "PAM-stack att använda"
 
@@ -387,24 +391,30 @@ msgstr ""
 msgid "sssd must be run as root\n"
 msgstr "%s måste köras som root\n"
 
-#: monitor/monitor.c:2265
+#: monitor/monitor.c:2264
+msgid ""
+"nscd socket was detected.  As nscd caching capabilities may conflict with "
+"SSSD, it is recommended to not run nscd in parallel with SSSD\n"
+msgstr ""
+
+#: monitor/monitor.c:2274
 #, c-format
 msgid ""
 "Cannot read config file %s, please check if permissions are 0600 and the "
 "file is owned by root.root\n"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:922 providers/ldap/ldap_child.c:316
+#: providers/krb5/krb5_child.c:929 providers/ldap/ldap_child.c:316
 #: util/util.h:61
 msgid "Debug level"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:924 providers/ldap/ldap_child.c:318
+#: providers/krb5/krb5_child.c:931 providers/ldap/ldap_child.c:318
 #: util/util.h:65
 msgid "Add debug timestamps"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:926 providers/ldap/ldap_child.c:320
+#: providers/krb5/krb5_child.c:933 providers/ldap/ldap_child.c:320
 #, fuzzy
 msgid "An open file descriptor for the debug logs"
 msgstr "Ange pratsamhet för felsökningsloggning"
diff --git a/src/po/zh_TW.po b/src/po/zh_TW.po
index f26cf7bfa..0024b840d 100644
--- a/src/po/zh_TW.po
+++ b/src/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sss_daemon 1.1.0\n"
 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
-"POT-Creation-Date: 2010-03-09 08:15-0500\n"
+"POT-Creation-Date: 2010-03-15 07:37-0400\n"
 "PO-Revision-Date: 2010-03-10 00:14+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Fedora-trans-zh_tw <trans-zh_tw@lists.fedoraproject.org>\n"
@@ -174,11 +174,11 @@ msgstr ""
 msgid "IPA client hostname"
 msgstr ""
 
-#: config/SSSDConfig.py:91 config/SSSDConfig.py:118
+#: config/SSSDConfig.py:91 config/SSSDConfig.py:119
 msgid "Kerberos server address"
 msgstr ""
 
-#: config/SSSDConfig.py:92 config/SSSDConfig.py:119
+#: config/SSSDConfig.py:92 config/SSSDConfig.py:120
 msgid "Kerberos realm"
 msgstr ""
 
@@ -206,167 +206,171 @@ msgstr ""
 msgid "The principal of the change password service"
 msgstr ""
 
-#: config/SSSDConfig.py:105
-msgid "ldap_uri, The URI of the LDAP server"
+#: config/SSSDConfig.py:103
+msgid "Server where the change password service is running if not on the KDC"
 msgstr ""
 
 #: config/SSSDConfig.py:106
-msgid "The default base DN"
+msgid "ldap_uri, The URI of the LDAP server"
 msgstr ""
 
 #: config/SSSDConfig.py:107
-msgid "The Schema Type in use on the LDAP server, rfc2307"
+msgid "The default base DN"
 msgstr ""
 
 #: config/SSSDConfig.py:108
-msgid "The default bind DN"
+msgid "The Schema Type in use on the LDAP server, rfc2307"
 msgstr ""
 
 #: config/SSSDConfig.py:109
-msgid "The type of the authentication token of the default bind DN"
+msgid "The default bind DN"
 msgstr ""
 
 #: config/SSSDConfig.py:110
-msgid "The authentication token of the default bind DN"
+msgid "The type of the authentication token of the default bind DN"
 msgstr ""
 
 #: config/SSSDConfig.py:111
-msgid "Length of time to attempt connection"
+msgid "The authentication token of the default bind DN"
 msgstr ""
 
 #: config/SSSDConfig.py:112
-msgid "Length of time to attempt synchronous LDAP operations"
+msgid "Length of time to attempt connection"
 msgstr ""
 
 #: config/SSSDConfig.py:113
-msgid "Length of time between attempts to reconnect while offline"
+msgid "Length of time to attempt synchronous LDAP operations"
 msgstr ""
 
 #: config/SSSDConfig.py:114
-msgid "file that contains CA certificates"
+msgid "Length of time between attempts to reconnect while offline"
 msgstr ""
 
 #: config/SSSDConfig.py:115
-msgid "Require TLS certificate verification"
+msgid "file that contains CA certificates"
 msgstr ""
 
 #: config/SSSDConfig.py:116
-msgid "Specify the sasl mechanism to use"
+msgid "Require TLS certificate verification"
 msgstr ""
 
 #: config/SSSDConfig.py:117
+msgid "Specify the sasl mechanism to use"
+msgstr ""
+
+#: config/SSSDConfig.py:118
 msgid "Specify the sasl authorization id to use"
 msgstr ""
 
-#: config/SSSDConfig.py:120
+#: config/SSSDConfig.py:121
 msgid "Kerberos service keytab"
 msgstr ""
 
-#: config/SSSDConfig.py:121
+#: config/SSSDConfig.py:122
 msgid "Use Kerberos auth for LDAP connection"
 msgstr ""
 
-#: config/SSSDConfig.py:122
+#: config/SSSDConfig.py:123
 msgid "Follow LDAP referrals"
 msgstr ""
 
-#: config/SSSDConfig.py:125
+#: config/SSSDConfig.py:126
 msgid "Length of time to wait for a search request"
 msgstr ""
 
-#: config/SSSDConfig.py:126
+#: config/SSSDConfig.py:127
 msgid "Length of time between enumeration updates"
 msgstr ""
 
-#: config/SSSDConfig.py:127
+#: config/SSSDConfig.py:128
 msgid "Require TLS for ID lookups, false"
 msgstr ""
 
-#: config/SSSDConfig.py:128
+#: config/SSSDConfig.py:129
 msgid "Base DN for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:129
+#: config/SSSDConfig.py:130
 msgid "Scope of user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:130
+#: config/SSSDConfig.py:131
 msgid "Filter for user lookups"
 msgstr ""
 
-#: config/SSSDConfig.py:131
+#: config/SSSDConfig.py:132
 msgid "Objectclass for users"
 msgstr ""
 
-#: config/SSSDConfig.py:132
+#: config/SSSDConfig.py:133
 msgid "Username attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:133
+#: config/SSSDConfig.py:134
 msgid "UID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:134
+#: config/SSSDConfig.py:135
 msgid "Primary GID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:135
+#: config/SSSDConfig.py:136
 msgid "GECOS attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:136
+#: config/SSSDConfig.py:137
 msgid "Home directory attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:137
+#: config/SSSDConfig.py:138
 msgid "Shell attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:138
+#: config/SSSDConfig.py:139
 msgid "UUID attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:139
+#: config/SSSDConfig.py:140
 msgid "User principal attribute (for Kerberos)"
 msgstr ""
 
-#: config/SSSDConfig.py:140
+#: config/SSSDConfig.py:141
 msgid "Full Name"
 msgstr ""
 
-#: config/SSSDConfig.py:141
+#: config/SSSDConfig.py:142
 msgid "memberOf attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:142
+#: config/SSSDConfig.py:143
 msgid "Modification time attribute"
 msgstr ""
 
-#: config/SSSDConfig.py:145
+#: config/SSSDConfig.py:146
 msgid "Policy to evaluate the password expiration"
 msgstr ""
 
-#: config/SSSDConfig.py:148
+#: config/SSSDConfig.py:149
 msgid "Comma separated list of allowed users"
 msgstr ""
 
-#: config/SSSDConfig.py:149
+#: config/SSSDConfig.py:150
 msgid "Comma separated list of prohibited users"
 msgstr ""
 
-#: config/SSSDConfig.py:152
+#: config/SSSDConfig.py:153
 msgid "Default shell, /bin/bash"
 msgstr ""
 
-#: config/SSSDConfig.py:153
+#: config/SSSDConfig.py:154
 msgid "Base for home directories"
 msgstr ""
 
-#: config/SSSDConfig.py:156
+#: config/SSSDConfig.py:157
 msgid "The name of the NSS library to use"
 msgstr ""
 
-#: config/SSSDConfig.py:159
+#: config/SSSDConfig.py:160
 msgid "PAM stack to use"
 msgstr ""
 
@@ -386,24 +390,30 @@ msgstr ""
 msgid "sssd must be run as root\n"
 msgstr ""
 
-#: monitor/monitor.c:2265
+#: monitor/monitor.c:2264
+msgid ""
+"nscd socket was detected.  As nscd caching capabilities may conflict with "
+"SSSD, it is recommended to not run nscd in parallel with SSSD\n"
+msgstr ""
+
+#: monitor/monitor.c:2274
 #, c-format
 msgid ""
 "Cannot read config file %s, please check if permissions are 0600 and the "
 "file is owned by root.root\n"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:922 providers/ldap/ldap_child.c:316
+#: providers/krb5/krb5_child.c:929 providers/ldap/ldap_child.c:316
 #: util/util.h:61
 msgid "Debug level"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:924 providers/ldap/ldap_child.c:318
+#: providers/krb5/krb5_child.c:931 providers/ldap/ldap_child.c:318
 #: util/util.h:65
 msgid "Add debug timestamps"
 msgstr ""
 
-#: providers/krb5/krb5_child.c:926 providers/ldap/ldap_child.c:320
+#: providers/krb5/krb5_child.c:933 providers/ldap/ldap_child.c:320
 msgid "An open file descriptor for the debug logs"
 msgstr ""